fickleheart
ce0c42a767
Merge branch 'newcontrols' into next-newcontrols
2020-01-04 09:56:24 -06:00
fickleheart
f05d0e91ad
Fix camera stuff in splitscreen
2020-01-04 09:54:56 -06:00
fickleheart
992ead1c85
Merge remote-tracking branch 'origin/master' into newcontrols
2020-01-04 09:35:12 -06:00
fickleheart
f2b6f3fd6e
Make holding both turn keys freeze camera direction (broke in merge)
2020-01-03 23:26:31 -06:00
LJ Sonic
1b1934637a
Merge branch 'fix-major-issue' into 'master'
...
Fix major issue
See merge request STJr/SRB2!625
2020-01-02 21:03:18 -05:00
Louis-Antoine
8d328d16c7
Fix major issue
2020-01-03 02:58:23 +01:00
James R
f1db264c25
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
LJ Sonic
f9d54b89c3
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
LJ Sonic
3ae44063f1
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
Louis-Antoine
ff47e36b43
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
Louis-Antoine
54b4a53f92
Add a "alwaysgrabmouse" console variable
2020-01-03 00:25:58 +01:00
James R
3762b638c7
Remove Direct Draw from AppVeyor config
2020-01-02 14:58:09 -08:00
Louis-Antoine
1864526f72
Revert "Ungrab mouse when watching a record"
...
This reverts commit bd25e7b4ac
2020-01-02 20:29:51 +01:00
James R
8720bbe044
Hahahahahahahahahahahahaha
2020-01-01 15:52:23 -08:00
Louis-Antoine
f750144c88
Minor code refactoring
2020-01-02 00:47:20 +01:00
Louis-Antoine
bd25e7b4ac
Ungrab mouse when watching a record
2020-01-02 00:46:50 +01:00
Louis-Antoine
61a681ed02
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
Louis-Antoine
d4a2483c3e
Grab mouse on game startup
2020-01-02 00:38:43 +01:00
James R
6ea83c74c3
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
James R
b83dfa9e5a
Merge branch 'quote-shenanigans' into 'master'
...
Stuff I Broke: Commands
See merge request STJr/SRB2!607
2020-01-01 17:52:21 -05:00
James R
b8f465408b
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
Louis-Antoine
30bc8af7e8
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
Jaime Passos
b756b45d16
Merge branch 'revert-938f81ba' into 'master'
...
Revert "Merge branch 'software-clownery' into 'master'"
See merge request STJr/SRB2!616
2019-12-31 18:42:53 -05:00
Jaime Passos
285a2ec05d
Revert "Merge branch 'software-clownery' into 'master'"
...
This reverts merge request !578
2019-12-31 23:40:17 +00:00
Jaime Passos
86e8f35c44
Merge branch 'fixcoronalist' into 'master'
...
Fix broken corona list
See merge request STJr/SRB2!605
2019-12-31 14:25:49 -05:00
fickleheart
77ba835f4f
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
Nev3r
938f81ba88
Merge branch 'software-clownery' into 'master'
...
Software clownery
See merge request STJr/SRB2!578
2019-12-31 12:49:44 -05:00
James R
e0c2e607f0
Merge remote-tracking branch 'origin/master' into next
2019-12-30 22:37:24 -08:00
James R
39b7cb4fef
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
James R
be66b67f63
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
James R
0f3b77de8c
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
James R
e70ae46a76
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
James R
0fdf838c86
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
James R
3bcfe5ae99
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
fickleheart
0ffb1e11f9
Fix tailsbot behavior that broke with Simple mode
2019-12-30 23:58:58 -06:00
James R
ec72c69614
Make the menu option for renderer switching transparent under NOHW
2019-12-30 21:45:19 -08:00
James R
7616bf5734
IT_PAIR for when you want to define both sides of a menu item
2019-12-30 21:40:13 -08:00
James R
3b30fcc5fa
Don't let the user switch to OpenGL if NOHW
2019-12-30 20:29:41 -08:00
James R
73643dafaf
Fix NOHW compiling
2019-12-30 20:18:08 -08:00
James R
4f8775d560
Fix NOMIXER compiling
2019-12-30 20:08:29 -08:00
James R
cdadd86780
Fix NOOPENMPT compiling
2019-12-30 19:19:17 -08:00
James R
7d6d8b3b6e
Fix command not running if it was split by COM_BufAddText
...
(Looks at d57083264e93f1020c2730e072c7a7b5417e08b3...)
2019-12-30 18:47:21 -08:00
James R
46c0d62a06
Fix unclosed quotes leaving the escape character in
2019-12-30 18:44:13 -08:00
Jaime Passos
2bdd411736
Merge remote-tracking branch 'origin/master' into software-clownery
2019-12-30 23:21:42 -03:00
James R
2e8f83b79c
Use gametypecount in G_GetGametypeByName
2019-12-30 17:57:38 -08:00
fickleheart
5f50f7e8ae
Fix spying on simple mode players having dumb camera angles
2019-12-30 15:44:52 -06:00
fickleheart
4a2492e8e1
Fix camera reset button
2019-12-30 15:34:43 -06:00
James R
67ca512120
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
fickleheart
758bb8f3ae
Update playstyle menu handling to use analog/directionchar combo
2019-12-30 15:15:37 -06:00
fickleheart
e0d09a457e
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
