1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 17:53:47 +00:00
Commit graph

1119 commits

Author SHA1 Message Date
fgenesis
3dda97d32a Hopefully fix build against SDL 1.2. Does not yet run!
Also: Recently introduced key names in usersettings.xml will no longer work.
But this should automatically detect key names as they used to be,
and convert automatically. Needs testing.
2017-02-15 04:41:52 +01:00
fgenesis
4095fde219 Move GL headers to ExternalLibs 2017-02-15 01:03:43 +01:00
fgenesis
b7e3e55cf1 Remove some unnecessary includes of glpng 2017-02-15 00:56:00 +01:00
fgenesis
33b9eebd3f Very tiny cosmetic change 2017-02-15 00:27:07 +01:00
False.Genesis
9cb18ecebd Merge pull request #57 from chewi/system-glpng
System GLPNG
2017-02-15 00:09:25 +01:00
James Le Cuirot
0dd19f9cb3
Add option to use system copy of GLPNG 2017-02-10 10:01:35 +00:00
James Le Cuirot
4d1fa75545
Put tinyxml2 in subdir so that system header is respected 2017-02-10 10:01:24 +00:00
James Le Cuirot
f19011e3dd
Delete duplicate GL headers
Nothing was pointing at BBGE/glext.

Only the VS project was pointing at ExternalLibs/GL. I have pointed it
at the headers under BBGE/GL instead.

I have also adjusted the includes to use the GL prefix as is standard
practise. These will still work as BBGE is in the include path. This
allows users to build against their system GL headers simply by
deleting the BBGE/GL directory.
2017-02-09 21:08:57 +00:00
fgenesis
89c1987693 Fix crash on shutdown
GL symbols were already unloaded in ~DarkLayer().
Why did this never crash before?!
2017-02-08 22:11:55 +01:00
fgenesis
1472c71bfe Merge branch 'experimental' into controllerfixup 2017-02-08 21:55:52 +01:00
fgenesis
5ba014640c Fix compile with VS2008, disable XMLDocument::LoadFile() 2017-02-08 21:53:59 +01:00
fgenesis
daca65d20a Merge branch 'experimental' into controllerfixup 2017-02-08 21:33:05 +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
fgenesis
58e3a247e4 Fix build on osx 2017-02-06 03:37:07 +01:00
fgenesis
7456e785fa Remove mandatory defines and their checks:
BBGE_BUILD_SHADERS
BBGE_BUILD_FRAMEBUFFER
BBGE_BUILD_OPENGL
BBGE_BUILD_OPENGL_DYNAMIC
2017-02-05 22:51:25 +01:00
fgenesis
c581ab01d8 Some preparations to compile with SDL1.2 (not yet!) 2017-02-05 21:25:06 +01:00
fgenesis
0b7334c7b7 Fix possible crash on mod enum 2017-02-05 21:24:43 +01:00
fgenesis
9229bb2c0a Add entity_v(), node_v() Lua functions 2017-02-05 21:08:01 +01:00
fgenesis
a3fb57fde9 un-recurse a thing 2017-01-21 03:34:38 +01:00
fgenesis
fb3edf413d Deprecate entity_incrTargetLeaches() & entity_decrTargetLeaches() properly 2017-01-21 03:34:12 +01:00
fgenesis
3b759294df Add support for mod script compatibility layers
This uses a new <Compatibility script="..." /> tag in a mod's XML file.
A compatbility layer is a script that runs before mod-init.lua is loaded,
and before any mod scripts are loaded when resuming a saved game.

This is a better solution than shipping a fragile wrapper
with every mod, that tends to break and then needs to be updated.
Now this wrapper is centralized, easy to use, and easy to update.

Closes #31.
2017-01-21 02:06:44 +01:00
fgenesis
8411838636 Remove entity myTimer and related Lua functions. Fix warnings for now unsigned Entity::layer
- entity_resetTimer()
- entity_stopTimer()
2017-01-20 20:54:17 +01:00
fgenesis
f3f93ef89e Little improvement for prev commit 2017-01-20 19:55:17 +01:00
Valentin Ochs
9245bee717 Fix some warnings
mostly sign-related, but also some about commas after the last item in
an enum list, usage of default in switches, implicit or old-style casts
2017-01-20 19:10:40 +01:00
fgenesis
21fa854c87 entities/squeezer.lua is unused 2017-01-20 02:21:16 +01:00
fgenesis
b52ff75c95 Little update fixing some minor things
Rename msg() Lua function to screenMessage().
Identify an unused script.
2017-01-20 02:20:58 +01:00
fgenesis
e35a309732 Revert small part of 8472718fb7
Re-add incrFlag(), decrFlag() Lua functions
2017-01-20 00:38:04 +01:00
fgenesis
d7cdb72143 Some more warning related stuff, but changed my mind about re-enabling the remaining ones :/ 2017-01-19 23:44:30 +01:00
fgenesis
7a60f493a5 Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01:00
fgenesis
0e6dccbb4e Thou shall not break the build (+ more warning fixes) 2017-01-19 21:48:47 +01:00
fgenesis
9bb3fe86f6 More signed/unsigned comparison fixes. int -> size_t. 2017-01-19 18:50:33 +01:00
False.Genesis
4134140be2 Merge pull request #51 from Cat-Ion/controllerfixup
Merge warning fixes into controllerfixup
2017-01-19 17:38:54 +01:00
Valentin Ochs
35eb6ac563 Fix mistake in combobox selection 2017-01-18 09:30:32 +01:00
Valentin Ochs
f9357e7fca Merge branch 'gccwarn' into controllerfixup 2017-01-17 11:15:47 +01: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
fgenesis
8c2f76b606 Get rid of some uses of dsq->inputMode 2017-01-15 00:38:36 +01:00
fgenesis
9d80077754 Preparations to get rid of DSQ::inputMode -- Pass device to action() methods. 2017-01-14 22:53:20 +01:00
fgenesis
e8a4b58e80 README update 2017-01-14 22:50:34 +01:00
Valentin Ochs
ac829a2e5f Only notify IRC on success when that changed 2017-01-14 21:05:26 +01:00
Valentin Ochs
beb2216265 Change some stuff for butt-endian architectures 2017-01-14 20:10:42 +01:00
Valentin Ochs
2374c1a86b Revert ~0 to -1 2017-01-14 19:22:37 +01:00
fgenesis
a648bdfe30 Small update to ttvfs_zip 2017-01-14 18:38:10 +01:00
Valentin Ochs
c988858cd2 This one slipped through 2017-01-14 18:30:58 +01:00
Valentin Ochs
4dc7e27ee6 Fix some more warnings 2017-01-14 18:23:53 +01:00
Valentin Ochs
fe0ab0418b Get rid of a lot of gcc warnings
Mostly signed/unsigned comparisons. Also some bugs, but I don't remember
where :D
2017-01-14 18:10:20 +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
fgenesis
dce0fc992c Merge branch 'experimental' into controllerfixup 2017-01-14 14:22:58 +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