Commit Graph

176 Commits

Author SHA1 Message Date
Victor Levasseur d7014bae6f Merge remote-tracking branch 'upstream/master' into utf8-tr-macro
Conflicts:
	Core/GDCore/BuiltinExtensions/BaseObjectExtension.cpp
2015-04-28 20:18:19 +02:00
Victor Levasseur 0049b5c6fa Merge remote-tracking branch 'upstream/master' into utf8-tr-macro
Conflicts:
	Core/GDCore/BuiltinExtensions/SpriteExtension/SpriteExtension.cpp
	Core/GDCore/Events/ExpressionMetadata.h
	Extensions/Box3DObject/Extension.cpp
	Extensions/DraggableAutomatism/Extension.cpp
	Extensions/Light/Extension.cpp
	Extensions/Network/Extension.cpp
	Extensions/PanelSpriteObject/Extension.cpp
	Extensions/ParticleSystem/ExtensionSubDeclaration1.cpp
	Extensions/ParticleSystem/ExtensionSubDeclaration3.cpp
	Extensions/PathAutomatism/Extension.cpp
	Extensions/PathfindingAutomatism/Extension.cpp
	Extensions/PhysicsAutomatism/Extension.cpp
	Extensions/PlatformAutomatism/Extension.cpp
	Extensions/PrimitiveDrawing/Extension.cpp
	Extensions/SoundObject/Extension.cpp
	Extensions/TextEntryObject/Extension.cpp
	Extensions/TextObject/Extension.cpp
	Extensions/TileMapObject/Extension.cpp
	Extensions/TiledSpriteObject/Extension.cpp
	Extensions/TopDownMovementAutomatism/Extension.cpp
	GDCpp/GDCpp/DocMainPage.h
	GDCpp/docs/doxyfile
	GDJS/GDJS/BuiltinExtensions/AudioExtension.cpp
	GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp
	GDJS/GDJS/BuiltinExtensions/CameraExtension.cpp
	GDJS/GDJS/BuiltinExtensions/FileExtension.cpp
	GDJS/GDJS/BuiltinExtensions/JoystickExtension.cpp
	GDJS/GDJS/BuiltinExtensions/NetworkExtension.cpp
	GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp
	GDJS/GDJS/BuiltinExtensions/SpriteExtension.cpp
	scripts/ExtractTranslations.sh
2015-04-28 20:03:27 +02:00
Florian Rival 21bf75ecbc Merge pull request #112 from Lizard-13/patch-1
Fix sprite global color in HTML5
2015-04-27 22:13:39 +12:00
Florian Rival eea57cc65f Minor change to enable a V8 optimization 2015-04-27 21:34:35 +12:00
Lizard-13 c8c654f5f8 Fix sprite global color in HTML5
The action to modify the sprites global color is broken, this should fix it :)
Actually, just colors[2] needs to be converted to int, but this way is more clear.
2015-04-25 21:45:51 -03:00
Florian Rival c2dc553571 Simplified function name declaration for actions/conditions/expressions 2015-04-23 21:30:04 +12:00
Florian Rival ef2eea8b1c Added Pick Nearest Object condition for HTML5 games + tests for it. 2015-04-23 20:31:45 +12:00
Florian Rival 53aaade1bb Fixed methods names not written in camelCase 2015-04-23 14:24:28 +12:00
Florian Rival ec5d6b3489 Make PickRandomObject return false when no object picked for HTML5 games 2015-04-23 08:39:05 +12:00
Florian Rival f1ca1348cb Fix automatisms deactivation for HTML5 games 2015-04-22 15:19:12 +12:00
Florian Rival ac7337ea67 Refactoring and added tests for platformerobjectruntimeautomatism.js 2015-04-19 22:53:02 +12:00
Florian Rival 47ef1d2152 Updated Readmes and some comments 2015-04-19 21:48:41 +12:00
Florian Rival f578ad6c2a Optimized platformer engine for HTML5 games 2015-04-16 23:36:15 +12:00
Florian Rival 54ec6d0737 Refactoring part of ForEach events code generation and fixed CppCodeEvent not always generating its source file 2015-04-12 12:23:13 +12:00
Florian Rival b20ebddadf Merge branch 'macos-bundle'
Conflicts:
	Core/GDCore/DocMainPage.h
2015-04-03 11:20:05 +13:00
Florian Rival 3121e632ec Fixed MacOS bundle and updated docs 2015-04-03 00:07:29 +13:00
victorlevasseur c4e899465a Extensions and GDJS now use GD_T where it is possible 2015-03-29 22:28:25 +02:00
victorlevasseur b772a99ff0 Add GD_T macro to translate UTF8 std::string (and _ macro is for wxString
only)
Updated all source code to use the new macro
2015-03-29 14:40:07 +02:00
Victor Levasseur 50902f849f Add an action and an expression for the animation speed scale of Sprite objects 2015-03-28 16:08:18 +01:00
Victor Levasseur 13f26a6d83 Merge remote-tracking branch 'upstream/macos-bundle' into utf8
Conflicts:
	Core/GDCore/Events/Builtin/LinkEvent.cpp
	Core/GDCore/IDE/EventsRenderingHelper.h
	Extensions/CommonDialogs/CommonDialogs.cpp
2015-03-26 23:46:12 +01:00
Florian Rival 1787e4bb99 Simplified SFML target_link_libraries commands in CMakeLists.txt 2015-03-19 15:24:17 +13:00
Florian Rival 8ff6884837 Factored includes declarations in CMakeLists.txt for extensions 2015-03-19 14:43:38 +13:00
Florian Rival e61e5163b7 Factored targets declarations in CMakeLists.txt for extensions 2015-03-19 13:22:47 +13:00
Florian Rival a38c90bdbd More simplifications in some CMakeLists.txt 2015-03-19 11:31:18 +13:00
Florian Rival c6f70cf472 Factored parts of CMakeLists.txt 2015-03-18 17:21:12 +13:00
Florian Rival 4382225576 Factored some parts of CMakeLists.txt 2015-03-18 17:03:51 +13:00
Florian Rival a5e9f4bdec Added action to de/activate mouse simulation with touch events. Refactoring and MacOS adaptations. 2015-03-15 17:34:49 +13:00
Florian Rival 8cac0d1260 Removed line causing freeze with wxProgressDialog + wxSFMLCanvas on Mac OS X, and enabled back the progress dialogs. 2015-03-14 15:34:33 +13:00
Florian Rival 983a0bffc6 Removed any use of wxProgressDialog on Mac OS X (Freeze the app due to the call to YieldFor while running SFML canvas) 2015-03-13 22:59:13 +13:00
Florian Rival ed957916b9 Added gdjs.InputManager.touchSimulateMouse and tests for it 2015-03-13 12:25:06 +13:00
Florian Rival 0a768a4496 Updated wording, added user language to Analytics 2015-03-12 22:21:20 +13:00
Florian Rival f29d17ec91 Made draggableruntimeautomatism.js working with multitouch and added tests for it 2015-03-12 13:47:24 +13:00
Florian Rival 130f5526f2 Allow gdjs.register* functions to be called multiple times 2015-03-11 17:15:58 +13:00
Florian Rival ddb1f1dbda Support for (multi)touch in gdjs.RuntimeObject.cursorOnObject 2015-03-11 16:23:46 +13:00
Florian Rival 2f3422db70 Removed a clang warning 2015-03-10 20:18:55 +13:00
Florian Rival 99ce00dd57 Merge branch 'macos-support' into feature-multitouch 2015-03-10 19:56:16 +13:00
Florian Rival 191dd9487a Removed useless code 2015-03-10 16:20:44 +13:00
Florian Rival d0e10d8904 Ensure all wxStyledTextCtrl are using a proper font size 2015-03-10 12:08:37 +13:00
Florian Rival ddd2bbdc9a Fixed freeze on OSX with wxSafeYield
Known bugs:
Crash when going from preview to edition
Compilation not working with extension (libExtensionName.dylib needed, need to do symlinks to ExtensionName.xgd)
Retina support for EventsEditor
Parameter helper windows won't work/crash.
2015-03-07 13:41:12 +13:00
Florian Rival b2a3ec44a4 Tweaked CMakeLists.txt and some files for MacOS compilation 2015-03-07 12:15:08 +13:00
Florian Rival 1c58546dc9 Added tests for gdjs.InputManager 2015-03-04 15:37:55 +13:00
Florian Rival b7932c88fd Updated Travis configuration to launch GDJS tests 2015-03-04 11:34:27 +13:00
Florian Rival f4d905afe3 Added multitouch conditions and expression for HTML5 games. (Need testing and update cursor is on object condition) 2015-03-03 11:12:53 +01:00
Florian Rival cb84a16584 Added cursorOnObject condition support for HTML5 games. Added gdjs.evtTools.object.PickObjectsIf and tests for it. 2015-03-03 08:19:08 +01:00
Florian Rival 3eaf3504ce Added tests for gdjs.evtTools.object.TwoListsTest 2015-03-03 15:48:19 +13:00
Florian Rival acbb6d4594 Refactored the condition testing if the cursor is on a sprite object so that it can be used for any object type (Not yet done for GDJS). Added PickObjectsIf and refactored TwoObjectListsTest with C++11 lambdas. Added tests for it. 2015-03-02 10:47:35 +01:00
Florian Rival cc17702e46 Added gdjs.InputManager 2015-02-26 02:05:48 +01:00
Florian Rival bd7c09b05a Added CurrentSceneName() expression 2015-02-25 09:03:27 +01:00
Victor Levasseur a39b67b042 Move UTF8 tools to another file. Add conversion between UTF8 and wstring 2015-02-14 13:06:50 +01:00
Florian Rival 2317368415 Merge branch 'remove-boost' of https://github.com/victorlevasseur/GD into c++11
Conflicts:
	GDCpp/GDCpp/ObjInstancesHolder.cpp
2015-01-25 20:12:14 +01:00