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

27 commits

Author SHA1 Message Date
fgenesis
dcd4fe6c86 Implement configurable screenshot key 2016-07-14 04:59:08 +02:00
fgenesis
a043dd852f Major input handling improvements (#28):
- Support joystick hotplugging
- Support axes as buttons (means xbox360 shoulder triggers can be used as buttons)
- Show pretty joystick axis & button names if possible
- Tabify input actions UI
- Add 'mouse' column to input actions UI
- Allow to configure form hotkeys
- Allow ALL keys, get rid of internal key remapping
- SDL2: Use scancodes instead of keycodes since they are layout independent
- Allow extra mouse buttons (if present)
- Remove "lmbd" & "lmbu" actions in favor of "PrimaryAction" & "SecondaryAction"
  Makes the configuration less redundant and doesn't send each action twice,
  which happened if both were set to the same key.
- Fix Regressions from prev commits (menu not opening on Esc)

Still has a few minor bugs/issues that need to be fixed,
but pushing this now before the commit gets too large again.
2016-07-13 05:00:19 +02:00
fgenesis
8472718fb7 Major include refactor; changes to pretty much everything
This untangles some of the gigantic kitchen sink headers
in an attempt to split things into smaller files.
Also don't include gl.h, glext.h, windows.h,
and other such nonsense *everywhere*.

Lots of cleanups on the way too. More dead/unused code removal.

Remove incrFlag(), decrFlag() Lua functions.
2016-07-09 04:18:40 +02:00
fgenesis
0fdc0e8acc Delete spinycrab glow on death. Fixes #16. 2015-01-14 21:40:54 +01:00
fgenesis
b4906a3840 Fix possible dangling pointer / crash in predatorytunicate script 2014-12-29 00:36:00 +01:00
fgenesis
86d2fcebda Fix problematic Lua init and add user setting to keep 'os' and 'io' functions.
From the Lua 5.1 manual:
"The luaopen_* functions (to open libraries) cannot be called directly,
like a regular C function. They must be called through Lua,
like a Lua function."

All standard tables are now loaded with luaL_openlibs(), which includes os and io.
Because these are inherently unsafe, there is a new config setting:
<AllowDangerousScriptFunctions on="1" />
This is disabled by default.
The title screen will show a warning when the setting is on.
2014-05-16 01:03:54 +02:00
fgenesis
96195219e8 Move scripts to files, to make automated overriding easier 2013-11-17 02:23:39 +01:00
fgenesis
7de589e275 Add custom upper<->lowercase translation tables for better localization support.
Translation tables by Henrik Holst.
2013-11-14 17:58:33 +01:00
fgenesis
3c0de8227c Merge branch 'modsel-cleanup' 2013-07-27 00:43:07 +02:00
fgenesis
86acaf84e1 Replace modselector gfx, part 1
Icons made by Frances Fawcett. Download button based on work By EntiteFred.
(Via http://www.bit-blot.com/forum/index.php?topic=931.msg10207#msg10207)
2013-07-26 23:38:37 +02:00
fgenesis
91bb344c9a Add some files missing in the HiB vesions for MacOSX/Linux, for completeness.
They are not GPL licensed but for the sake of easier updating it's better
to have them in the repo.

I've been shipping them with the updatepacks I posted at the forums:
http://www.bit-blot.com/forum/index.php?topic=4313.0

In case of doubt, here's a twitter conversation that putting
those files out was okay:
https://twitter.com/fgblurb/status/173485302416023552
https://twitter.com/infinite_ammo/status/173501010008997888
https://twitter.com/fgblurb/status/173506934467592193
https://twitter.com/infinite_ammo/status/173508138207686657
https://twitter.com/fgblurb/status/173508595755925504
2013-07-20 00:52:09 +02:00
fgenesis
2bc3882a69 Add missing map #55 to the world map: The whale. 2013-06-23 03:15:55 +02:00
fgenesis
416b521a12 Initial support for loading android save files.
Apparently there is a new map with the index 55 -- a related entry was
added to the worldmap.txt file to prevent data loss, just in case.
<StartData ch=... /> field is not yet handled missing.
Hopefully the resulting format can be loaded on android without problems,
especially because both "ingr" and "ingrNames" fields appear in the
StartData tag now.
2013-06-20 21:39:17 +02:00
fgenesis
8bd1454eee Related stringbank.txt update, thx KS-10 2012-07-22 03:40:58 +02:00
fgenesis
4a02a4185a ru stringbank.txt update, thx KS-10! 2012-07-14 19:52:03 +02:00
fgenesis
927928167b Move key config strings into stringbank.txt 2012-07-14 16:54:28 +02:00
fgenesis
b0f18e9030 Another few-pixel fix for the rusian font 2012-07-14 13:03:15 +02:00
fgenesis
b136da8e3b Fixed up russian font glf file & changed a few pixels that were off. 2012-07-13 21:08:30 +02:00
fgenesis
d676d81137 Add achievements.txt and russian songs.xml 2012-07-13 16:11:52 +02:00
fgenesis
918c69d15b Some simplifications in ingredient name handling, by Henrik Holst 2012-07-11 22:00:14 +02:00
fgenesis
500355019d More russian data files.
The .glf file is based on the original russian file, but binary-patched
so that the game can load it without special hacks messing with
texture coordinates, which would break loading the original english glf file.
2012-07-10 22:22:05 +02:00
fgenesis
86bcecf5d2 Improved russian ingredients translation, thx KS-10! 2012-06-19 16:22:46 +02:00
fgenesis
c7d7e6126f Some russian locale files for testing. Stringbank is incomplete. 2012-06-19 02:18:22 +02:00
fgenesis
5d871383f6 Forgot one file 2012-06-19 02:16:24 +02:00
fgenesis
98c5cefed7 Ingredient name localisation somewhat works, not fully tested yet 2012-06-18 18:54:41 +02:00
fgenesis
a420aa4f70 Missing graphics for new mod selector 2012-06-02 18:58:52 +02:00
fgenesis
b5518c28cd Move hardcoded UI strings to stringbank.txt. Patch by Henrik Holst. 2012-06-02 18:58:02 +02:00