MascaraSnake
|
7e6ac2ac92
|
Adapt setup of vertex-based slopes to UDMF
|
2020-01-06 15:34:28 +01:00 |
|
MascaraSnake
|
4d8275ab1d
|
Merge branch 'ignore-glsegs' into linedef-args
|
2020-01-06 15:14:43 +01:00 |
|
MascaraSnake
|
64dc6659c5
|
Merge branch 'next' into linedef-args
|
2020-01-06 14:46:47 +01: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 |
|
Tatsuru
|
a50549aa7c
|
Don't fuck with the fuse if it's negative
|
2020-01-05 23:41:22 -03:00 |
|
Tatsuru
|
ce45746d02
|
No comments
|
2020-01-05 23:19:52 -03:00 |
|
Tatsuru
|
89eda2fa9b
|
:amybruh:
|
2020-01-05 23:18:38 -03: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 |
|
Jaime Passos
|
652a71abf6
|
Merge remote-tracking branch 'origin/master' into more-opengl-fixes
|
2020-01-05 22:04:51 -03:00 |
|
Jaime Passos
|
c47ab3b31f
|
Fix chroma key
|
2020-01-05 22:04:19 -03: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 |
|
Jaime Passos
|
e9e82b5ea0
|
Fix GetTextureUsed
|
2020-01-05 18:10:33 -03:00 |
|
Louis-Antoine
|
7d67be582b
|
Fix mouse being grabbed even when not used
|
2020-01-05 18:39:16 +01:00 |
|
MascaraSnake
|
0ee12ebbd5
|
Adapt setup of line-based slopes to UDMF
|
2020-01-05 14:31:56 +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 |
|
Jaime Passos
|
71f7130abe
|
AA trees are not needed at all for rotated patches
|
2020-01-05 03:10:03 -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 |
|
Alam Ed Arias
|
4408d2bb17
|
Copy and Paste error
|
2020-01-04 18:34:16 -05:00 |
|
Alam Ed Arias
|
fbee649c65
|
SpawnVertexSlops() is only used in p_slopes.c
|
2020-01-04 18:33:58 -05:00 |
|
MascaraSnake
|
db97414643
|
Merge branch 'move-map-copying' into linedef-args
|
2020-01-04 23:32:29 +01:00 |
|
MascaraSnake
|
6f3354f24f
|
Merge branch 'next' into linedef-args
|
2020-01-04 23:10:39 +01:00 |
|
Nev3r
|
82b73a9ea8
|
Add missing initialization on vertex heights for binary maps.
|
2020-01-04 23:01:01 +01:00 |
|
Nev3r
|
d8b24fcfba
|
Merge branch 'remove-vertex-z-mk2' into udmf-vslopes
# Conflicts:
# src/lua_maplib.c
# src/p_setup.c
# src/r_defs.h
|
2020-01-04 22:59:42 +01: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 |
|
fickleheart
|
067b132eb1
|
Merge remote-tracking branch 'origin/next' into next-newcontrols
|
2020-01-04 09:57:09 -06:00 |
|
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 |
|
Nev3r
|
1d5b435de1
|
Add Lua support for vertex heights.
|
2020-01-04 11:40:21 +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 |
|
Nev3r
|
42bbad4810
|
Revert "Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components."
This reverts commit 4ca4335f19.
|
2020-01-04 11:25:46 +01:00 |
|
Nev3r
|
4ca4335f19
|
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
|
9a3e2c7911
|
Move P_ProcessLinedefsAfterSidedefs into P_LoadMapData, but move map data copying after everything else
|
2020-01-04 11:08:05 +01:00 |
|
Nev3r
|
4c7604a107
|
Add vertex slope spawning function.
Rename P_ResetDynamicSlopes() to P_SpawnSlopes().
|
2020-01-04 10:39:45 +01:00 |
|
Nev3r
|
24e099298a
|
Add vertex height vars into the vertex struct, and their textmap parsing.
|
2020-01-04 10:24:42 +01:00 |
|
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 |
|
fickleheart
|
f2b6f3fd6e
|
Make holding both turn keys freeze camera direction (broke in merge)
|
2020-01-03 23:26:31 -06: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 |
|