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
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
acb515b738
Unstick highlight in input config
2017-04-04 19:27:53 +02: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
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
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
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
fgenesis
daca65d20a
Merge branch 'experimental' into controllerfixup
2017-02-08 21:33:05 +01:00
James Le Cuirot
5a16a290fc
Bump TinyXML2 to 4.0.1
2017-02-08 10:21:25 +00: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
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
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
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
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
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
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
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
fgenesis
eb8ef1fdf7
Use refresh rate setting + attempt to improve window/fullscreen apply logic
2017-01-14 00:06:04 +01:00
fgenesis
b781b45789
Implement "Desktop" resolution (0x0, default). Also fix music slider update in options menu
...
This makes the window resizable in desktop mode, and fixed size otherwise.
Fullscreen desktop has always the dame resolution as the desktop.
Add config setting to specify initial display.
Add config setting for the refresh rate (not yet properly integrated)
Closes #17
2017-01-13 18:20:35 +01:00
fgenesis
40e5385636
Merge branch 'experimental' into controllerfixup
...
# Conflicts:
# CMakeLists.txt
# win/vc90/Aquaria.vcproj
# win/vc90/BBGE.vcproj
# win/vc90/external.vcproj
2017-01-13 13:17:47 +01:00
fgenesis
bb7cb7df71
update libogg, libvorbis, minihttp + enable /MP for vs2008 debug builds.
2017-01-13 13:09:16 +01:00
fgenesis
0dc30e668d
Merge branch 'experimental' into controllerfixup
...
# Conflicts:
# Aquaria/Avatar.cpp
# Aquaria/Continuity.cpp
# Aquaria/DSQ.cpp
# Aquaria/DSQ.h
# Aquaria/Game.cpp
# Aquaria/Game.h
# Aquaria/Main.cpp
# Aquaria/UserSettings.cpp
# BBGE/Base.cpp
# BBGE/Base.h
# BBGE/Core.cpp
# BBGE/Core.h
# BBGE/DebugFont.cpp
# BBGE/Shader.cpp
# BBGE/SoundManager.h
2017-01-13 12:19:23 +01:00
fgenesis
d84a8bb2c2
fix possible startup crash
2017-01-12 23:57:21 +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
79ef0b9514
Add clipboard manipulation functions
2017-01-12 21:29:45 +01:00
fgenesis
11488f85d0
fix copy-paste oopsie
2016-11-28 23:19:25 +01:00
fgenesis
0d8a5c191c
More graphics init cleanup. Remove aspect ratio check. Fix screen transition effect that broke in prev. commits.
2016-11-15 13:00:30 +01:00
