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
9888 commits 1 branch 12 tags 205 MiB
Commit graph

607 commits

Author SHA1 Message Date
Nev3r
720da2ab35 Polyobject spawning now use the taglist. 2020-04-17 10:30:38 +02:00
Nev3r
6ab06fc89c Skybox spawning now uses the taglists. 2020-04-17 10:05:50 +02:00
Nev3r
e0edd25fd6 Thing-based slope vertexes use taglists now. 2020-04-17 10:04:11 +02:00
Nev3r
cccf5d8151 Merge branch 'udmf-next' into udmf-multitag 2020-04-14 22:21:32 +02:00
Nev3r
750cafbcbc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-14 22:20:54 +02:00
Nev3r
44426fd453 Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose. 2020-04-13 15:17:53 +02:00
Nev3r
e00c8fcdbe Added static multitag read and storage on mapload. 2020-04-12 11:56:36 +02:00
Nev3r
860c44d953 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/lua_hooklib.c
 2020-04-12 09:57:19 +02:00
James R
71f4433b98 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
MascaraSnake
9b76d3af6f Merge branch 'next' into udmf-next 
# Conflicts:
#	extras/conf/Includes/SRB222_linedefs.cfg
#	extras/conf/Includes/SRB222_misc.cfg
#	src/p_spec.c
 2020-03-21 20:04:31 +01:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Monster Iestyn
f3bfa2b1db Merge branch 'master' into next 2020-03-15 20:32:43 +00:00
MascaraSnake
6645030a39 Add boolean variable that indicates if current map is in UDMF format 2020-03-15 16:23:15 +01:00
Nev3r
63fb8f846b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
Monster Iestyn
f186def0bf Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff 
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
 2020-03-09 13:54:56 +00:00
Jaime Passos
75ff8c1789 Don't get chosen as the tagger if you're a spectator 2020-02-23 19:28:16 -03:00
SteelT
fcb0c62bf7 Merge branch 'update-copyright-year' into 'master' 
Update copyright year

See merge request STJr/SRB2!801
 2020-02-21 20:59:56 -05:00
James R
aa0d40212e Merge branch 'ogl-colorbug' into 'master' 
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
 2020-02-20 19:32:34 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru
7f190f35f2 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
 2020-02-19 17:46:18 -03:00
Tatsuru
1463d8ba20 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye 2020-02-19 17:32:43 -03:00
James R
1bc6f2cd91 Merge branch 'startup-file-not-found' into 'master' 
Fix the issue !678 did, but just don't exit if the file was added twice

See merge request STJr/SRB2!753
 2020-02-18 21:50:11 -05:00
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