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

8432 commits

This branch
This branch
All branches
Author SHA1 Message Date
MascaraSnake
b5d6c40d68 Get rid of a few mt->options >> ZSHIFT usages in objectplace 2019-12-25 09:40:08 +01:00
MascaraSnake
69539e640b Make slope vertices use mt->z directly instead of mt->options >> ZSHIFT 2019-12-25 09:10:20 +01:00
MascaraSnake
07ec13b309 P_MobjThinker: Separate fuse handling into its own function 2019-12-25 00:36:24 +01:00
MascaraSnake
8647d2784b P_MobjThinker: Separate MF2_FIRING handling into its own function 2019-12-25 00:18:12 +01:00
MascaraSnake
14086ce86d Continue cutting up P_MobjThinker into multiple functions 2019-12-25 00:14:53 +01:00
MascaraSnake
caa0800213 P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions 2019-12-24 21:07:55 +01:00
MascaraSnake
a4adb0d873 Fixed missing break in offset handling for horizontal springs 2019-12-24 12:58:12 +01:00
MascaraSnake
464a476a54 Move bonus time handling into new function P_SetBonusTime() 2019-12-24 12:52:43 +01:00
MascaraSnake
dac9014786 Allow P_SpawnItemRow to spawn different item types in the same row 2019-12-24 12:47:44 +01:00
MascaraSnake
68238107f8 Allow P_SpawnItemCircle to spawn arbitrary mobjtypes (will be used in UDMF) 2019-12-24 12:38:16 +01:00
MascaraSnake
1d6e6b7072 Allow P_SpawnItemRow to spawn arbitrary mobjtypes (will be used in UDMF) 2019-12-24 12:19:13 +01:00
MascaraSnake
cb4fbaa596 Separate P_SpawnHoopsAndRings into different functions: 
-Hoops are spawned in P_SpawnHoop
-Item patterns are spawned in P_SpawnItemPattern
-Ring-like items are spawned normally via P_SpawnMapThing
-Bonus time items are spawned via P_SpawnBonusTimeItem, which is a wrapper for P_SpawnMapThing
 2019-12-24 10:50:49 +01:00
MascaraSnake
7dc370d786 Replaced functions for spawning premade rows of rings with a function for spawning a generic row of rings (groundwork for UDMF) 2019-12-24 00:10:29 +01:00
MascaraSnake
1809cb8e82 Turn size and number of items for item circle into function parameters (in preparation for UDMF) 2019-12-23 22:58:58 +01:00
MascaraSnake
c52edb6eff Turned nightsreplace into a macro so we have don't have to keep dragging it along as a function parameter 2019-12-23 21:35:03 +01:00
MascaraSnake
d822fad788 Made a mapthing-independent version of P_GetMobjSpawnHeight so P_SpawnHoopsAndRings subfunctions can use it instead of duplicating code. 2019-12-23 21:17:12 +01: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
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
MascaraSnake
26d80c2b12 Split up P_SpawnHoopsAndRings() into subfunctions 2019-12-23 12:42:09 +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
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