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

1682 commits

Author SHA1 Message Date
toaster
1adceb858c Mario brick blocks are likely to always have square sectors dividing seperate bricks, so allow them to be busted individually. 2020-01-10 11:43:41 +00:00
James R
f1712f2cd8 Merge branch 'rollout_consistency' into 'next' 
Rollout Rockonsistency

See merge request STJr/SRB2!655
 2020-01-09 16:20:34 -05:00
Alam Ed Arias
f267f7bb3e whitespace cleanup 2020-01-09 16:19:12 -05:00
toaster
4f77e1e99b Allow Rollout Rocks that are being ridden to: 
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.

This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).

Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
 2020-01-08 22:36:29 +00:00
MascaraSnake
ce7a1b289f Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next 2020-01-08 08:43:55 +01:00
MascaraSnake
3a6614409b Fix a condition in the flame jet thinkers I accidentally messed up 2020-01-08 08:43:36 +01:00
James R
cea03e4256 Merge branch 'dashmode-tweaks' into 'next' 
Dashmode tweaks

See merge request STJr/SRB2!646
 2020-01-08 01:10:44 -05:00
lachwright
1811a2a34d Dashmode tweaks: 
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
 2020-01-07 15:38:48 +08:00
Tatsuru
30683f5bdd ifdefs make indenting confusing 2020-01-07 01:24:04 -03:00
Tatsuru
a50549aa7c Don't fuck with the fuse if it's negative 2020-01-05 23:41:22 -03:00
Tatsuru
ce45746d02 No comments 2020-01-05 23:19:52 -03:00
Tatsuru
89eda2fa9b :amybruh: 2020-01-05 23:18:38 -03:00
Jaime Passos
12068930b2 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03:00
MascaraSnake
8d561a20c1 Merge branch 'kill-zshift' into 'next' 
Eliminate all unnecessary uses of ZSHIFT

See merge request STJr/SRB2!580
 2019-12-29 08:35:52 -05:00
Jaime Passos
bd28daea02 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-28 21:39:38 -03:00
Jaime Passos
63132da7e0 Rename GTR_MATCHEMERALDS to GTR_POWERSTONES. 2019-12-28 19:49:34 -03:00
lachwright
65c5f7f571 Remove MF_NOTHINK from join-breaking referenced objects 2019-12-29 03:01:09 +08:00
MascaraSnake
82d21224cf Merge branch 'next' into kill-zshift 
# Conflicts:
#	src/p_mobj.c
 2019-12-27 08:11:04 +01:00
Jaime Passos
070adb4191 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
James R
599477061a Merge branch 'gametype-clownery' into 'next' 
Custom gametypes

See merge request STJr/SRB2!566
 2019-12-26 18:08:41 -05:00
Monster Iestyn
3bafa90b7a Fix mixed declaration-and-code compiling error 2019-12-26 21:59:09 +00:00
Alam Ed Arias
dc1f97e634 Merge branch 'next' into mobjthinker-refactoring 2019-12-26 14:50:35 -05:00
Alam Ed Arias
97b5d2449c Merge branch 'next' into gametype-clownery 2019-12-26 14:48:04 -05:00
Alam Ed Arias
19379a0a68 Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift 2019-12-26 14:43:03 -05:00
MascaraSnake
015f3a36d2 Make P_RespawnSpecials call P_SpawnMapThing instead of trying to do everything itself 2019-12-26 20:13:56 +01:00
Alam Ed Arias
5089b93e4c Merge branch 'next' into kill-zshift 2019-12-26 12:49:04 -05:00
Alam Ed Arias
64792ab9fd ISO C90 fixup 2019-12-26 12:44:47 -05:00
Alam Ed Arias
c1b52069e3 cleanup buildbot error 2019-12-26 12:27:15 -05:00
James R
12f0e584b2 Correct the check for rings on thing 604 - 607 
The original code used a switch case, not AND 1. :V
 2019-12-25 15:23:19 -08:00
MascaraSnake
c4a6424642 P_FlagFuseThink: Use mt->z instead of mt->options >> ZSHIFT 2019-12-25 11:17:57 +01:00
MascaraSnake
27361fbf43 P_MovePlayerToSpawn: Use mthing->z instead of mthing->options >> ZSHIFT 2019-12-25 10:59:12 +01:00
Jaime Passos
42c71d3f42 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-25 06:09:00 -03:00
MascaraSnake
1db2f6447d Use mthing->z instead of mthing->options >> ZSHIFT in particle generator setup 2019-12-25 09:46:09 +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
Jaime Passos
31eeb90056 Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery 2019-12-24 17:55:46 -03:00
MascaraSnake
caa0800213 P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions 2019-12-24 21:07:55 +01:00
Jaime Passos
debacf34bb Turn the babysitting deterrent into its own rule. 2019-12-24 16:30:18 -03:00
MascaraSnake
418cc50bbc Fixed missing break in offset handling for horizontal springs 2019-12-24 13:01:17 +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
Jaime Passos
8405dc4c07 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-23 23:08:16 -03: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