f0e6a56b6b
Merge branch 'newcontrols' into next-newcontrols
2020-01-04 09:56:24 -06:00
34fe284416
Fix camera stuff in splitscreen
2020-01-04 09:54:56 -06:00
794d74c4d7
Merge remote-tracking branch 'origin/master' into newcontrols
2020-01-04 09:35:12 -06:00
eac8732bc8
Make holding both turn keys freeze camera direction (broke in merge)
2020-01-03 23:26:31 -06:00
a3396d6bd7
Merge branch 'fix-major-issue' into 'master'
...
Fix major issue
See merge request STJr/SRB2!625
2020-01-02 21:03:18 -05:00
b45ee059e3
Fix major issue
2020-01-03 02:58:23 +01:00
859bef9fa2
Merge branch 'dd-is-dead' into 'master'
...
Remove Direct Draw from AppVeyor config
See merge request STJr/SRB2!622
2020-01-02 20:54:56 -05:00
ff8cb3ddb0
Merge branch 'do-not-save-netvars' into 'master'
...
Do not save netgame-synced console variables
See merge request STJr/SRB2!623
2020-01-02 20:50:00 -05:00
c6aec51d99
Merge branch 'ungrab-mouse-in-menus' into 'master'
...
Let the mouse move freely when a menu is open or game is paused
See merge request STJr/SRB2!617
2020-01-02 18:48:38 -05:00
1845266bc8
Do not save netgame-synced console variables
...
This is a bad thing to do, because if you join a server,
your game will save the host's settings.
2020-01-03 00:40:49 +01:00
49934007d7
Add a "alwaysgrabmouse" console variable
2020-01-03 00:25:58 +01:00
945f50c273
Remove Direct Draw from AppVeyor config
2020-01-02 14:58:09 -08:00
e0e5e83869
Revert "Ungrab mouse when watching a record"
...
This reverts commit 17636ccc01
2020-01-02 20:29:51 +01:00
b9cecea25c
Hahahahahahahahahahahahaha
2020-01-01 15:52:23 -08:00
3af00ac93e
Minor code refactoring
2020-01-02 00:47:20 +01:00
17636ccc01
Ungrab mouse when watching a record
2020-01-02 00:46:50 +01:00
5bde4df439
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
62397a36ec
Grab mouse on game startup
2020-01-02 00:38:43 +01:00
e9843590da
Merge branch 'nohw-renderswitch' into 'master'
...
NOHW V.S. Renderer Switching
See merge request STJr/SRB2!609
2020-01-01 17:52:35 -05:00
35fe2e7281
Merge branch 'quote-shenanigans' into 'master'
...
Stuff I Broke: Commands
See merge request STJr/SRB2!607
2020-01-01 17:52:21 -05:00
01be810aee
Merge branch 'warp-by-name' into 'master'
...
Properly fix the issue that !528 tried to; let the -warp parameter work with map name
See merge request STJr/SRB2!596
2020-01-01 17:51:21 -05:00
caadf6aa61
Let the mouse move freely when a menu is open or game is paused
...
That means you can now easily move your mouse out of SRB2's window
and switch between several windows easily by just pressing escape!
Any phase of the game that isn't actual gameplay counts as a menu,
which means you can also move the mouse in cutscenes,
at the title screen, server connection screen,
and even when the chat or console are open.
2020-01-01 13:29:07 +01:00
2728536589
Merge branch 'revert-09798876' into 'master'
...
Revert "Merge branch 'software-clownery' into 'master'"
See merge request STJr/SRB2!616
2019-12-31 18:42:53 -05:00
b41cd59e51
Revert "Merge branch 'software-clownery' into 'master'"
...
This reverts merge request !578
2019-12-31 23:40:17 +00:00
c460775cd7
Merge branch 'fixcoronalist' into 'master'
...
Fix broken corona list
See merge request STJr/SRB2!605
2019-12-31 14:25:49 -05:00
b22de48c03
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
0979887600
Merge branch 'software-clownery' into 'master'
...
Software clownery
See merge request STJr/SRB2!578
2019-12-31 12:49:44 -05:00
939814d479
Merge remote-tracking branch 'origin/master' into next
2019-12-30 22:37:24 -08:00
3112dff345
Merge branch 'oops' into 'next'
...
Fix unknown gametype for map command crashing the game
See merge request STJr/SRB2!606
2019-12-31 01:34:39 -05:00
34687e85d7
Merge branch 'emeraldhunt-fix' into 'next'
...
Fix emerald hunt not working properly
See merge request STJr/SRB2!593
2019-12-31 01:34:17 -05:00
b5df2d5c3f
Merge branch 'polyobj-waypoint-thinker-optimise' into 'next'
...
Polyobj waypoint thinker optimise
See merge request STJr/SRB2!586
2019-12-31 01:33:01 -05:00
4b91e49bf4
Merge branch 'fix-lua-scorechains' into 'next'
...
Fix scoreadd not doing anything in certain cases when modified by Lua
See merge request STJr/SRB2!579
2019-12-31 01:32:22 -05:00
077c453e33
Merge branch 'dashmode-ctf-monitors' into 'next'
...
Don't let Metal pop the enemy team's monitors (closes #94 )
See merge request STJr/SRB2!584
2019-12-31 01:31:55 -05:00
8e61b1003a
Merge branch 'dashspeed-fix' into 'next'
...
Cap dashspeed between mindash and maxdash before revving.
See merge request STJr/SRB2!565
2019-12-31 01:31:43 -05:00
0eb65d0fa7
Fix tailsbot behavior that broke with Simple mode
2019-12-30 23:58:58 -06:00
7af2533d23
Make the menu option for renderer switching transparent under NOHW
2019-12-30 21:45:19 -08:00
38492073fa
IT_PAIR for when you want to define both sides of a menu item
2019-12-30 21:40:13 -08:00
e8db39229c
Don't let the user switch to OpenGL if NOHW
2019-12-30 20:29:41 -08:00
36c5bb7b0d
Fix NOHW compiling
2019-12-30 20:18:08 -08:00
782bf8d31e
Fix NOMIXER compiling
2019-12-30 20:08:29 -08:00
4bf3597116
Fix NOOPENMPT compiling
2019-12-30 19:19:17 -08:00
ff47f911dc
Fix command not running if it was split by COM_BufAddText
...
(Looks at 4865a190578b900b48571e74e0bd97bef88ea71b...)
2019-12-30 18:47:21 -08:00
ab410652ae
Fix unclosed quotes leaving the escape character in
2019-12-30 18:44:13 -08:00
7b54846a02
Merge remote-tracking branch 'origin/master' into software-clownery
2019-12-30 23:21:42 -03:00
5e94ca07bc
Use gametypecount in G_GetGametypeByName
2019-12-30 17:57:38 -08:00
85e2e92ee0
Fix spying on simple mode players having dumb camera angles
2019-12-30 15:44:52 -06:00
2c45ecbaa5
Fix camera reset button
2019-12-30 15:34:43 -06:00
fc8c0f8a9a
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
a51f2500e0
Update playstyle menu handling to use analog/directionchar combo
2019-12-30 15:15:37 -06:00
c3d14064e2
Convert simple movement to directionchar+analog
...
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
2019-12-30 15:05:24 -06:00
fickleheart