1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-25 14:15:46 +00:00
Aquaria/Aquaria
fgenesis 4bafcb3e18 Merge branch 'tinyxml2' into experimental. Thanks to James Le Cuirot for this.
Conflicts:
	Aquaria/UserSettings.cpp
	CMakeLists.txt
2014-06-09 22:31:39 +02:00
..
AnimationEditor.cpp Improve camera zooming behavior + camera related cleanups 2014-03-07 17:59:36 +01:00
Aquaria.ico initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
aquaria.rc Fix compile on win32. 2013-07-20 03:51:13 +02:00
AquariaComboBox.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
AquariaCompileConfig.h Stash commit 2014-06-09 16:38:19 +02:00
AquariaMenuItem.cpp Slightly more sensible error/msgbox handling 2013-06-23 18:50:10 +02:00
AquariaMenuItem.h Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
AquariaProgressBar.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
AquariaProgressBar.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
AquariaSaveSlot.cpp Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
AquariaWin32OSE.ico Get rid of AQUARIA_FULL define and move the setting to usersettings.xml. Some changes regarding AQUARIA_DEMO. 2013-07-20 02:27:53 +02:00
AStar.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
AutoMap.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
AutoMap.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
Avatar.cpp Pathfinding & map grid improvements. 2014-05-16 00:11:52 +02:00
Avatar.h Improve camera zooming behavior + camera related cleanups 2014-03-07 17:59:36 +01:00
Beam.cpp Make some ints floats. 2013-07-20 20:17:57 +02:00
BitBlotLogo.cpp Get rid of a few unnecessary continueity resets. 2013-10-28 04:29:46 +01:00
BoxElement.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
BubbleRender.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
CollideEntity.cpp Cleaning out some dead code. 2013-09-04 16:07:46 +02:00
CollideEntity.h Cleaning out some dead code. 2013-09-04 16:07:46 +02:00
Continuity.cpp Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
Credits.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
CurrentRender.cpp Disable all glEnable/glDisable() calls for GL_CULL_FACE, except one glDisable() during renderer init. 2013-05-02 04:31:07 +02:00
custom-fields.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
Demo.cpp Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
DSQ.cpp Merge branch 'tinyxml2' into experimental. Thanks to James Le Cuirot for this. 2014-06-09 22:31:39 +02:00
DSQ.h Include tinyxml2, update cmake to use this optionally 2014-06-09 22:21:24 +02:00
Element.cpp Map element code refactoring. Allow other entities to influence map elements (EFX_WAVY). 2013-09-24 17:00:06 +02:00
Element.h Map element code refactoring. Allow other entities to influence map elements (EFX_WAVY). 2013-09-24 17:00:06 +02:00
Elements.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
Emote.cpp [vfs, #3] All file reading code goes through the VFS now, new mod downloader & mod selector in place. Also a bunch of other stuff. (...) 2012-06-01 17:52:19 +02:00
Entity.cpp Pathfinding & map grid improvements. 2014-05-16 00:11:52 +02:00
Entity.h Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
ExternalGUI.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
FFTNotes.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
FlockEntity.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
FlockEntity.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
Game.cpp Merge branch 'tinyxml2' into experimental. Thanks to James Le Cuirot for this. 2014-06-09 22:31:39 +02:00
Game.h Merge branch 'tinyxml2' into experimental. Thanks to James Le Cuirot for this. 2014-06-09 22:31:39 +02:00
GameplayVariables.cpp Slightly more sensible error/msgbox handling 2013-06-23 18:50:10 +02:00
GasCloud.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
GridRender.cpp Pathfinding & map grid improvements. 2014-05-16 00:11:52 +02:00
GridRender.h Make world map reveal method configurable via user settings, 2012-10-14 03:46:47 +02:00
Hair.cpp Add some Lua functions, changes to hair. 2013-10-19 17:30:42 +02:00
Hair.h Add some Lua functions, changes to hair. 2013-10-19 17:30:42 +02:00
Ingredient.cpp Fix logic bug causing oil drops to rotate. Really fixed now! 2013-07-15 03:19:42 +02:00
Intro.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
Logo.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
Logo.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
Main.cpp Get rid of AQUARIA_FULL define and move the setting to usersettings.xml. Some changes regarding AQUARIA_DEMO. 2013-07-20 02:27:53 +02:00
ManaBall.cpp Fixed some script interface functions, error handling & code cleanups 2011-09-18 23:12:02 +02:00
MiniMapRender.cpp Respect more nodes' active status: PATH_STEAM, PATH_WARP, PATH_RADARHIDE, PATH_WATERBUBBLE, PATH_ZOOM. 2014-03-06 22:31:22 +01:00
Mod.cpp Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
ModDownloader.cpp Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
ModDownloader.h [vfs, #3] All file reading code goes through the VFS now, new mod downloader & mod selector in place. Also a bunch of other stuff. (...) 2012-06-01 17:52:19 +02:00
ModSelector.cpp Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
ModSelector.h modselector: Clean out some old code, add support to open URL via webbrowser. 2013-07-27 00:41:15 +02:00
Network.cpp Apply SDL2 patch by ryan, with some adjustments to apply properly. 2013-07-18 23:29:55 +02:00
Network.h [vfs, #3] All file reading code goes through the VFS now, new mod downloader & mod selector in place. Also a bunch of other stuff. (...) 2012-06-01 17:52:19 +02:00
NotEntities.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
ParticleEditor.cpp Move hardcoded UI strings to stringbank.txt. Patch by Henrik Holst. 2012-06-02 18:58:02 +02:00
Path.cpp Respect more nodes' active status: PATH_STEAM, PATH_WARP, PATH_RADARHIDE, PATH_WATERBUBBLE, PATH_ZOOM. 2014-03-06 22:31:22 +01:00
Path.h Respect more nodes' active status: PATH_STEAM, PATH_WARP, PATH_RADARHIDE, PATH_WATERBUBBLE, PATH_ZOOM. 2014-03-06 22:31:22 +01:00
PathFinding.cpp Pathfinding & map grid improvements. 2014-05-16 00:11:52 +02:00
PathFinding.h Pathfinding & map grid improvements. 2014-05-16 00:11:52 +02:00
PathRender.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
RecipeMenuEntry.cpp Some simplifications in ingredient name handling, by Henrik Holst 2012-07-11 22:00:14 +02:00
resource.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
SceneEditor.cpp Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
SchoolFish.cpp Fixed some script interface functions, error handling & code cleanups 2011-09-18 23:12:02 +02:00
SchoolFish.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
ScriptedEntity.cpp Add canShotHit() interface function 2014-04-01 18:16:33 +02:00
ScriptedEntity.h Add canShotHit() interface function 2014-04-01 18:16:33 +02:00
ScriptInterface.cpp Stash commit 2014-06-09 16:38:19 +02:00
ScriptInterface.h Add special memory allocator for Lua that should take some memory stress away from heavy scripting. 2013-08-26 21:02:46 +02:00
Segmented.cpp Fix some small performance bottlenecks: 2012-01-02 21:34:29 +01:00
Segmented.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
SFXLoops.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
Shot.cpp Add canShotHit() interface function 2014-04-01 18:16:33 +02:00
Shot.h Add canShotHit() interface function 2014-04-01 18:16:33 +02:00
Spore.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
StarRenderer.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
States.cpp Improve camera zooming behavior + camera related cleanups 2014-03-07 17:59:36 +01:00
States.h Fix animation editor problems: Undo buffer memory hoarding, add warning if saving failed. 2013-12-28 04:42:02 +01:00
StatsAndAchievements.cpp Move localisation code to BBGE, and allow textures to be localised. 2012-07-10 22:16:48 +02:00
StatsAndAchievements.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
SteamRender.cpp Respect more nodes' active status: PATH_STEAM, PATH_WARP, PATH_RADARHIDE, PATH_WATERBUBBLE, PATH_ZOOM. 2014-03-06 22:31:22 +01:00
Strand.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
StringBank.cpp Slightly more sensible error/msgbox handling 2013-06-23 18:50:10 +02:00
SubtitlePlayer.cpp Move localisation code to BBGE, and allow textures to be localised. 2012-07-10 22:16:48 +02:00
TileVector.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
ToolTip.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
ToolTip.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
UserSettings.cpp Merge branch 'tinyxml2' into experimental. Thanks to James Le Cuirot for this. 2014-06-09 22:31:39 +02:00
UserSettings.h Fix problematic Lua init and add user setting to keep 'os' and 'io' functions. 2014-05-16 01:03:54 +02:00
WaterFont.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
WaterFont.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
WaterSurfaceRender.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
WaterSurfaceRender.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
Web.cpp Implement loading/saving some more state data. 2013-06-23 22:28:46 +02:00
Web.h Implement loading/saving some more state data. 2013-06-23 22:28:46 +02:00
WorldMapRender.cpp Get rid of AQUARIA_FULL define and move the setting to usersettings.xml. Some changes regarding AQUARIA_DEMO. 2013-07-20 02:27:53 +02:00
WorldMapTiles.cpp Move hardcoded UI strings to stringbank.txt. Patch by Henrik Holst. 2012-06-02 18:58:02 +02:00