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
fgenesis
b32ce853e7
Fix possible stack overflow
...
Why did this never happen before??!
2016-11-14 04:17:53 +01:00
fgenesis
6d4f1175ba
Fix input grabbing logic, add related user setting, minor cleanup
2016-11-14 03:42:11 +01:00
fgenesis
e92b76cf40
Some more opengl setup cleanup and fullscreen switching improvement
2016-11-14 03:42:10 +01:00
fgenesis
1bad4d006d
Avoid recreating the GL context on Alt+Tab, resolution change, or windowed/fullscreen switch
2016-11-09 01:17:23 +01:00
fgenesis
2ccc751f70
more fix
2016-10-03 22:54:13 +02:00
fgenesis
204525bb37
should drunkcode more often
2016-10-03 22:40:04 +02:00
fgenesis
bc77c89ad3
Fix build with gcc ~5.4. Thx thegamemaster1234 for pointing.
2016-10-03 22:28:29 +02:00
fgenesis
4751b31653
Save screenshots in PNG instead of TGA format. Closes #34 .
2016-09-26 03:44:15 +02:00
fgenesis
7b702673fe
Fix some things/typos that were overlooked
2016-08-07 05:20:04 +02:00
fgenesis
812dc7dd7f
Reject joystick axes for Swim[Up|Down|Left|Right] actions.
...
This avoids confusion since the axes are always used, analog, and allow nice control.
If the axes were additionally mapped to Sim* actions, the movement would
no longer be analog as soon as the (digital) action state is enabled.
2016-08-04 02:22:05 +02:00
fgenesis
844ee748e6
Make InGameMenu catch some more actions.
...
Not sure if this is really necessary, but can't hurt
2016-08-04 01:56:19 +02:00
fgenesis
15c78dd2e4
Rix mouse button emulation that broke somewhere along the way
2016-08-04 01:55:32 +02:00
fgenesis
d49531f486
Replace DebugButton in the key config menu with a nicer and UI-focusable button
2016-08-02 04:15:04 +02:00
fgenesis
2d47b4a7b3
Tiny header cleanup
2016-07-19 02:59:30 +02:00
fgenesis
3de004262b
Attempt to fix joystick enabled/disabled state
2016-07-19 02:45:56 +02:00
fgenesis
bff072039a
Addition to prev. commit: Fix this in a better way.
...
This also gets rid of a 1-frame delay in DSQ action handling.
Hope this doesn't cause any problems, as i'm not sure.
2016-07-18 23:22:42 +02:00
fgenesis
335b26d1e0
Fix resuming paused cutscene
2016-07-18 23:14:20 +02:00
fgenesis
e8f1129c24
Fix startup crash and linking error in release mode
2016-07-18 03:21:24 +02:00
fgenesis
619d3d531b
Remove some now unused/unneeded leftovers
2016-07-18 01:34:43 +02:00
fgenesis
ab959bc6d6
Use sentinel that captures most of the input for sourceID -1
2016-07-18 01:27:58 +02:00
fgenesis
c943759ce1
Getting closer to mutliple inputs actually working
...
Split logic and state from ActionMapper into another class,
of which one exists per input set.
2016-07-17 22:25:24 +02:00
