lachwright
b15755837c
Merge branch 'next' into clear-sign-sprite
2020-01-04 14:50:17 +08:00
lachwright
12e43a2e9b
Randomize skin during signpost roulette
2020-01-04 14:49:44 +08:00
MascaraSnake
20bc88d34f
Merge branch 'no-compress' into 'next'
...
Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it
See merge request STJr/SRB2!628
2020-01-03 16:38:42 -05:00
MascaraSnake
6bca318fa8
Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it
2020-01-03 21:50:27 +01:00
Alam Ed Arias
caa7f52f7f
Merge branch 'master' into next
2020-01-03 14:56:37 -05:00
MascaraSnake
382edce32b
Merge branch 'textmap-parser' into 'next'
...
Textmap parser
See merge request STJr/SRB2!604
2020-01-03 04:14:38 -05:00
lachwright
95ca48ada7
Add generic signpost sprite for skins that don't have one
2020-01-03 13:12:18 +08: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
James R
7e0dd5bf02
Merge branch 'findvar' into 'next'
...
CV_FindVar for Lua
See merge request STJr/SRB2!583
2020-01-02 20:54:16 -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
MascaraSnake
79b1559925
P_LoadExtendedSubsectorsAndSegs: Print size_t with %s
2020-01-02 22:28:32 +01:00
Louis-Antoine
1864526f72
Revert "Ungrab mouse when watching a record"
...
This reverts commit bd25e7b4ac
2020-01-02 20:29:51 +01:00
MascaraSnake
33044e0a97
Fix two bugs in extended segs loading, and add some error checking while I'm at it
2020-01-02 09:51:07 +01:00
James R
b5d9cf9d06
Merge branch 'thiccnames' into 'next'
...
Allow 6-letter character names to be drawn with the thick font
See merge request STJr/SRB2!618
2020-01-01 21:49:13 -05:00
James R
5b6c36b2a6
Merge branch 'sstailscarry-fix' into 'next'
...
Fix MP Special Stages crashing if a player is being carried when it ends
See merge request STJr/SRB2!615
2020-01-01 21:49:01 -05:00
James R
ffb76286dc
Merge branch 'sound-slots' into 'next'
...
Add slots for unused sounds and remove unused sound slots
See merge request STJr/SRB2!603
2020-01-01 21:48:46 -05:00
James R
74b7a1c241
Merge remote-tracking branch 'origin/master' into next
2020-01-01 15:53:18 -08: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
James R
b342301373
Merge remote-tracking branch 'origin/master' into next
2020-01-01 15:39:05 -08:00
Louis-Antoine
d4a2483c3e
Grab mouse on game startup
2020-01-02 00:38:43 +01:00
MascaraSnake
14207f3297
P_LoadExtendedSubsectorsAndSegs: Slightly simplify the seg vertex reading code
2020-01-02 00:32:29 +01:00
James R
2edea99c31
Merge branch 'custom-gametype-serverinfo' into 'next'
...
Gametype name in SERVERINFO
See merge request STJr/SRB2!610
2020-01-01 17:52:46 -05: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
MascaraSnake
edb5cc7f97
P_LoadTextmap: Bail out if certain mandatory fields are not set
2020-01-01 23:52:30 +01: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
James R
75514def83
Merge branch 'respawndelaygametyperule' into 'next'
...
Gametype ruleset changes
See merge request STJr/SRB2!585
2020-01-01 17:49:53 -05:00
Alam Ed Arias
be11a1d249
Merge branch 'master' into next
2020-01-01 14:29:30 -05:00
Jaime Passos
0ab6fe1fd8
Rename `seenplayer to seenfriend`
2020-01-01 15:17:29 -03:00
lachwright
5df1de42b5
Allow 6-letter character names to be drawn with the thick font
2020-01-01 23:49:29 +08:00
MascaraSnake
4a5c550488
Move MAXFLATSIZE define to p_spec.h so p_spec.c doesn't have to redefine it
2020-01-01 16:01:07 +01:00
MascaraSnake
97c54bc5f0
Rework textmap parser to always read a parameter's value, even if it doesn't recognize the parameter
2020-01-01 15:52:59 +01:00
MascaraSnake
0ac318cd78
Whoops
2020-01-01 15:11:39 +01:00
MascaraSnake
9da0b78666
Move shared parts of sidedef initialization into P_InitializeSidedef
2020-01-01 15:10:41 +01:00
MascaraSnake
699de06c05
Check if certain mandatory linedef and sidedef fields are set, and use fallback values if not
2020-01-01 14:27:01 +01:00
MascaraSnake
3fc9749316
Setup repeatcnt in P_LoadSidedefs instead of P_ProcessLinedefsWithSidedefs, since UDMF can set it directly
2020-01-01 14:13:24 +01:00
MascaraSnake
b425f913f2
P_LoadTextmap: Set defaults for all linedef and sidedef fields that UDMF is allowed to set
2020-01-01 13:40:17 +01: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
Tatsuru
dda18dd080
Or is it better like this?
2019-12-31 20:20:30 -03:00
