1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 09:44:02 +00:00
Aquaria/BBGE
fgenesis d6dc3a8a09 Merge branch 'experimental' into moreclean
Conflicts:
	Aquaria/Avatar.cpp
	Aquaria/BoxElement.cpp
	Aquaria/BubbleRender.cpp
	Aquaria/FFTNotes.cpp
	Aquaria/StarRenderer.cpp
	Aquaria/WaterFont.cpp
	Aquaria/resource.h
	BBGE/AnimatedSprite.cpp
	BBGE/AnimatedSprite.h
	BBGE/BloomEffect.cpp
	BBGE/CShim.cpp
	BBGE/Collision.cpp
	BBGE/Collision.h
	BBGE/Core.cpp
	BBGE/Core.h
	BBGE/Cube.cpp
	BBGE/Cutscene.cpp
	BBGE/DFSprite.cpp
	BBGE/DFSprite.h
	BBGE/Datafile.cpp
	BBGE/Datafile.h
	BBGE/Flags.h
	BBGE/Interpolator.cpp
	BBGE/Light.cpp
	BBGE/Light.h
	BBGE/LightCone.cpp
	BBGE/Model.cpp
	BBGE/Model.h
	BBGE/OggStream.cpp
	BBGE/PackRead.cpp
	BBGE/PointSprites.cpp
	BBGE/RenderObject.cpp
	BBGE/SkeletalSprite.cpp
2016-05-10 18:40:01 +02:00
..
GL Remove commented-out code 2016-05-05 19:57:50 +02:00
glext Remove commented-out code 2016-05-05 19:57:50 +02:00
ActionInput.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
ActionInput.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
ActionMapper.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
ActionMapper.h Remove commented-out code 2016-05-05 19:57:50 +02:00
ActionSet.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
ActionSet.h Remove commented-out code 2016-05-05 19:57:50 +02:00
AfterEffect.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
AfterEffect.h Remove commented-out code 2016-05-05 19:57:50 +02:00
Base.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Base.h Remove commented-out code 2016-05-05 19:57:50 +02:00
BaseText.h Add two more font/text related Lua functions, and some more: 2015-11-16 03:59:47 +01:00
BBGECompileConfig.h Apply SDL2 patch by ryan, with some adjustments to apply properly. 2013-07-18 23:29:55 +02:00
bithacks.h Remove commented-out code 2016-05-05 19:57:50 +02:00
BitmapFont.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
BitmapFont.h Remove commented-out code 2016-05-05 19:57:50 +02:00
Cocoa.mm Update Cocoa.mm 2014-04-22 16:11:17 -06:00
Core.cpp Merge branch 'experimental' into moreclean 2016-05-10 18:40:01 +02:00
Core.h Merge branch 'experimental' into moreclean 2016-05-10 18:40:01 +02:00
DarkLayer.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
DarkLayer.h Remove commented-out code 2016-05-05 19:57:50 +02:00
DebugFont.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
DebugFont.h Remove commented-out code 2016-05-05 19:57:50 +02:00
Effects.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Effects.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
Emitter.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Event.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Event.h Remove commented-out code 2016-05-05 19:57:50 +02:00
FmodOpenALBridge.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
FmodOpenALBridge.h Remove FMOD::Channel::setPan(), which is now defunct. 2013-07-22 13:35:45 +02:00
FrameBuffer.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
FrameBuffer.h Remove commented-out code 2016-05-05 19:57:50 +02:00
Gradient.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Gradient.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
Joystick.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
LensFlare.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
LensFlare.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
Localization.cpp OS X: Fix a memory overrelease. 2014-06-27 14:48:24 -06:00
Localization.h _mods/x/locales/y/* now works 2012-07-14 15:00:37 +02:00
Math.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
MathFunctions.h Minor debug improvements + misc 2012-01-31 19:25:13 +01:00
MemoryAllocatorSmallBlock.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
MemoryAllocatorSmallBlock.h Remove commented-out code 2016-05-05 19:57:50 +02:00
MT.cpp Eliminating obsolete #ifdefs and friends (#26) 2016-05-05 03:49:41 +02:00
MT.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
OpenGLStubs.h Fix some small performance bottlenecks: 2012-01-02 21:34:29 +01:00
ParticleEffect.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
ParticleManager.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Particles.cpp initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
Particles.h Remove commented-out code 2016-05-05 19:57:50 +02:00
Precacher.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Precacher.h Add precacher for mods 2013-05-24 03:34:10 +02:00
ProfRender.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
ProfRender.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
Quad.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Quad.h Remove commented-out code 2016-05-05 19:57:50 +02:00
QuadTrail.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
QuadTrail.h Remove commented-out code 2016-05-05 19:57:50 +02:00
Rect.h Remove commented-out code 2016-05-05 19:57:50 +02:00
Refcounted.h Refactor texture loading code; should fix a crash that started appearing recently. 2015-03-24 00:06:51 +01:00
RenderObject.cpp Merge branch 'experimental' into moreclean 2016-05-10 18:40:01 +02:00
RenderObject.h Merge branch 'experimental' into moreclean 2016-05-10 18:40:01 +02:00
RenderObject_inline.h Remove commented-out code 2016-05-05 19:57:50 +02:00
RenderObjectLayer.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
RenderRect.cpp Eliminating obsolete #ifdefs and friends (#26) 2016-05-05 03:49:41 +02:00
RoundedRect.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
RoundedRect.h Remove commented-out code 2016-05-05 19:57:50 +02:00
ScreenTransition.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
ScreenTransition.h Remove commented-out code 2016-05-05 19:57:50 +02:00
ScriptObject.cpp Fix setGemPosition(), add more Lua functions: 2013-10-25 01:47:24 +02:00
ScriptObject.h Fix setGemPosition(), add more Lua functions: 2013-10-25 01:47:24 +02:00
Shader.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Shader.h Eliminating obsolete #ifdefs and friends (#26) 2016-05-05 03:49:41 +02:00
SimpleIStringStream.h Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95) 2012-09-23 04:51:13 +02:00
SkeletalSprite.cpp Merge branch 'experimental' into moreclean 2016-05-10 18:40:01 +02:00
SkeletalSprite.h Merge branch 'experimental' into moreclean 2016-05-10 18:40:01 +02:00
Slider.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Slider.h initial commit. This is icculus version 5542b94cae02a6333845854bbbd1abe0a259f1a4 2011-08-03 22:05:33 +02:00
SoundManager.cpp Merge branch 'experimental' into moreclean 2016-05-10 18:40:01 +02:00
SoundManager.h Remove commented-out code 2016-05-05 19:57:50 +02:00
SpawnParticleData.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
StateMachine.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
StateMachine.h Remove commented-out code 2016-05-05 19:57:50 +02:00
StateManager.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
StateManager.h Remove commented-out code 2016-05-05 19:57:50 +02:00
Strings.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Texture.cpp Removing Z2D_J2K texture option 2016-05-05 20:15:11 +02:00
Texture.h Remove commented-out code 2016-05-05 19:57:50 +02:00
TTFFont.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
TTFFont.h Add two more font/text related Lua functions, and some more: 2015-11-16 03:59:47 +01:00
Vector.cpp Remove commented-out code 2016-05-05 19:57:50 +02:00
Vector.h Remove commented-out code 2016-05-05 19:57:50 +02:00