mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-25 15:33:57 +00:00
Code Issues Releases Wiki Activity
Aquaria/Aquaria
History
fgenesis 03c698320a Merge branch 'experimental' into controllerfixup 
# Conflicts:
#	Aquaria/AnimationEditor.cpp
#	Aquaria/AquariaComboBox.cpp
#	Aquaria/AquariaMenuItem.h
#	Aquaria/Avatar.cpp
#	Aquaria/BitBlotLogo.cpp
#	Aquaria/Continuity.cpp
#	Aquaria/DSQ.cpp
#	Aquaria/DSQ.h
#	Aquaria/Game.cpp
#	Aquaria/Game.h
#	Aquaria/Intro.cpp
#	Aquaria/RecipeMenuEntry.cpp
#	Aquaria/SceneEditor.cpp
#	Aquaria/States.h
#	Aquaria/UserSettings.cpp
#	BBGE/ActionMapper.cpp
#	BBGE/Base.cpp
#	BBGE/BitmapFont.h
#	BBGE/Core.cpp
#	BBGE/Core.h
#	BBGE/ParticleManager.cpp
#	BBGE/Particles.h
#	BBGE/RenderObject.h
#	BBGE/Shader.cpp
#	BBGE/Shader.h
#	BBGE/SkeletalSprite.h
#	BBGE/Texture.cpp
#	BBGE/Vector.h
2021-01-12 00:26:44 +01:00
..
AnimationEditor.cpp Merge branch 'experimental' into controllerfixup 2021-01-12 00:26:44 +01:00
AnimationEditor.h Merge branch 'experimental' into controllerfixup 2021-01-12 00:26:44 +01:00
Aquaria.ico initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
aquaria.rc Remove another unnecessary file 2016-05-05 20:36:10 +02:00
AquariaComboBox.cpp Fix some more warnings 2021-01-11 12:28:27 +01:00
AquariaCompileConfig.h Fix some warnings 2017-01-20 19:10:40 +01:00
AquariaMenuItem.cpp preliminary support for joystick POV-hats 2020-07-07 22:30:25 +02:00
AquariaMenuItem.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
AquariaSaveSlot.cpp move StringBank to BBGE 2018-01-02 17:00:27 +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 Remove commented-out code 2016-05-05 19:57:50 +02:00
AutoMap.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Avatar.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Avatar.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Beam.cpp Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01:00
Beam.h Major include refactor; changes to pretty much everything 2016-07-09 04:18:40 +02:00
BitBlotLogo.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
CollideEntity.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
CollideEntity.h Remove commented-out code 2016-05-05 19:57:50 +02:00
Continuity.cpp Merge branch 'experimental' into controllerfixup 2021-01-12 00:26:44 +01:00
Continuity.h remove some unused code 2020-07-13 23:13:07 +02:00
Credits.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
CurrentRender.cpp Tiny header cleanup 2016-07-19 02:59:30 +02:00
custom-fields.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
Damage.h Fix some warnings 2017-01-20 19:10:40 +01:00
Demo.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
DSQ.cpp Fix some more warnings 2021-01-11 12:28:27 +01:00
DSQ.h Merge branch 'experimental' into controllerfixup 2021-01-12 00:26:44 +01:00
Element.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Element.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Elements.h Remove commented-out code 2016-05-05 19:57:50 +02:00
Emote.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Entity.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Entity.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
FlockEntity.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
FlockEntity.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Game.cpp Merge branch 'experimental' into controllerfixup 2021-01-12 00:26:44 +01:00
Game.h Merge branch 'experimental' into controllerfixup 2021-01-12 00:26:44 +01:00
GameEnums.h Get rid of MenuUp, MenuDown, MenuLeft, MenuRight action entries 2017-02-20 03:02:58 +01:00
GameplayVariables.cpp move StringBank to BBGE 2018-01-02 17:00:27 +01:00
GameStructs.cpp More signed/unsigned comparison fixes. int -> size_t. 2017-01-19 18:50:33 +01:00
GameStructs.h Merge branch 'gccwarn' into controllerfixup 2017-01-17 11:15:47 +01:00
GasCloud.cpp Major include refactor; changes to pretty much everything 2016-07-09 04:18:40 +02:00
GasCloud.h Major include refactor; changes to pretty much everything 2016-07-09 04:18:40 +02:00
GridRender.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
GridRender.h Preparations to get rid of DSQ::inputMode -- Pass device to action() methods. 2017-01-14 22:53:20 +01:00
Hair.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Hair.h Add some Lua functions, changes to hair. 2013-10-19 17:30:42 +02:00
InGameMenu.cpp improvements to key config menu 2020-07-07 16:24:03 +02:00
InGameMenu.h improvements to key config menu 2020-07-07 16:24:03 +02:00
Ingredient.cpp Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01:00
Ingredient.h Major include refactor; changes to pretty much everything 2016-07-09 04:18:40 +02:00
Intro.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Intro.h Major include refactor; changes to pretty much everything 2016-07-09 04:18:40 +02:00
Logo.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Logo.h Merge pull request #41 2017-01-12 22:14:26 +01:00
Main.cpp Some fixes for msys2/mingw build 2017-09-02 22:13:46 +02:00
ManaBall.cpp Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01:00
ManaBall.h Major include refactor; changes to pretty much everything 2016-07-09 04:18:40 +02:00
MiniMapRender.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Mod.cpp Add support for mod script compatibility layers 2017-01-21 02:06:44 +01:00
Mod.h Add support for mod script compatibility layers 2017-01-21 02:06:44 +01:00
ModDownloader.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +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 Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
ModSelector.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Network.cpp update libogg, libvorbis, minihttp + enable /MP for vs2008 debug builds. 2017-01-13 13:09:16 +01:00
Network.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
NotEntities.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
ParticleEditor.cpp move StringBank to BBGE 2018-01-02 17:00:27 +01:00
Path.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Path.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
PathFinding.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
PathFinding.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
PathRender.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
RecipeMenuEntry.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
RecipeMenuEntry.h Huge Game.cpp refactor and various other things 2016-06-30 02:58:55 +02:00
SceneEditor.cpp Merge branch 'experimental' into controllerfixup 2021-01-12 00:26:44 +01:00
SceneEditor.h Remove some unnecessary includes of glpng 2017-02-15 00:56:00 +01:00
SchoolFish.cpp Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01:00
SchoolFish.h Remove commented-out code 2016-05-05 19:57:50 +02:00
ScriptedEntity.cpp This one slipped through 2021-01-11 12:28:27 +01:00
ScriptedEntity.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
ScriptInterface.cpp Fix some more warnings 2021-01-11 12:28:27 +01:00
ScriptInterface.h Minor script interface cleanup and prep for next commit 2017-11-01 19:25:19 +01:00
Segmented.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Segmented.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
SFXLoops.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Shot.cpp Initial support for scriptable shots 2017-11-01 19:25:31 +01:00
Shot.h Initial support for scriptable shots 2017-11-01 19:25:31 +01:00
Spore.cpp Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01:00
Spore.h Major include refactor; changes to pretty much everything 2016-07-09 04:18:40 +02:00
States.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
States.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
StatsAndAchievements.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
StatsAndAchievements.h Replace spaces with tabs (future self: i'm sorry) 2017-01-12 22:51:46 +01:00
SteamRender.cpp Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01:00
Strand.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
StringBank_gen.h Include stringbank.txt into binary in case stringbank.txt is out of date 2018-01-02 20:59:38 +01:00
SubtitlePlayer.cpp Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01:00
SubtitlePlayer.h More signed/unsigned comparison fixes. int -> size_t. 2017-01-19 18:50:33 +01: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 Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01: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 Change some stuff for butt-endian architectures 2021-01-11 12:28:27 +01:00
UserSettings.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
WaterSurfaceRender.cpp Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01: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 Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Web.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
WorldMap.h Merge branch 'gccwarn' into controllerfixup 2017-01-17 11:15:47 +01:00
WorldMapRender.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
WorldMapTiles.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00