Commit graph

9266 commits

Author SHA1 Message Date
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
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
MascaraSnake
382edce32b Merge branch 'textmap-parser' into 'next'
Textmap parser

See merge request STJr/SRB2!604
2020-01-03 04:14:38 -05:00
lachwright
95ca48ada7 Add generic signpost sprite for skins that don't have one 2020-01-03 13:12:18 +08: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
Zachary McAlpin
49996ac9aa Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 17:54:47 -06: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