mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-29 22:35:45 +00:00
Code Issues Releases Wiki Activity
693 commits 9 branches 3 tags 31 MiB
Commit graph

693 commits

This branch
This branch
All branches
Author SHA1 Message Date
False.Genesis
3742a5f2f5 Merge pull request #53 from chewi/experimental 
Bump TinyXML2 to 4.0.1
 2017-02-08 21:28:57 +01:00
James Le Cuirot
5a16a290fc
Bump TinyXML2 to 4.0.1 2017-02-08 10:21:25 +00:00
False.Genesis
55ad1e8faa Merge pull request #49 from Cat-Ion/experimental 
Only notify IRC on success when that changed
 2017-01-15 00:44:59 +01:00
Valentin Ochs
ac829a2e5f Only notify IRC on success when that changed 2017-01-14 21:05:26 +01:00
False.Genesis
ce4e76a3a1 Merge pull request #47 from Cat-Ion/travis 
Travis-CI integration. Closes #11
 2017-01-14 14:27:05 +01:00
Valentin Ochs
1e341052e0 enable IRC notifications 2017-01-14 14:11:38 +01:00
Valentin Ochs
648b7acfaa install sdl/openal on osx 2017-01-14 13:30:31 +01:00
Valentin Ochs
267e2b5696 Can I do multiple OSs like this? 2017-01-14 13:15:29 +01:00
Valentin Ochs
f1218a8d7b I don't know what I'm doing 2017-01-14 13:12:07 +01:00
Valentin Ochs
3aff70d91e Add CheckCXXCompilerFlag 2017-01-14 13:09:12 +01:00
Valentin Ochs
7eb08bf2ce Try to find C++ standard 2017-01-14 13:06:42 +01:00
Valentin Ochs
ef9d04b13b Merge remote-tracking branch 'upstream/experimental' into travis 2017-01-14 12:57:02 +01:00
fgenesis
7629fc0c33 Hopefully fix build on weird platforms 2017-01-14 12:52:08 +01:00
Valentin Ochs
d9c418f292 Switch to SDL 1 for container stuff 2017-01-14 12:30:22 +01:00
Valentin Ochs
23e3904f24 Changes for container-based infrastructure 2017-01-14 12:23:08 +01:00
False.Genesis
10d506740f Merge pull request #46 from Cat-Ion/cxxflags 
Set c/cxx flags to -Wall -pedantic
 2017-01-14 12:22:38 +01:00
Valentin Ochs
0f4c1208ba Install libsdl2 for travis 2017-01-14 12:20:29 +01:00
Valentin Ochs
95e2d2f8d9 Install openal for travis 2017-01-14 12:13:03 +01:00
Valentin Ochs
1ff004b33c nop, test travis 2017-01-14 12:09:39 +01:00
Valentin Ochs
092559f4d3 Add travis.yml config 2017-01-14 12:06:06 +01:00
Valentin Ochs
8886c03883 Set c/cxx flags to -Wall -pedantic 
Special case for freetype2: -Wno-extended-offsetof, to prevent some 140
warnings.
 2017-01-14 00:38:55 +01:00
fgenesis
8e576b66e7 Better FindTinyXML2.cmake. Fixes #44. 2017-01-13 13:11:11 +01:00
fgenesis
bb7cb7df71 update libogg, libvorbis, minihttp + enable /MP for vs2008 debug builds. 2017-01-13 13:09:16 +01:00
False.Genesis
6f4474df36 Merge pull request #45 from Cat-Ion/issue15 
Fix charIsUpper().
 2017-01-13 11:32:45 +01:00
Valentin Ochs
a317a0d273 Fix charIsUpper(). Solves issue #15. 2017-01-13 10:17:06 +01:00
fgenesis
d84a8bb2c2 fix possible startup crash 2017-01-12 23:57:21 +01:00
fgenesis
ffa26e4105 Update inlcuded ttvfs 2017-01-12 23:53:13 +01:00
False.Genesis
fe0a91129f Merge pull request #42 from Cat-Ion/foodholders 
FoodHolder changes
 2017-01-12 23:53:38 +01:00
Valentin Ochs
585489611b [foodholders] Foodholder changes 
- Add convenience functions toggleValid() and isValid() to wrap around
  the alpha/alphaMod members
- Fix bug #37 that allows cooking with the third slot at all times
 2017-01-12 23:38:07 +01:00
fgenesis
8af953cb63 Replace spaces with tabs (future self: i'm sorry) 
In most places, that is. Left some files unchanges because they are a mess.
 2017-01-12 22:51:46 +01:00
Valentin Ochs
dcd21b57bd Merge pull request #41 2017-01-12 22:14:26 +01:00
fgenesis
548da72632 Merge branch 'master' into experimental 
Conflicts:
	BBGE/SoundManager.cpp
	BBGE/SoundManager.h
 2016-06-20 02:05:42 +02:00
fgenesis
84366ad533 hopefully fix build on gcc6, tiny cleanup 
... in fact i forgot that much more cleanup was already done
on the experimental branch. whatever.
 2016-06-20 01:56:27 +02:00
fgenesis
96206dd82a Fix yet another oopsie RenderObject::setTexture() 
Didn't apply empty ("") texture when another texture was already set.
 2016-06-19 00:42:13 +02:00
fgenesis
06963a8d6a Implement loadXMLTable() Lua function 2016-06-10 02:26:43 +02:00
fgenesis
82c2122774 Do not restart DamageSprite scale interpolation when healed 2016-05-25 02:11:20 +02:00
fgenesis
589e5a90d4 derp 2016-05-14 17:50:39 +02:00
fgenesis
15c7776763 Remove TimeUpdateType enum and related code. Dynamic timestep was used all the time anyway. 2016-05-14 17:23:48 +02:00
fgenesis
9bb4226626 Remove RenderObjectLayer::sort() and related 2016-05-14 17:20:13 +02:00
fgenesis
c4b0decc10 Add some RenderObject child related functions: 
+ obj_getChild()
+ obj_removeChild()
+ obj_removeChildIdx()
+ obj_removeAllChildren()
+ obj_getNumChildren()
 2016-05-14 17:14:14 +02:00
fgenesis
65179870a9 Fix possible crash when loading applying a skeletal twice in one frame. 
Possibly a regression from 300f326777.
 2016-05-12 00:25:00 +02:00
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
False.Genesis
0ced7c1d50 Merge pull request #27 from nbraud/unifdef 
More cleanups
 2016-05-10 10:20:36 +02:00
fgenesis
2f0940f1df Fix yet another oopsie RenderObject::setTexture() 
Didn't apply empty ("") texture when another texture was already set.
 2016-05-09 08:15:41 +02:00
fgenesis
e7791c5ddc Remove RenderObject::collisionRects. 
Another vector that was always empty, optionally filled when specified
by a skeletal file, but none actually did this. Should be safe to remove.

Also small related optimization in Game::collideSkeletalVsCircle().
 2016-05-07 01:00:16 +02:00
fgenesis
35a3888c94 Remove RenderObject::collidePosition and related code 
This was always (0, 0) and optionally used for bones if defined in skeletal files.
None of the official skeletal files used this, so this should be safe to remove.
 2016-05-07 00:47:45 +02:00
fgenesis
d4a1e1ef1d Remove another unnecessary file 2016-05-05 20:36:10 +02:00
fgenesis
c26174d750 oops 2016-05-05 20:29:59 +02:00
Nicolas Braud-Santoni
fb8732e97d
Eradicate remnents of BBGE_BUILD_GFLW & SDL 2016-05-05 20:24:42 +02:00
Nicolas Braud-Santoni
bb50895595
Removing Z2D_J2K texture option 
Given that j2k-codec/ is nowhere to be found,
  this cannot possibly build.
 2016-05-05 20:15:11 +02:00