mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2024-11-25 17:53:47 +00:00
d6dc3a8a09
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 |
||
---|---|---|
.. | ||
Aquaria.vcproj | ||
BBGE.vcproj | ||
external.vcproj |