1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-29 22:35:45 +00:00
Commit graph

1063 commits

Author SHA1 Message Date
fgenesis
b8b9039693 don't plop up error message for non-existing save files 2019-04-14 19:45:14 +02:00
fgenesis
6704fd1ac6 fix SDL 1.2 window focus handling 2019-03-24 21:15:27 +01:00
fgenesis
0f0d839fc7 block help screen from accidentally opening in key config menu, and make sure (?)-button isn't shown 2019-03-24 19:45:52 +01:00
fgenesis
0abe0f821c hard-wire Escape key to always trigger ACTION_ESC.
Additional config for more keys/button to trigger the same action
is still possible.
2019-03-18 01:07:14 +01:00
fgenesis
520c71fdb7 old shit begone 2019-03-18 00:51:28 +01:00
fgenesis
77709a2d85 Display errors when loading XML fails 2019-03-18 00:50:56 +01:00
fgenesis
b7a6b52fe5 SDL window backend cleanup 2019-03-18 00:50:36 +01:00
fgenesis
04c557f5e8 Refactor Window functionality out of Core. Minor cleanups.
SDL2 impl seems to work, SDL1 impl finalization pending.
2019-01-29 00:36:48 +01:00
fgenesis
3fe9b1590c SDL 1.2 backend compiles again, but window stays black 2018-04-17 01:28:23 +02:00
fgenesis
64150bcb5b Merge branch 'controllerfixup' of github.com:AquariaOSE/Aquaria into controllerfixup 2018-04-17 01:16:47 +02:00
fgenesis
239df3c339 compiles again 2018-04-17 01:15:30 +02:00
fgenesis
5f2eafad7c temp commit 2018-01-21 12:47:32 +01:00
meh2481
eae1e31e80 Add both sdl1.2 and sdl2 builds to travis 2018-01-06 21:52:18 -05:00
meh2481
c279a8b17c Fix .travis.yml to use SDL1.2 2018-01-06 21:29:14 -05:00
fgenesis
8f565c6171 Include stringbank.txt into binary in case stringbank.txt is out of date
This makes sure engine-internal strings are always present.
2018-01-02 20:59:38 +01:00
fgenesis
ce4f6a7d3e move StringBank to BBGE 2018-01-02 17:00:27 +01:00
fgenesis
3a96c775db work around dev warning message; fix compiler warning 2018-01-02 16:18:50 +01:00
fgenesis
1acad1069e Add some Lua functions for Android compat:
+ getEntityList()
+ entity_getEntityListInRange(e, range)
+ vector_getEntityListInRange(x, y, range)
2018-01-02 15:39:18 +01:00
fgenesis
fec1cc7ac2 Initial support for scriptable shots 2017-11-01 19:25:31 +01:00
fgenesis
eb1f38d86c Minor script interface cleanup and prep for next commit 2017-11-01 19:25:19 +01:00
fgenesis
64406419c1 Some fixes for msys2/mingw build 2017-09-02 22:13:46 +02:00
fgenesis
4cfeadeb6e Whoever figured that enabling -Wall on MSVC would be a good idea should be shot. 2017-09-02 20:28:19 +02:00
fgenesis
db4af79389 Check against nesting recursive main() 2017-08-09 22:07:37 +02:00
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