thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-08 00:52:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8426 commits 2 branches 14 tags 206 MiB
Commit graph

8426 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
248e452d7d Merge branch 'titlecard2' into 'next' 
More customisable title card

See merge request STJr/SRB2!552
 2019-12-24 14:47:55 -05:00
MascaraSnake
604a1c654d Merge branch 'horizontalspring-oops' into 'next' 
Fixed missing break in offset handling for horizontal springs

See merge request STJr/SRB2!571
 2019-12-24 07:02:34 -05:00
MascaraSnake
418cc50bbc Fixed missing break in offset handling for horizontal springs 2019-12-24 13:01:17 +01:00
MascaraSnake
21e23c4307 Merge branch 'spawnmapthing-refactor' into 'next' 
Hack P_SpawnMapThing into tiny little pieces

See merge request STJr/SRB2!564
 2019-12-24 01:59:36 -05:00
MascaraSnake
4d5cb2ddf8 Set mthing->mobj before the flags handling code, since at this point the setup can't fail anymore 2019-12-23 20:12:45 +01:00
MascaraSnake
3db7d6ad94 Merge branch 'netarchive_compare_changes' into 'next' 
Netarchive compare changes

See merge request STJr/SRB2!563
 2019-12-23 13:57:49 -05:00
MascaraSnake
9dc1d87ad9 Merge branch 'hoops_and_rings_refactor' into 'next' 
Refactor P_SpawnHoopsAndRings

See merge request STJr/SRB2!562
 2019-12-23 13:57:01 -05:00
MascaraSnake
901cc827ff P_SpawnMapThing(): Separate handling of MTF_AMBUSH and MTF_OBJECTSPECIAL in its own functions 2019-12-23 19:08:40 +01:00
MascaraSnake
2cac61dd28 P_SpawnMapThing(): Separated the giant post-Lua hook switch-case statement into its own function, and separated some of the larger cases into their own function as well 2019-12-23 18:59:11 +01:00
MascaraSnake
06bbfb11d8 P_MapThingSpawn(): Move early returning/substitution code into their own functions 2019-12-23 17:28:21 +01:00
MascaraSnake
d3ac0a305a Move P_GetMobjtype above first use 2019-12-23 16:54:26 +01:00
MascaraSnake
a99a307ed4 Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function 2019-12-23 16:53:45 +01:00
MascaraSnake
0fa8936966 Add P_GetMobjtype for finding the mobjtype for a given mapthingnum 2019-12-23 14:45:43 +01:00
Nev3r
63e078286b Make lines and sides use the mapload copies in P_NetArchiveWorld() too; do no longer use vres stuff there. 2019-12-23 12:47:40 +01:00
Nev3r
befe33e239 Remove redundant netarchive-related sector vars as they're not used anymore. 
Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
 2019-12-23 12:42:38 +01:00
MascaraSnake
26d80c2b12 Split up P_SpawnHoopsAndRings() into subfunctions 2019-12-23 12:42:09 +01:00
Nev3r
7be95c1999 Store a copy of sectors, lines and sides in memory so that P_NetArchiveWorld() can soon use them instead of relying on re-opening the original lumps. 
Fix print type issue.
 2019-12-23 12:30:32 +01:00
MascaraSnake
783b2fbb3c Move spawning of ring-like items into its own function, use P_GetMobjSpawnHeight() 2019-12-23 12:07:03 +01:00
James R
51bcdc2a4b Merge branch 'hoop_refactor' into 'next' 
Make both NiGHTS hoop types use the same spawning code.

See merge request STJr/SRB2!560
 2019-12-23 00:16:46 -05:00
James R
92a4ec84f5 Merge remote-tracking branch 'origin/master' into next 2019-12-22 20:47:15 -08:00
MascaraSnake
387578832d Merge branch 'flats-in-walls' into 'master' 
Flats in walls

See merge request STJr/SRB2!548
 2019-12-22 17:44:50 -05:00
MascaraSnake
40033d69c8 Merge branch 'supermusic-state-fix' into 'next' 
Fix super theme ending early if invincibility expired

See merge request STJr/SRB2!559
 2019-12-22 17:37:32 -05:00
MascaraSnake
1847c5e34f Merge branch 'dustdevilfix' into 'next' 
Fix pflags not being properly reset when entering dust devil from top

See merge request STJr/SRB2!556
 2019-12-22 17:35:51 -05:00
MascaraSnake
8e787a6d27 Merge branch 'virtres' into 'next' 
(UDMF prereq.) Map data lump interface

See merge request STJr/SRB2!535
 2019-12-22 17:22:49 -05:00
MascaraSnake
2e802dde5c P_LoadMapData(): Throw an error if resources are not found. 2019-12-22 23:22:15 +01:00
MascaraSnake
f91e9bdee5 Merge branch 'next' into virtres 
# Conflicts:
#	src/p_setup.c
 2019-12-22 23:02:47 +01:00
MascaraSnake
9d33c02367 Merge branch 'next' into hoop_refactor 
# Conflicts:
#	src/p_mobj.c
 2019-12-22 18:12:58 +01:00
MascaraSnake
0fd9596e3c Make both NiGHTS hoop types use the same spawning code. 
As a result, the old generic hoops now use 24 sprites instead of 32.
 2019-12-22 17:37:54 +01:00
Steel Titanium
5281c44042 Fix super theme ending early if invincibility expired 2019-12-20 23:45:32 -05:00
James R
1d0b7aca9d Merge remote-tracking branch 'origin/master' into next 2019-12-20 14:40:10 -08:00
James R
74bd973616 Merge branch 'better-deadzone' into 'master' 
Better Deadzones

See merge request STJr/SRB2!541
 2019-12-20 17:33:29 -05:00
James R
30322b338a Merge branch 'random-port' into 'master' 
Choose a random port as a client

See merge request STJr/SRB2!554
 2019-12-20 17:33:12 -05:00
James R
982c6362db Merge branch 'elemental-tweak' into 'next' 
Don't uncurl from spin if Elemental Stomp is used

See merge request STJr/SRB2!555
 2019-12-20 17:32:59 -05:00
Alam Ed Arias
cdc0b9c846 Revert "Travis yflip error" 
This reverts commit 3bf83ff717.
 2019-12-19 10:25:54 -05:00
Alam Ed Arias
37a264c30e Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer 2019-12-19 10:24:04 -05:00
lachwright
4be3a0706c Fix pflags not being properly reset when entering dust devil from top 2019-12-19 12:03:36 +08:00
Steel Titanium
a0993baa0b Don't uncurl from spin if Elemental Stomp is used 2019-12-18 21:28:34 -05:00
James R
17749b9e3e -clientport (it's back!) and -serverport, which is an alias to -port 
If you ever need to, you can change the client port number.
 2019-12-18 15:47:47 -08:00
James R
5921e1a567 Use a pointer for port_name 
Using strcpy is stupid because we don't know how long the argument would be.
There's no need for a buffer anyway.
 2019-12-18 15:43:29 -08:00
James R
8368449e6c Use a random port when connecting 2019-12-18 15:34:55 -08:00
Jaime Passos
607d066c01 More customisable title card 
Add TitleCardZigZag, TitleCardZigZagText and TitleCardActDiamond fields to SOC.
Add the same fields to Lua under their internal names.
Turn map header level flags into an UINT16, so that NoTitleCard works. (NOBODY caught this, I'm actually disappointed.)
 2019-12-18 00:28:58 -03:00
James R
ebcd9923b1 Merge branch 'fix-divby0-spindash-crash' into 'next' 
Fix a divide by zero crash when mindash and maxdash were the same.

See merge request STJr/SRB2!539
 2019-12-17 20:42:56 -05:00
James R
230cb95335 Merge branch 'hud-toggling' into 'next' 
Let Lua toggle Team Match/CTF team scores HUD element

See merge request STJr/SRB2!544
 2019-12-17 16:17:01 -05:00
James R
39e7f7b10b Merge branch 'rvz1-crashfix' into 'next' 
Fix crash on mapload when removing Dragonbomber with Lua

See merge request STJr/SRB2!545
 2019-12-17 16:16:51 -05:00
Jaime Passos
da81238610 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-17 15:05:16 -03:00
James R
eb39e72a10 Merge branch 'spawn_z_refactor' into 'next' 
(UDMF prereq.) Spawn Z refactor

See merge request STJr/SRB2!536
 2019-12-16 23:21:07 -05:00
James R
def0123e9a Merge branch 'fix-sector-lines' into 'next' 
Fix sector.lines in Lua

See merge request STJr/SRB2!542
 2019-12-16 23:05:52 -05:00
Steel Titanium
6797e328bb Fix crash on mapload when removing Dragonbomber with Lua 2019-12-16 21:25:41 -05:00
James R
f67b370d74 Merge branch 'lua-maincfg-vars' into 'next' 
Lua MainCfg vars

See merge request STJr/SRB2!543
 2019-12-16 17:54:01 -05:00
Tatsuru
06f02e81dd Let Lua toggle Match/CTF team scores HUD element 2019-12-16 17:58:00 -03:00