fickleheart
|
f8a3e3b898
|
Merge remote-tracking branch 'origin/next' into next-newcontrols
|
2020-01-04 09:57:09 -06:00 |
|
fickleheart
|
f0e6a56b6b
|
Merge branch 'newcontrols' into next-newcontrols
|
2020-01-04 09:56:24 -06:00 |
|
fickleheart
|
34fe284416
|
Fix camera stuff in splitscreen
|
2020-01-04 09:54:56 -06:00 |
|
fickleheart
|
794d74c4d7
|
Merge remote-tracking branch 'origin/master' into newcontrols
|
2020-01-04 09:35:12 -06:00 |
|
Nev3r
|
f207048ab2
|
Add Lua support for vertex heights.
|
2020-01-04 11:40:21 +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 |
|
Nev3r
|
60999c7b84
|
Revert "Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components."
This reverts commit c9294d1e32 .
|
2020-01-04 11:25:46 +01:00 |
|
Nev3r
|
c9294d1e32
|
Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components.
|
2020-01-04 11:17:54 +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 |
|
Nev3r
|
faf127ff88
|
Add vertex slope spawning function.
Rename P_ResetDynamicSlopes() to P_SpawnSlopes().
|
2020-01-04 10:39:45 +01:00 |
|
Nev3r
|
0b21a34ddd
|
Add vertex height vars into the vertex struct, and their textmap parsing.
|
2020-01-04 10:24:42 +01:00 |
|
lachwright
|
5ce1695047
|
Merge branch 'next' into clear-sign-sprite
|
2020-01-04 14:50:17 +08:00 |
|
lachwright
|
6f5833f8b3
|
Randomize skin during signpost roulette
|
2020-01-04 14:49:44 +08:00 |
|
fickleheart
|
eac8732bc8
|
Make holding both turn keys freeze camera direction (broke in merge)
|
2020-01-03 23:26:31 -06: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 |
|
Tatsuru
|
423d1af48d
|
I see trees of green
|
2020-01-03 16:39:39 -03:00 |
|
Tatsuru
|
5568e445ed
|
Colored title cards
|
2020-01-03 16:21:08 -03: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 |
|
lachwright
|
da226139f1
|
Add generic signpost sprite for skins that don't have one
|
2020-01-03 13:12:18 +08: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 |
|
James R
|
658b8dcfa9
|
Use GCC 8.1 for x86_64
|
2020-01-02 15:45:13 -08: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 |
|
Zachary McAlpin
|
93e9bb661e
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2020-01-01 17:54:47 -06: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 |
|
Zachary McAlpin
|
d62cd2ac06
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2020-01-01 17:39:13 -06: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 |
|
Zachary McAlpin
|
dc51ba6b64
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2020-01-01 17:11:19 -06: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 |
|