MascaraSnake
|
1cbf7aba0d
|
Merge branch 'move-map-copying' into 'next'
Reorder map loading
See merge request STJr/SRB2!635
|
2020-01-06 04:24:39 -05:00 |
|
James R
|
0bbc11c2a9
|
Merge branch 'lua-neatstuff' into 'next'
Extra functionality for lua
See merge request STJr/SRB2!601
|
2020-01-05 20:54:17 -05:00 |
|
MascaraSnake
|
18ccdd855a
|
Merge branch 'remove-vertex-z-mk2' into 'next'
Remove "z" from "vertex_t"
See merge request STJr/SRB2!636
|
2020-01-04 19:31:16 -05:00 |
|
James R
|
0a061616ef
|
Merge branch 'fix-nonslope-slopes' into 'next'
Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components.
See merge request STJr/SRB2!634
|
2020-01-04 16:17:38 -05:00 |
|
Nev3r
|
9999be2d6e
|
Remove vertex_t's z variable.
|
2020-01-04 18:29:02 +01:00 |
|
Nev3r
|
91222f7527
|
Adapt P_ClosestPointOnLine3D() to be much like FV3_ClosestPointOnLine() and use vector3_t's as args, save for the hypotenuse calculation, which remains the same; the output should be the same as before.
Adapt the rope hang snapping to the new function's form.
|
2020-01-04 18:28:25 +01:00 |
|
Nev3r
|
49667689c1
|
Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components.
|
2020-01-04 11:27:31 +01:00 |
|
MascaraSnake
|
1e42dc7ee5
|
Move P_ProcessLinedefsAfterSidedefs into P_LoadMapData, but move map data copying after everything else
|
2020-01-04 11:08:05 +01:00 |
|
MascaraSnake
|
a6926e339f
|
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
|
26bb0b3c67
|
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
|
a26c5f5428
|
Merge branch 'master' into next
|
2020-01-03 14:56:37 -05:00 |
|
MascaraSnake
|
7b5f2f09c0
|
Merge branch 'textmap-parser' into 'next'
Textmap parser
See merge request STJr/SRB2!604
|
2020-01-03 04:14:38 -05:00 |
|
LJ Sonic
|
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 |
|
Louis-Antoine
|
b45ee059e3
|
Fix major issue
|
2020-01-03 02:58:23 +01:00 |
|
James R
|
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 |
|
James R
|
12e87d58b4
|
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
|
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 |
|
LJ Sonic
|
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 |
|
Louis-Antoine
|
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 |
|
Louis-Antoine
|
49934007d7
|
Add a "alwaysgrabmouse" console variable
|
2020-01-03 00:25:58 +01:00 |
|
James R
|
945f50c273
|
Remove Direct Draw from AppVeyor config
|
2020-01-02 14:58:09 -08:00 |
|
MascaraSnake
|
dc0c17dbb8
|
P_LoadExtendedSubsectorsAndSegs: Print size_t with %s
|
2020-01-02 22:28:32 +01:00 |
|
Louis-Antoine
|
e0e5e83869
|
Revert "Ungrab mouse when watching a record"
This reverts commit 17636ccc01.
|
2020-01-02 20:29:51 +01:00 |
|
MascaraSnake
|
5ba179ad7c
|
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 |
|
Nami
|
ad610ba4aa
|
Move MobjLineCollide up a bit to where we first know for sure that we hit a line
|
2020-01-01 19:38:48 -08:00 |
|
James R
|
9931f0d58f
|
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
|
69dd8acf7f
|
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
|
99f020adb6
|
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
|
a358702700
|
Merge remote-tracking branch 'origin/master' into next
|
2020-01-01 15:53:18 -08:00 |
|
James R
|
b9cecea25c
|
Hahahahahahahahahahahahaha
|
2020-01-01 15:52:23 -08:00 |
|
Louis-Antoine
|
3af00ac93e
|
Minor code refactoring
|
2020-01-02 00:47:20 +01:00 |
|
Louis-Antoine
|
17636ccc01
|
Ungrab mouse when watching a record
|
2020-01-02 00:46:50 +01:00 |
|
Louis-Antoine
|
5bde4df439
|
Grab mouse again when closing menu, unpausing, etc
|
2020-01-02 00:45:28 +01:00 |
|
James R
|
0c40a466d8
|
Merge remote-tracking branch 'origin/master' into next
|
2020-01-01 15:39:05 -08:00 |
|
Louis-Antoine
|
62397a36ec
|
Grab mouse on game startup
|
2020-01-02 00:38:43 +01:00 |
|
MascaraSnake
|
02acf6222b
|
P_LoadExtendedSubsectorsAndSegs: Slightly simplify the seg vertex reading code
|
2020-01-02 00:32:29 +01:00 |
|
James R
|
85fbf4f571
|
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
|
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 |
|
MascaraSnake
|
2da9c3cf81
|
P_LoadTextmap: Bail out if certain mandatory fields are not set
|
2020-01-01 23:52:30 +01:00 |
|
James R
|
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 |
|
James R
|
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 |
|
James R
|
48c83be89e
|
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
|
af57468e68
|
Merge branch 'master' into next
|
2020-01-01 14:29:30 -05:00 |
|
Jaime Passos
|
35ff383a4a
|
Rename `seenplayer to seenfriend`
|
2020-01-01 15:17:29 -03:00 |
|
lachwright
|
dc7f10e17d
|
Allow 6-letter character names to be drawn with the thick font
|
2020-01-01 23:49:29 +08:00 |
|
MascaraSnake
|
4f26a8e73a
|
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
|
9cda82d896
|
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
|
6724b11c36
|
Whoops
|
2020-01-01 15:11:39 +01:00 |
|
MascaraSnake
|
a41c640559
|
Move shared parts of sidedef initialization into P_InitializeSidedef
|
2020-01-01 15:10:41 +01:00 |
|
MascaraSnake
|
fe198b8a32
|
Check if certain mandatory linedef and sidedef fields are set, and use fallback values if not
|
2020-01-01 14:27:01 +01:00 |
|