MascaraSnake
|
3a6614409b
|
Fix a condition in the flame jet thinkers I accidentally messed up
|
2020-01-08 08:43:36 +01:00 |
|
MascaraSnake
|
36183e0455
|
Merge branch 'ignore-glsegs' into 'next'
Add missing glseg checks (and remove a superfluous one)
See merge request STJr/SRB2!642
|
2020-01-06 17:08:32 -05:00 |
|
Alam Ed Arias
|
06849fed6b
|
Merge branch 'master' into next
|
2020-01-06 10:28:21 -05:00 |
|
Alam Ed Arias
|
ca130c4313
|
idented hell
|
2020-01-06 09:58:05 -05:00 |
|
MascaraSnake
|
33c35230c2
|
Add missing glseg checks (and remove a superfluous one)
|
2020-01-06 14:40:59 +01:00 |
|
MascaraSnake
|
b9a8ebbdac
|
Merge branch 'move-map-copying' into 'next'
Reorder map loading
See merge request STJr/SRB2!635
|
2020-01-06 04:24:39 -05:00 |
|
Alam Ed Arias
|
4ffe5d0670
|
cleanup whitespace
|
2020-01-05 21:49:07 -05:00 |
|
James R
|
2a6cf10f79
|
Merge branch 'lua-neatstuff' into 'next'
Extra functionality for lua
See merge request STJr/SRB2!601
|
2020-01-05 20:54:17 -05:00 |
|
James R
|
3d3b4d183f
|
Merge branch 'fix-mouse-grabbing' into 'master'
Fix mouse being grabbed even when not used
See merge request STJr/SRB2!639
|
2020-01-05 18:46:13 -05:00 |
|
Louis-Antoine
|
059a09d00e
|
Fix mouse being grabbed even when not used
The other way around this time.
|
2020-01-06 00:40:28 +01:00 |
|
Louis-Antoine
|
93e878b8f0
|
Revert "Fix mouse being grabbed even when not used"
This reverts commit 7d67be582b.
|
2020-01-06 00:38:40 +01:00 |
|
James R
|
db591f85e3
|
Merge branch 'vgetcolorfixes' into 'master'
Fix usage of V_GetColor
See merge request STJr/SRB2!638
|
2020-01-05 17:12:21 -05:00 |
|
James R
|
9f68fa0798
|
Merge branch 'appveyor-gcc-8.1' into 'master'
Use GCC 8.1 for AppVeyor 64-bit builds
See merge request STJr/SRB2!624
|
2020-01-05 17:12:06 -05:00 |
|
James R
|
a850a97300
|
Merge branch 'connect-ip-textbox' into 'master'
Add clipboard functionality to the Connect via IP textbox.
See merge request STJr/SRB2!597
|
2020-01-05 17:06:45 -05:00 |
|
Louis-Antoine
|
7d67be582b
|
Fix mouse being grabbed even when not used
|
2020-01-05 18:39:16 +01:00 |
|
Jaime Passos
|
8cfc38813c
|
I was using V_GetColor in a lot of places I shouldn't have, making the game look wrong with a non-default colour profile.
Though, I left R_RainbowColormap alone.
|
2020-01-05 03:20:05 -03:00 |
|
MascaraSnake
|
387313a539
|
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
|
12b19cce9a
|
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
|
764a8ad43f
|
Remove vertex_t's z variable.
|
2020-01-04 18:29:02 +01:00 |
|
Nev3r
|
ab63d3e33f
|
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
|
275f07e05f
|
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
|
9a3e2c7911
|
Move P_ProcessLinedefsAfterSidedefs into P_LoadMapData, but move map data copying after everything else
|
2020-01-04 11:08:05 +01: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 |
|
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 |
|
James R
|
22c6440523
|
Use GCC 8.1 for x86_64
|
2020-01-02 15:45:13 -08: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 |
|
Nami
|
f09ff4ca8d
|
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
|
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 |
|