thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-10 04:07:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14498 commits 2 branches 14 tags 206 MiB
Commit graph

14498 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
03b3d61fd1 Add TESTERS build flag to Makefile 2019-09-27 19:21:18 -07:00
James R
246280045c Fix crash in TESTERS build if you try to record demo anyway 2019-09-27 19:20:55 -07:00
James R
8cbdc999f4 Block playing by yourself in TESTERS build with le funni message 
SV_SpawnServer is called in instances other than joining
a server or watching a replay. How convenient, huh?
 2019-09-27 19:19:04 -07:00
Jaime Passos
e95bd8add3 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
Jaime Passos
fa9cef1cc0 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
Monster Iestyn
0e7df5ee87 Added < 0 checks to all three variables added in last commit 
(no point checking >= MAXPLAYERS tbh, there's no reason the game would even set those values that I can think of offhand)
 2019-09-27 23:15:38 +01:00
Monster Iestyn
939cfe8271 Added consoleplayer, displayplayer and secondarydisplayplayer, by popular request 2019-09-27 21:16:11 +01:00
TehRealSalt
9a9a1c1374 This shouldn't be merged 2019-09-27 15:31:57 -04:00
TehRealSalt
d907158b12 Revert this 2019-09-27 15:12:55 -04:00
Sal
dca76c3f08 Merge branch 'whitespace' into 'master' 
Remove trailing whitespace

See merge request KartKrew/Kart!175
 2019-09-27 14:37:40 -04:00
TehRealSalt
6a1e49a91c Fixed some instances that weren't writing TRANSPARENTPIXEL 2019-09-27 14:34:17 -04:00
Sal
38112a5577 Merge branch 'no-files-crash' into 'master' 
Don't crash if you can't find a pwad or it's already loaded or etc

See merge request KartKrew/Kart!177
 2019-09-27 12:17:00 -04:00
toaster
bc9f9d740a Merge branch 'addons-menu-cleanup' into 'master' 
Addons menu cleanup

See merge request STJr/SRB2Internal!316
 2019-09-27 08:55:36 -04:00
toaster
74efc0e1f4 Merge branch 'bossprovements' into 'master' 
ACZ3 intro

Closes #217

See merge request STJr/SRB2Internal!346
 2019-09-27 08:55:19 -04:00
toaster
95f848d0ee Merge branch 'dsz3shockwave' into 'master' 
Deep Sea Zone 3 hardcoding

Closes #185

See merge request STJr/SRB2Internal!349
 2019-09-27 08:54:57 -04:00
toaster
7f33a402a4 Merge branch 'automap-fixes' into 'master' 
Automap fixes

See merge request STJr/SRB2Internal!348
 2019-09-27 08:52:59 -04:00
toaster
bd2b7ccc84 Merge branch 'patch-fixes' into 'master' 
Patch fixes (Resolves #230)

Closes #230

See merge request STJr/SRB2Internal!347
 2019-09-27 08:52:41 -04:00
toaster
7eb3aeb33b Merge branch 'lachfixes' into 'master' 
Several bug fixes!

Closes #210, #192, and #189

See merge request STJr/SRB2Internal!345
 2019-09-27 08:52:23 -04:00
toaster
9fa8c7a4c2 Merge branch '231-tails-ai-should-die-when-taking-damage-in-ultimate' into 'master' 
Resolve "Tails AI should die when taking damage in Ultimate"

Closes #231

See merge request STJr/SRB2Internal!344
 2019-09-27 08:51:11 -04:00
toaster
7d51ecf5ba Merge branch 'inputstuff' into 'master' 
Trigonometric input capping

See merge request STJr/SRB2Internal!343
 2019-09-27 08:50:55 -04:00
toaster
c1dea190a8 Merge branch 'internal-hotplug-stableid' into 'master' 
Controller hotplug support.

See merge request STJr/SRB2Internal!342
 2019-09-27 08:50:34 -04:00
TehRealSalt
2635d1b810 Fix SPB target not being merged 2019-09-27 06:46:10 -04:00
TehRealSalt
06d27ae36e Merge branch 'master' into fortnite 2019-09-27 06:36:11 -04:00
TehRealSalt
92022be254 Don't crash if you can't find a pwad or it's already loaded or etc 2019-09-27 06:28:26 -04:00
TehRealSalt
dbb6f9ca11 use MF2_AMBUSH for backandforth 2019-09-27 04:20:09 -04:00
TehRealSalt
22796b7633 Merge master 2019-09-27 03:44:37 -04:00
Sal
ed3ef6601e Merge branch 'abs' into 'master' 
Remove unncessary operations

See merge request KartKrew/Kart!176
 2019-09-27 03:10:59 -04:00
Sal
a313e4c33e Merge branch 'world-tour' into 'master' 
Flush random map pool after all but 3 are played

See merge request KartKrew/Kart!170
 2019-09-27 03:07:04 -04:00
Sal
39115db560 Merge branch 'sky-improvements' into 'master' 
Sky improvements

See merge request KartKrew/Kart!174
 2019-09-27 03:06:51 -04:00
Sal
542c4a3306 Merge branch 'new-springs' into 'master' 
New springs

See merge request KartKrew/Kart!171
 2019-09-27 03:06:29 -04:00
James R
739d602c84 Addition unecessary as ruled out by if condition 2019-09-26 16:41:02 -07:00
James R
971eed8d97 abs is unnecessary on unsigned types 2019-09-26 16:35:41 -07:00
James R
1d59d8305d Remove trailing whitespace 2019-09-26 14:39:23 -07:00
James R
7a6a2f248e Remove trailing whitespace 2019-09-26 14:32:25 -07:00
sphere
88ad1937d6 Fix compiling errors, thanks to toaster. 2019-09-26 23:15:52 +02:00
lachwright
7563e7be6f P_SetTarget fixes, added SPR_SHCK to hw_light.c 2019-09-27 02:13:02 +08:00
toaster
85f50ef54b * Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) 
* https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif
* Add fadeout instead of slapstick for Fang Clone Fighter death.
* Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
 2019-09-26 17:06:29 +01:00
lachwright
5b92f15e44 Added A_Boss3ShockThink to dehacked.c 2019-09-26 18:57:25 +08:00
lachwright
f9cf4746b2 Lowered shockwave speed 2019-09-26 17:12:03 +08:00
Sal
921409224c Merge branch 'model-gradients' into 'master' 
Model gradients + model tilt adjustments

See merge request KartKrew/Kart!157
 2019-09-25 21:53:21 -04:00
lachwright
4d31ebf47a Hardcoded DSZ3 shockwave 2019-09-26 05:27:51 +08:00
Monster Iestyn
59109b6ef4 Write a new hack for getting sector->linecount from sector->lines in Lua, to put my mind at rest about it at last. 
1) In sector_get, actually push the memory address of the lines array within sector_t, rather than push the value of "lines" itself (essentially, we we want a pointer to a double pointer, or rather a TRIPLE pointer haha)
2) In the sectorlines_* functions, use offsetof to shift the memory address so we can obtain the value of linecount within the sector_t struct, and dereference the result to obtain the value of linecount itself
3) ??? profit

Untested and uncompiled atm, but I have some confidence this might work
 2019-09-25 20:27:41 +01:00
lachwright
7d4c39a738 Fix errormode compilation error 2019-09-25 23:09:05 +08:00
toaster
3d793fc1ea Correctly restrict MF_NOCLIPTHING-objects from being interacted with from both moving and non-moving side. 2019-09-25 15:49:37 +01:00
lachwright
9f4c65dc01 Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling) 2019-09-25 22:36:48 +08:00
toaster
01f507f3f4 Don't lock on if something is literally intangible. 2019-09-25 15:12:19 +01:00
TehRealSalt
93e844ecd2 Merge master 
(We're still being haunted by whatever happened to make the entire k_kart.c file conflict every single time...)
 2019-09-25 10:04:27 -04:00
toaster
de82d338bd Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? 
If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update.

To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif
* He's digging through Eggman's trash.
* Clearly doesn't expect to see you!
* Ready for a fight all the same.
* You can attack him during the mini cutscene if you're impatient.
* Skipped if you give him MTF_AMBUSH.
* Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first.

Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
 2019-09-25 14:36:20 +01:00
lachwright
09c9ff0217 (Crudely) fixed camera jitter on certain FOF slopes 2019-09-25 21:15:19 +08:00
lachwright
bd1809f742 Fixed Brak's flames not animating 2019-09-25 20:32:56 +08:00