Commit Graph

172 Commits

Author SHA1 Message Date
Victor Levasseur 01196c6542 Fix compilation error with AddResource in the TileMapImporter 2015-12-13 15:52:50 +01:00
Victor Levasseur ad868362fe Merge branch 'feature/tilemap-tmx-import' 2015-12-12 22:23:24 +01:00
Florian Rival fe9252d3f9 Move SkinHelper to IDE/wxTools directory & avoid crash at startup if StartHerePage is deleted 2015-12-08 22:51:16 +01:00
Victor Levasseur e22cbbeabd Improve the tilemap tmx importer dialog 2015-12-01 22:59:23 +01:00
Victor Levasseur 71f0d25b77 Use a relative filepath for the imported tileset image 2015-12-01 17:26:26 +01:00
Victor Levasseur 91aa2ec604 Update the tileset editor when a tmx file is imported 2015-12-01 00:45:18 +01:00
Victor Levasseur 5dc0413f48 Reload the tileset image when imported from a tmx file 2015-12-01 00:40:33 +01:00
Victor Levasseur 7ff0bc3fa0 Use wxwidgets logger to show warnings and errors in the tmx importer 2015-11-30 13:51:07 +01:00
Florian Rival 780a022029 Add AudioResource 2015-11-18 22:57:45 +01:00
Victor Levasseur 476f6da7ec Use gd::NewNameGenerator to generate a name for the tileset imported image 2015-11-16 23:41:56 +01:00
Victor Levasseur 33ff92681e Add tileset image importation 2015-11-15 11:05:18 +01:00
Victor Levasseur 20afa9201d Improve the tmx importer's source code 2015-11-13 15:21:12 +01:00
Victor Levasseur 764443d31f Improve the tile hitbox importation 2015-11-12 18:29:40 +01:00
Victor Levasseur 539f68c013 Add hitbox import from .tmx file in TileMapObject 2015-11-11 12:19:24 +01:00
Victor Levasseur 078669bf55 Add "experimental" label to the .tmx file import 2015-11-09 23:10:51 +01:00
Victor Levasseur 3eb2a86b23 Add support for importing the tileset conf from a .tmx file 2015-11-09 23:08:35 +01:00
Victor Levasseur 10873c559d Use a fixed width font for the importer message text ctrl 2015-11-09 13:46:44 +01:00
Victor Levasseur 34a902dc11 Some adjustments 2015-11-08 22:06:28 +01:00
Victor Levasseur e1c56f1c71 Add Tilemap importation (not tileset and hitboxes for now) 2015-11-08 21:59:20 +01:00
Victor Levasseur 02891a777b Fix image paths in wxcrafter dialogs 2015-11-08 20:06:14 +01:00
Victor Levasseur 18c5a230a3 Change TileMapObject source code organization and added tmx-parser 2015-11-08 19:05:48 +01:00
Florian Rival db69c83a58 Change file organization 5 (GDCpp/Project) 2015-11-01 17:06:23 +01:00
Florian Rival e4fab74a32 Change file organization 2 (Events, Extensions + more folders) 2015-11-01 11:26:40 +01:00
Florian Rival 63cb853d72 Change file organization (Events, Extensions + more folders) 2015-11-01 11:26:40 +01:00
Florian Rival f4a603217c Merge pull request #209 from victorlevasseur/bugfix/tilemap-empty-image-fix
Fix tilemap object crash when using an empty image (or invalid file)
2015-10-27 18:15:07 +01:00
Victor Levasseur ee0ad9d346 Fix tilemap object crash when using an empty image (or invalid file) 2015-10-27 17:56:09 +01:00
Victor Levasseur 8462eefb7d Use gd::HelpFileAccess::OpenPage instead of OpenURL in GDevelop 2015-10-25 18:45:02 +01:00
Victor Levasseur a6a983d7b2 Remove debug warnings when opening the TileMapObject editor 2015-09-07 10:06:24 +02:00
Victor Levasseur 3dcbcd7a4b Fix gd::ToString used in TileSetConfigurationEditor 2015-08-27 14:21:57 +02:00
Victor Levasseur 69c3a62389 Merge remote-tracking branch 'upstream/master' into bugfix/tilemap-optimization 2015-08-27 14:07:38 +02:00
Victor Levasseur 9552cb75b8 Merge remote-tracking branch 'upstream/feature/behavior-renaming' into replace-uint-with-size_t 2015-08-19 19:13:51 +02:00
Florian Rival 457808961b Various small refactorings and typo fixes 2015-08-18 19:29:37 +02:00
Victor Levasseur cc6810e3f6 Replace unsigned int with std::size_t where it's possible 2015-08-18 18:43:39 +02:00
Florian Rival a5fd4ea861 Remove useless parameters when calling AddParameter in *Extension.cpp 2015-08-17 19:00:13 +02:00
Victor Levasseur cf52c46035 Resize m_collidable vector to be sure it has the same size as the tile
count
2015-08-04 11:47:14 +02:00
Victor Levasseur 3321b71c33 Use TileSet::GetTileHitboxRef to get a ref to an hitbox
TileSet::GeTileHitbox now only returns by value (no more by ref overload)
(It avoids creating hitboxes in the cache ofthe Tilemap during generation)
2015-08-02 18:36:58 +02:00
Victor Levasseur d5ff851baa Add a note in the change texture action of the TileMapObject 2015-08-02 17:55:22 +02:00
Victor Levasseur 63d3258586 Remove TileSet::Generate(), add TileSet::StripUselessHitboxes()
to strip default hitboxes from the tileset data when closing the editor
Update an example to use the new TileSet serialization format
2015-08-02 17:22:44 +02:00
Victor Levasseur 7bc23ca655 Reduce TileMapObject memory consumption
(Texture coords are now calculated on the fly, only non-default hitboxes
are stored and collidable property is separated from hitbox storage)
2015-07-31 18:13:34 +02:00
Victor Levasseur 18c59dbb5d Totally remove ToString(), ToInt(), ToFloat() and ToDouble() 2015-07-22 16:20:26 +02:00
Victor Levasseur f0a9b14e73 Remove gd::String::FromXXX/ToXXX methods 2015-07-22 01:30:17 +02:00
Victor Levasseur 2a0052b207 Add gd::String::From/To template to replace all FromXXX/ToXXX() methods 2015-07-21 14:35:29 +02:00
victorlevasseur 5c3c9fb413 Merge remote-tracking branch 'upstream/master' into utf8-gdstring
Conflicts:
	Core/GDCore/PlatformDefinition/Layout.cpp
2015-07-17 23:18:17 +02:00
victorlevasseur e0bbd7584c Fix TileSetConfigurationEditor crashing on Windows 2015-07-16 16:00:11 +02:00
Victor Levasseur 3f1b677f92 Replace std::string with gd::String in TileMapObject 2015-07-11 14:49:15 +02:00
victorlevasseur 2fe320ee3b Remove GD_T() macro 2015-07-07 13:30:13 +02:00
victorlevasseur c98e97e60a Merge remote-tracking branch 'upstream/master' into utf8-gdstring
Conflicts:
	.travis.yml
	Core/GDCore/BuiltinExtensions/SpriteExtension/Dialogs/SpriteObjectEditor.cpp
	Core/GDCore/Events/Builtin/ForEachEvent.h
	Core/GDCore/Events/Event.cpp
	Core/GDCore/Events/Event.h
	Core/GDCore/Events/EventMetadata.cpp
	Core/GDCore/Events/EventMetadata.h
	Core/GDCore/Events/ExpressionMetadata.h
	Core/GDCore/Events/Instruction.h
	Core/GDCore/Events/InstructionMetadata.h
	Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp
	Core/GDCore/PlatformDefinition/Object.cpp
	Core/GDCore/PlatformDefinition/PlatformExtension.cpp
	Core/GDCore/PlatformDefinition/PlatformExtension.h
	Extensions/Function/Extension.cpp
	Extensions/TextObject/TextObject.h
	Extensions/TimedEvent/Extension.cpp
	GDCpp/GDCpp/BuiltinExtensions/CommonInstructionsExtension.cpp
	GDCpp/GDCpp/BuiltinExtensions/KeyboardTools.h
	GDCpp/GDCpp/BuiltinExtensions/MouseTools.h
	GDCpp/GDCpp/BuiltinExtensions/SceneExtension.cpp
	GDCpp/GDCpp/InputManager.cpp
	GDCpp/GDCpp/RuntimeSpriteObject.cpp
	GDCpp/GDCpp/RuntimeSpriteObject.h
	GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp
	GDJS/GDJS/BuiltinExtensions/CommonInstructionsExtension.cpp
	GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp
	GDJS/GDJS/BuiltinExtensions/VariablesExtension.cpp
	GDJS/GDJS/Exporter.cpp
	GDJS/GDJS/Exporter.h
	IDE/Dialogs/ObjectsEditor.cpp
	IDE/Preferences.cpp
2015-07-06 15:16:59 +02:00
Victor Levasseur b32732916c Actions and conditions are declared in the extension with gd::String (except for the sentence)
Added push_back and Split methods to gd::String
2015-06-25 16:49:40 +02:00
Victor Levasseur 90b4dceeee Add "Resize tilemap" action 2015-06-08 13:53:45 +02:00
Victor Levasseur 183dc4bcfd The tile size cannot be bigger than the tileset texture size anymore 2015-06-05 10:00:37 +02:00