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

9615 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Steel Titanium
7b0cffe9f9 Merge branch 'next' into char-damage-fix 2019-12-20 23:24:29 -05:00
Steel Titanium
14673656c3 Fix Amy and Fang being able to attack other players in MP Special Stages 2019-12-20 23:22:45 -05:00
GoldenTails
b18c114931 Fix pasting going out of bounds and dash the possibility of memory leaks while pasting. 2019-12-20 20:28:30 -06:00
James R
1d0b7aca9d Merge remote-tracking branch 'origin/master' into next 2019-12-20 14:40:10 -08:00
GoldenTails
1164e6f657 Allow Clipboard actions. 2019-12-20 16:39:19 -06: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
Zachary McAlpin
324b05032c Revert "Added CalculateCamera Hook" 
This reverts commit b545a13312.
 2019-12-19 17:21:55 -06:00
Zachary McAlpin
435f70ff85 Revert "Fix CalculateCamera compiling error" 
This reverts commit 91ebec08c6.
 2019-12-19 17:21:46 -06:00
Zachary McAlpin
7481a91764 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features 2019-12-19 17:20:31 -06:00
Zachary McAlpin
91ebec08c6 Fix CalculateCamera compiling error 2019-12-19 17:17:17 -06:00
Zachary McAlpin
b545a13312 Added CalculateCamera Hook 2019-12-19 16:41:25 -06:00
Jaime Passos
644d0d86ad Lua gametyperules 2019-12-19 18:27:11 -03:00
Zachary McAlpin
6add4f0aa4 Revert "Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition" 
This reverts commit 4bb2a826cf.
 2019-12-19 15:07:34 -06:00
Zachary McAlpin
bcbfb7cb19 Revert "Don't execute LUAh_PlayerThink(player) for respawning bots" 
This reverts commit 96a41ca2b8.
 2019-12-19 15:07:28 -06:00
Jaime Passos
d80a6e11e7 Load SPR_ lumps as SpriteInfo 2019-12-19 17:25:19 -03:00
Jaime Passos
ac616a3157 Merge remote-tracking branch 'origin/master' into rotsprite2 2019-12-19 17:20:21 -03:00
Jaime Passos
c40cf626bf Remove W_UnlockCachedPatch calls to avoid crashing 2019-12-19 17:14:56 -03:00
James R
0b87dd3554 Fix switching to software 
Would show a black screen for me on Linux. My suspsicion is that
some things are not initialized with just VID_CheckRenderer.
 2019-12-19 17:13:23 -03:00
Jaime Passos
98f903b311 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-19 17:09:47 -03:00
Jaime Passos
2eec0b6a9b Don't spawn End Level Signs without the GTR_ALLOWEXIT rule 2019-12-19 17:06:07 -03:00
Jaime Passos
f3a91afe90 Make G_PlatformGametype only check the gametype rules, to avoid unintended side effects 2019-12-19 16:31:38 -03:00
Jaime Passos
b8671edef4 Removing commented out code 2019-12-19 16:22:55 -03:00
Steel Titanium
f94cfb5929 Allow access to bluescore and redscore 2019-12-19 16:17:08 -03:00
Jaime Passos
a4ce7e908d Remove GTR_NOGAMEEND 2019-12-19 16:13:27 -03:00
Jaime Passos
063d4d0d86 Organise rules 2019-12-19 16:12:10 -03:00
Jaime Passos
18235cd672 Remove GTR_PLATFORM 2019-12-19 16:05:03 -03:00
Jaime Passos
9b1d5db5f8 Remove GTR_ROUNDENDMESSAGE 2019-12-19 15:47:37 -03: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
Jaime Passos
108129b222 GTR_DEATHMATCHSTARTS 2019-12-19 02:26:17 -03:00
Jaime Passos
6c2b62a795 fix warnings 2019-12-19 02:20:49 -03:00
Jaime Passos
8bd0fc842f allow CTF spawns in GTR_TEAMS gametype rule 2019-12-19 02:17:03 -03:00
Jaime Passos
ad317cd8a2 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-19 02:15:45 -03:00
Jaime Passos
920d99976c Lua! Lua! Lua! 
Expecting the buildbot to complain
 2019-12-19 02:13:09 -03:00
lachwright
4be3a0706c Fix pflags not being properly reset when entering dust devil from top 2019-12-19 12:03:36 +08:00
Jaime Passos
29b819015a De-fuck team change 2019-12-19 00:31:13 -03:00
Jaime Passos
861fa5bb23 Remove this debugging command, as I don't need it anymore. 2019-12-19 00:15:19 -03:00
Jaime Passos
b65c6e3745 Shadowed variable declarations whoopsie!!! uwu 2019-12-18 23:53:26 -03:00
Jaime Passos
ac74a2a020 ViewpointSwitch hack so nobody does anything evil 
Prints the generic "can't do this in a HUD hook" message. Whatever. I'm tired.
 2019-12-18 23:47:17 -03:00
Jaime Passos
e47f171533 TeamSwitch hook for Lua 2019-12-18 23:40:58 -03:00
Steel Titanium
a0993baa0b Don't uncurl from spin if Elemental Stomp is used 2019-12-18 21:28:34 -05:00