James R
0597d0ccbd
Merge branch 'dashmode-tweaks' into 'next'
...
Dashmode tweaks
See merge request STJr/SRB2!646
2020-01-08 01:10:44 -05:00
fickleheart
c133e645f7
Merge remote-tracking branch 'upstream/next' into next-newcontrols
2020-01-07 23:43:43 -06:00
lachwright
01b8bd21cc
Dashmode tweaks:
...
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
2020-01-07 15:38:48 +08:00
James R
fc1eff6eee
Merge branch 'amyhearts-fix' into 'next'
...
Fix NPC Amy's love hearts crashing if they didn't have a set fuse
See merge request STJr/SRB2!641
2020-01-07 01:05:09 -05:00
lachwright
e069e149d9
Apply skin's highresscale to continue screen
2020-01-07 13:56:54 +08:00
Tatsuru
360e8f28b4
ifdefs make indenting confusing
2020-01-07 01:24:04 -03:00
Steel Titanium
808d731652
Update copyright statements for changed names
2020-01-06 17:16:27 -05:00
MascaraSnake
b95d1cef01
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
5b93230a94
Merge branch 'master' into next
2020-01-06 10:28:21 -05:00
Alam Ed Arias
21c224fce0
idented hell
2020-01-06 09:58:05 -05:00
MascaraSnake
759b1c82e2
Add missing glseg checks (and remove a superfluous one)
2020-01-06 14:40:59 +01:00
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
Alam Ed Arias
0fbc459243
cleanup whitespace
2020-01-05 21:49:07 -05:00
Tatsuru
07f9ddc45a
Don't fuck with the fuse if it's negative
2020-01-05 23:41:22 -03:00
Tatsuru
fce1313517
No comments
2020-01-05 23:19:52 -03:00
Tatsuru
664bce71de
:amybruh:
2020-01-05 23:18:38 -03: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
Jaime Passos
03245b28fd
Merge remote-tracking branch 'origin/master' into more-opengl-fixes
2020-01-05 22:04:51 -03:00
Jaime Passos
9086b1851d
Fix chroma key
2020-01-05 22:04:19 -03:00
James R
ea3c36eb13
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
e847777a35
Fix mouse being grabbed even when not used
...
The other way around this time.
2020-01-06 00:40:28 +01:00
Louis-Antoine
88c8049c77
Revert "Fix mouse being grabbed even when not used"
...
This reverts commit 6c85c4e1d3
2020-01-06 00:38:40 +01:00
James R
6af0249d01
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
fa690e2133
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
e4f88d142e
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
d93adbacbb
Fix GetTextureUsed
2020-01-05 18:10:33 -03:00
Louis-Antoine
6c85c4e1d3
Fix mouse being grabbed even when not used
2020-01-05 18:39:16 +01:00
Jaime Passos
deee2a0d6f
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
6d754821fb
AA trees are not needed at all for rotated patches
2020-01-05 03:10:03 -03: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
Alam Ed Arias
641ac72b3f
Copy and Paste error
2020-01-04 18:34:16 -05:00
Alam Ed Arias
3bcf6b4b7e
SpawnVertexSlops() is only used in p_slopes.c
2020-01-04 18:33:58 -05:00
Nev3r
72f23a1075
Add missing initialization on vertex heights for binary maps.
2020-01-04 23:01:01 +01:00
Nev3r
a161bfa619
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
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
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
