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

840 commits

Author SHA1 Message Date
fgenesis
02db145a01 Don't error for empty save slots 2017-08-09 21:02:45 +02:00
fgenesis
bd0e16774f Remove some old/unused cruft 2017-08-09 21:01:56 +02:00
fgenesis
fe93c91eca fix stupidity in prev commit 2017-07-14 03:36:43 +02:00
fgenesis
cabdf93e21 Tiny performance optimization
Keep disabled damage types vector sorted and do binary search.
2017-07-12 04:12:06 +02:00
fgenesis
78352d4402 Multi-display fixes
- Enumerate display modes to show in the resolution selector based on the
  screen we're on
- Correct graphics init code to use the display index specified in
  user settings
2017-06-26 08:34:30 +02:00
fgenesis
6f170de929 Proper ~Joystick() dtor. Make haptics optional. Hopefully fixes #50. 2017-06-25 15:56:45 +02:00
fgenesis
1af3b0f220 forgot console in prev commit 2017-06-25 15:13:06 +02:00
fgenesis
081c6bd58d Debug overlays should respect viewport size change 2017-06-25 13:58:18 +02:00
fgenesis
2bbcfa2284 Fix some ANimationEditor crashes when loading not-existing or empty anim XML 2017-04-19 02:06:34 +02:00
fgenesis
e633ce1014 Don't deprecate appendUserDataPath() 2017-04-04 19:29:07 +02:00
fgenesis
291848f39b Add Release-SDL1.2 config for VS2008 2017-04-04 19:28:34 +02:00
fgenesis
acb515b738 Unstick highlight in input config 2017-04-04 19:27:53 +02:00
fgenesis
08a884b375 whoops 2017-02-27 02:18:46 +01:00
fgenesis
19e967c7dd Fix crash in static initializer (how did this ever work?) 2017-02-27 02:03:46 +01:00
fgenesis
f75f81854a Check input strings in config for overflow 2017-02-27 02:03:19 +01:00
fgenesis
fc17c6edaf Compile fix 2017-02-27 01:25:18 +01:00
fgenesis
4e7e0df524 Get rid of MenuUp, MenuDown, MenuLeft, MenuRight action entries
This makes ACTION_MENU* internal and non-configurable, but Lua code
can still rely on those actions being sent so that controller input
can be interpreted as menu input where appropriate.

Closes #58.
2017-02-20 03:02:58 +01:00
fgenesis
d0bb8746ae Highlight bound slots and correct highlight shift by a few pixels (now properly centered!) 2017-02-19 03:48:05 +01:00
fgenesis
7f20f79d97 Display designated "empty" symbol on key config menu for unbound slots 2017-02-19 03:47:21 +01:00
fgenesis
dd4739e9a0 Now runs with both SDL 1.2 and SDL2 again 2017-02-19 01:45:55 +01:00
fgenesis
eccadf5bd7 Turns out using IDs was a bad idea, reverting to KEY_* strings 2017-02-18 22:09:43 +01:00
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