thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
10023 commits 1 branch 12 tags 205 MiB
Commit graph

634 commits

Author SHA1 Message Date
MascaraSnake
c2311dca45 Merge branch 'next' into udmf-next 2020-02-18 18:39:11 +01:00
Sally Cochenour
07d355e4d3 FIX COLOR BUG 2020-02-17 01:19:28 -03:00
MascaraSnake
f4a7a5db11 Some fixes for the linedef alpha field 2020-02-10 20:26:29 +01:00
James R
956ae6b823 Don't I_Error on startup files only if a file was added twice 2020-02-01 19:32:08 -08:00
Jaime Passos
447ee1a04c Remove redundancy 2020-01-26 23:46:07 -03:00
Monster Iestyn
eca4bc63da Merge branch 'master' into next 
# Conflicts:
#	src/g_game.c
 2020-01-26 19:23:05 +00:00
MascaraSnake
e22661e150 Implement linedef alpha field (replaces specials 900-908) 2020-01-26 12:24:52 +01:00
MascaraSnake
08386ead09 Use tag instead of angle for skyboxes 2020-01-25 10:26:38 +01:00
MascaraSnake
0080844c5b Use tag instead of angle for polyobject spawn points and anchors 2020-01-25 10:15:20 +01:00
MascaraSnake
0cb61af3d2 Use tag field to setup vertex slopes 2020-01-25 10:01:01 +01:00
MascaraSnake
436d375dc0 Add mapthing tag field (not used yet) 2020-01-25 09:52:13 +01:00
MascaraSnake
bf24c18ba2 Rename some UDMF fields whose names have different meanings in other UDMF implementations 2020-01-24 23:02:42 +01:00
MascaraSnake
588a76efe4 Merge branch 'next' into udmf-next 2020-01-24 22:38:26 +01:00
Louis-Antoine
bb157866b7 Ignore disconnected players in tag gametypes 
Disconnected players do not become IT at round start.

If all non-ITs are disconnected, the round ends.

If all ITs are disconnected, one of the non-ITs
becomes IT, or the round ends if in Hide & Seek.
 2020-01-23 19:58:13 +01:00
Louis-Antoine
a997683d1c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2020-01-22 03:57:22 +01:00
Louis-Antoine
7d615ed94b Refactor player spawning code a little 2020-01-22 03:19:15 +01:00
James R
f906a7bcce Actually actually match the old behavior and check existing levelflats in P_AddLevelFlatRuntime BRUH 2020-01-21 16:47:47 -08:00
James R
08ba4ece8e Don't check "Too many flats in level" with P_AddLevelFlatRuntime 
Also moved the debug down in case anyone uses that.
 2020-01-21 15:35:07 -08:00
James R
4e5644335a Revert "Fix Ploadflat closing the game with "Too many flats in level" error message" 
This reverts commit 51c7074247.
 2020-01-21 15:35:07 -08:00
James R
ab86ef936a Merge branch 'keywords-back-again' into 'next' 
Level header keywords

See merge request STJr/SRB2!656
 2020-01-16 20:05:24 -05:00
Alam Ed Arias
61e5221af8 use a byte, not a ptr2int with memset 2020-01-12 18:59:35 -05:00
Tatsuru
445269ce14 Expose colorization to mappers and SOC 2020-01-11 20:40:57 -03:00
MascaraSnake
d0a3447f5c Merge branch 'udmf-next' into stringargs 2020-01-11 16:17:53 +01:00
MascaraSnake
4e3dcc70c3 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_slopes.c
 2020-01-11 16:16:57 +01:00
MascaraSnake
ebe467a664 Merge branch 'udmf-next' into stringargs 2020-01-11 16:03:38 +01:00
MascaraSnake
331fe7201c Merge branch 'udmf-vslopes' into 'next' 
Add textmap vertex slope support

See merge request STJr/SRB2!633
 2020-01-11 10:02:51 -05:00
MascaraSnake
23da73f5df Merge branch 'linedef-args' into 'udmf-next' 
Add UDMF linedef arguments and make slope specials use them

See merge request STJr/SRB2!643
 2020-01-11 10:00:07 -05:00
MascaraSnake
897f6ee067 Adapt setup of linedef type 443 (Call Lua function) to UDMF 2020-01-11 15:38:50 +01:00
MascaraSnake
07ec05a44b Fix incorrect cast 2020-01-10 23:32:31 +01:00
MascaraSnake
fac733331d Some minor cleanup 2020-01-10 19:56:29 +01:00
MascaraSnake
9c70ee2690 Merge branch 'fakeplanes-colormap' into 'next' 
Don't create colormap data out of sidedef text for fake planes linedef

See merge request STJr/SRB2!648
 2020-01-09 15:04:33 -05:00
James R
4f0acda87c Call it KEYWORDS 2020-01-08 14:41:38 -08:00
James R
d3da473d4c Revert "Oh right, the keywords..." 
This reverts commit 7431794b5c.
 2020-01-08 14:26:47 -08:00
MascaraSnake
77c1f5620c Merge branch 'fakeplanes-colormap' into stringargs 2020-01-08 20:10:43 +01:00
MascaraSnake
8ae2f1d4d3 Don't create colormap data out of sidedef text for fake planes linedef (the colormap data isn't even used anymore) 2020-01-08 09:28:37 +01:00
MascaraSnake
16b515ba06 Implement linedef string arguments 2020-01-08 08:42:35 +01:00
fickleheart
084a8db5a9 Merge remote-tracking branch 'upstream/next' into next-newcontrols 2020-01-07 23:43:43 -06:00
MascaraSnake
d55a64b740 Adapt setup of copy slope linedef to UDMF 2020-01-06 17:39:39 +01:00
MascaraSnake
7e6ac2ac92 Adapt setup of vertex-based slopes to UDMF 2020-01-06 15:34:28 +01:00
MascaraSnake
64dc6659c5 Merge branch 'next' into linedef-args 2020-01-06 14:46:47 +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
MascaraSnake
0ee12ebbd5 Adapt setup of line-based slopes to UDMF 2020-01-05 14:31:56 +01:00
Alam Ed Arias
4408d2bb17 Copy and Paste error 2020-01-04 18:34:16 -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
Nev3r
764a8ad43f Remove vertex_t's z variable. 2020-01-04 18:29:02 +01:00
fickleheart
067b132eb1 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06: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