1d474626f4
Merge branch 'nights-pgup-control' into 'next'
...
Support Look Up/Down keys for NiGHTS movement
See merge request STJr/SRB2!430
2018-12-24 23:53:35 -05:00
82a40f0dba
Support Look Up/Down keys for NiGHTS movement
2018-12-24 23:48:03 -05:00
4651eddc36
Merge branch 'master' into next
2018-12-24 20:15:45 -05:00
89133160ec
TravisCI: GCC 8.x needs to pass
2018-12-24 19:10:29 -05:00
e721a3d882
Merge branch 'side-discolor-fix' into 'master'
...
Fix colormap bleeding onto sides [by Jimita]
See merge request STJr/SRB2!427
2018-12-24 17:33:34 -05:00
4c6334f459
cleanup
2018-12-24 17:21:33 -05:00
4656a0d02c
Merge branch 'sdl-autograb' into 'master'
...
SDL:Auto grab input
Closes #46
See merge request STJr/SRB2!416
2018-12-24 17:04:27 -05:00
f06fd4149d
Merge branch 'polyobject-crush-fix-waypoint' into 'next'
...
Polyobject crush fix by waypoints [by TehRealSalt]
See merge request STJr/SRB2!426
2018-12-24 17:01:06 -05:00
c8f4d125b4
Merge branch 'master' into next
2018-12-24 16:56:29 -05:00
be9a04e489
Merge branch 'disablespeedadjust-fix' into 'next'
...
Disablespeedadjust fix
See merge request STJr/SRB2!425
2018-12-24 16:31:19 -05:00
2e6f382ec3
Merge branch 'bot-respawn-fix' into 'next'
...
Bot respawn fix
See merge request STJr/SRB2!423
2018-12-24 15:53:47 -05:00
878b1b2d16
Fix move by waypoints not checking for sector changes
...
It seemed weird at first, but the polyobject sector (backsector) itself DOESN'T need checked (although I still am doing it for safety). Rather, the in-level sector just needs checked.
If someone manually modifies the polyobject sector though, then this bug can still occur... but this fixes it for the most common use-case where this can happen. I'll try to tackle the rarer cases in my next commit.
2018-12-24 14:39:07 -05:00
31c6b6ef77
remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway
2018-12-24 19:37:52 +00:00
936b9ecebc
Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean
2018-12-24 19:29:54 +00:00
01588ea967
Fix bot players using the respawning code meant only for real players to use
2018-12-24 17:59:12 +00:00
cb13ace77e
Merge branch 'master' into sdl-autograb
2018-12-23 22:35:44 -05:00
8044e2a7f6
Merge branch 'sdl-autograb-revise' into 'sdl-autograb'
...
AutoGrab changes
See merge request SteelTitanium/SRB2!3
2018-12-23 22:32:51 -05:00
ed410575d6
Only SetWindowGrab if !disable_mouse; toggle cursor visibility
2018-12-23 22:09:16 -05:00
46d1a866d8
Another attempt to lock the mouse
2018-12-23 18:54:15 -05:00
140152c2e7
Merge branch '2122-next' into 'next'
...
Revert "Merge branch 'menu-mpjoy-fix' into 'next'"
See merge request STJr/SRB2!419
2018-12-23 18:00:18 -05:00
c0c05043e6
Revert "Merge branch 'menu-mpjoy-fix' into 'next'"
...
This reverts commit b5d4bb35302d675750cf
2018-12-23 17:57:50 -05:00
b5d4bb3530
Merge branch 'menu-mpjoy-fix' into 'next'
...
Menu: Fix joystick events causing the player to move during multiplayer system menu
See merge request STJr/SRB2!414
2018-12-23 17:55:02 -05:00
402860dc06
Merge branch 'loadconfig-defaultcontrols' into 'master'
...
Reset default controls for LOADCONFIG command
See merge request STJr/SRB2!403
2018-12-23 17:14:34 -05:00
2d675750cf
fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c
2018-12-23 21:52:49 +00:00
f55623ef9c
Clear all control keys before loading defaults in LoadConfig
2018-12-23 14:59:26 -05:00
40a037f603
A more through out attempt to lock the mouse
2018-12-23 14:54:14 -05:00
aa77038dfc
Add chat_on to non-key move event checks
2018-12-23 03:21:32 -05:00
66e13cf1cc
SDL:Auto grab input
2018-12-22 23:28:59 -05:00
c5ec1e30a4
Merge pull request #391 from monster-psychic-cat/sw_largeroomfix
...
Large room fix
2018-12-22 19:48:08 -05:00
4265be776c
Merge branch 'master' into next
2018-12-22 19:36:32 -05:00
194f9ea8c0
Merge branch 'next' into sw_largeroomfix
2018-12-22 19:34:22 -05:00
974a8e3e2b
Merge branch 'sdl-vidmode-display-fix' into 'master'
...
SDL: Center window on current monitor during vidmode change
Closes #47
See merge request STJr/SRB2!415
2018-12-22 09:06:55 -05:00
8707b2f40a
Center window on current monitor during vidmode change
2018-12-22 01:43:58 -05:00
cb619e0353
Don't create movement events from joy or mouse when menu is active
2018-12-22 01:20:24 -05:00
66dc5a8712
Merge branch 'menu-screenshot-fix' into 'master'
...
Menu screenshot fix
Closes #45
See merge request STJr/SRB2!413
2018-12-22 00:40:18 -05:00
1291d35e08
Don't allow non-keyboard keys to screenshot/gif in menus
2018-12-22 00:39:32 -05:00
a72d79da54
Merge branch 'master' into next
2018-12-21 17:41:19 +00:00
cd8a147c95
Merge branch '2122-credits-update-2' into 'next'
...
Re-order Special Thanks -- groups first, then names in ABC order
See merge request STJr/SRB2!411
2018-12-21 11:41:41 -05:00
90832938c9
Re-order Special Thanks -- groups first, then names in ABC order
2018-12-21 11:40:35 -05:00
41a25a68c9
Merge branch '2122-credits-update' into 'next'
...
Add sirjuddington and CodeImp to Special Thanks credits
See merge request STJr/SRB2!409
2018-12-20 18:06:08 -05:00
f66ee8c4cd
Add sirjuddington and CodeImp to Special Thanks credits
2018-12-20 17:27:25 -05:00
58a2cec70f
Merge branch 'float_equal' into 'master'
...
Clear Float equal warnings
See merge request STJr/SRB2!383
2018-12-20 16:58:37 -05:00
2b59cfa63f
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:58:16 -02:00
b68e01cb2b
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:57:38 -02:00
9525de2d83
Merge branch 'camera-backport' into 'next'
...
Suggestion: 2.2 camera changes backport
See merge request STJr/SRB2!393
2018-12-20 16:57:23 -05:00
28c8ad3dbb
Merge branch 'jump-spin-axes' into 'next'
...
Feature: Jump/Spin axes
See merge request STJr/SRB2!389
2018-12-20 16:57:05 -05:00
75e570f2b4
Merge branch 'joy-jump-defaults' into 'next'
...
Assign joy button defaults for 1 and 2 player
See merge request STJr/SRB2!400
2018-12-20 16:56:09 -05:00
50221c47e9
Merge branch 'menu-2pcontrols-fix' into 'master'
...
Fix 2p control menu graying out
See merge request STJr/SRB2!407
2018-12-20 16:54:52 -05:00
2bdf56804c
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:53:24 -02:00
f405f1ae30
Merge branch 'cmake-dllpath-fix' into 'master'
...
Update CMake paths for Windows DLLs
See merge request STJr/SRB2!406
2018-12-20 16:53:06 -05:00
Digiku