1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 09:44:02 +00:00
Commit graph

702 commits

Author SHA1 Message Date
Nicolas Braud-Santoni
1aceb0f0e4 fixup! Cirrus CI: Switch to the Ninja build executor 2020-07-13 22:11:35 +02:00
Nicolas Braud-Santoni
1db81ea84c Cirrus CI: Switch to the Ninja build executor 2020-07-13 22:10:21 +02:00
Nicolas Braud-Santoni
db06ace353 Cirrus CI: Simplify CMake invocation
Many thanks to Jan Beich for the tip  :)
2020-07-13 21:53:33 +02:00
Nicolas Braud-Santoni
91a45a4392 CI: Add FreeBSD build 2020-07-13 21:53:33 +02:00
Nicolas Braud-Santoni
bd4d67e72e Cirrus CI: Add macOS build task 2020-07-13 17:00:30 +02:00
Nicolas Braud-Santoni
cd19c4f7a4 Cirrus CI: Use clang on Linux 2020-07-13 17:00:30 +02:00
Nicolas Braud-Santoni
072d547de9 Add Cirrus CI tast for Linux build (Debian, amd64) 2020-07-13 17:00:27 +02:00
Nicolas Braud-Santoni
9e01b5b2d6 Drop Travis CI
The build has been red for years anyway, so it's not as if it was providing any
value.
2020-07-12 21:05:38 +02:00
fgenesis
5ba014640c Fix compile with VS2008, disable XMLDocument::LoadFile() 2017-02-08 21:53:59 +01:00
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