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

4289 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
378131ca3a Fix not found 40833 2018-11-10 22:27:04 +00:00
Sryder
9350721d12 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge 
# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
 2018-11-10 21:14:53 +00:00
Monster Iestyn
f3d129e1a6 Merge branch 'master' into next 2018-11-10 19:05:33 +00:00
Monster Iestyn
d3271c5797 Merge branch 'opengl-new-clipping-backport' into 'master' 
OpenGL new clipping backport

See merge request STJr/SRB2!315
 2018-11-10 13:57:16 -05:00
Monster Iestyn
8cacd3f876 Merge branch 'alias-recursion-hotfix' into 'next' 
Alias recursion hotfix

See merge request STJr/SRB2!314
 2018-11-10 13:56:43 -05:00
Monster Iestyn
51ee510b85 Merge branch 'gcc-compiling-cleanup' into 'master' 
Compiling cleanup and fixes

See merge request STJr/SRB2!311
 2018-11-10 13:56:17 -05:00
toaster
692b1f0401 Three more CV_NOSHOWHELP's I missed the first time around. (Not making another exe for this, it'll show up the next time one is made... not that important.) 2018-11-10 18:50:19 +00:00
toaster
4281f59971 Merge branch 'fof-slope-skew-backport' of https://git.magicalgirl.moe/STJr/SRB2.git 2018-11-10 18:27:13 +00:00
Sryder
4834f098f5 Merge branch 'com_cleanup_redo' into 'master' 
Improved "HELP" command

See merge request KartKrew/Kart!82
 2018-11-10 12:51:51 -05:00
Monster Iestyn
2373a6d209 fix using abs() on unsigned 2018-11-10 17:40:09 +00:00
Monster Iestyn
58c8cbf71d Whoops, this broke my non-NEWCLIP test build 2018-11-10 16:10:25 +00:00
Monster Iestyn
5d558ffed9 Updated SRB2.cbp for hw_clip.c/h 2018-11-10 16:10:08 +00:00
Monster Iestyn
3e0ec0ed6e clipping code didn't seem so bad this time (at least compared to without), let's enable it now? 2018-11-10 16:09:52 +00:00
Monster Iestyn
210ea25a1b Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly 
R_IsEmptyLine is now a thing too btw
 2018-11-10 16:09:21 +00:00
Monster Iestyn
ad860e0d01 More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now 
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
 2018-11-10 16:08:56 +00:00
Monster Iestyn
b7dc441e10 Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least 
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
 2018-11-10 16:08:26 +00:00
Monster Iestyn
c44b742112 Merge branch 'master' into next 2018-11-10 14:27:27 +00:00
Monster Iestyn
24bc2a04fa Merge branch 'opengl-improvements-backport' into 'master' 
Opengl improvements backport

See merge request STJr/SRB2!304
 2018-11-10 09:25:18 -05:00
Monster Iestyn
8e507f6e36 Merge branch 'readme-update' into 'master' 
Update readme

See merge request STJr/SRB2!313
 2018-11-10 08:39:02 -05:00
Monster Iestyn
3a926cff5a Merge branch 'copyright-info-update' into 'master' 
Update copyright info

See merge request STJr/SRB2!309
 2018-11-10 08:33:09 -05:00
Monster Iestyn
8fac10505f Place limit on the amount of alias recursion allowed, to prevent cycles or otherwise excessive recursion 2018-11-10 13:08:26 +00:00
toaster
be648623cc Hide the numlaps change message in record attack. (It plays every time you load a demo of a map with a differing quantity of laps to the default value...) 2018-11-10 12:34:04 +00:00
toaster
2da7b64579 * Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first. 
* Apply the "YOU ARE THIS PERSON" highlight to all non-splitscreen circumstances that use the tiny player icons. (New locations: Tab rankings, intermission, completed votes.)
 2018-11-10 12:31:41 +00:00
TehRealSalt
6b534b6d1d Shorter Karma sticker 2018-11-10 01:03:34 -05:00
TehRealSalt
8ed0428e9e Use Silver for brake drift effect 2018-11-10 00:02:21 -05:00
TehRealSalt
56bd4f1a45 Ranking face highlights 2018-11-10 00:01:44 -05:00
TehRealSalt
092caa59fc Separate grow & invincibility alarms, donated by VAda 2018-11-09 21:47:36 -05:00
Steel Titanium
8d714f8522 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update 2018-11-09 18:24:42 -05:00
Monster Iestyn
5532882303 Merge branch 'master' into next 2018-11-09 23:18:14 +00:00
Alam Arias
cdf6ef7cc5 Merge pull request #320 from monster-psychic-cat/remote_view_fixes 
Minor remote viewpoint bugfixes.
 2018-11-09 16:09:20 -05:00
Steel Titanium
25bbfe0610 Update readme 2018-11-09 16:01:29 -05:00
TehRealSalt
0d95cd9fb2 Buff the fuck out of item drop speed 
no, dude, don't turn right back around and pick your shit right back up, stop
 2018-11-09 15:37:33 -05:00
TehRealSalt
22fc21228d Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-09 15:34:59 -05:00
toaster
4172503675 Prevent using kartdebug cvars in Time Attack. 
(None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
 2018-11-09 20:16:12 +00:00
Monster Iestyn
ebb27b1c3c Merge branch 'public-op-nightsbumper-fix' into 'next' 
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS

See merge request STJr/SRB2!299
 2018-11-09 12:11:11 -05:00
Monster Iestyn
32a2c6dc3c Merge branch 'master' into next 2018-11-09 16:09:49 +00:00
Monster Iestyn
74f221d73f Merge branch 'music-clean' into 'master' 
Some code cleanup.

See merge request STJr/SRB2!298
 2018-11-09 10:58:57 -05:00
TehRealSalt
f780e1535e A few mobj_scale fixes I missed on signposts 2018-11-08 20:39:18 -05:00
TehRealSalt
fea8fe9ee7 Lap emblem gets replaced with a stopwatch in Record Attack 2018-11-08 19:36:05 -05:00
TehRealSalt
69740101ed Log "Speeding off to level..." 
It's not disruptive, but it looks a bit goofy since the "Map is now x" print is no longer directly printed either, so it's the only thing sticking around in the console :V
 2018-11-08 17:56:26 -05:00
TehRealSalt
5b6efcba0c Merge remote-tracking branch 'srb2public/next' 2018-11-08 17:37:05 -05:00
Monster Iestyn
c1a4a62d87 Merge branch 'no-hasslope' into next 
yes I'm an idiot for rushing things like this
 2018-11-08 21:25:51 +00:00
Monster Iestyn
7d31440ca6 WHY DID I FORGET THIS 2018-11-08 21:22:45 +00:00
Monster Iestyn
150fe29988 Merge branch 'no-hasslope' into 'next' 
No hasslope

See merge request STJr/SRB2!312
 2018-11-08 16:20:28 -05:00
Monster Iestyn
8440664c2f Remove hasslope, per colette's warning about it potentially causing desyncs 2018-11-08 21:13:58 +00:00
TehRealSalt
bf1b9d2042 Foolish typo 2018-11-08 16:04:26 -05:00
Monster Iestyn
1200793a94 Merge branch 'Playerquit_hook' into 'next' 
"PlayerQuit" Lua Hook

See merge request STJr/SRB2!127
 2018-11-08 15:53:35 -05:00
Monster Iestyn
5f7c333625 Merge branch 'lua-slopes' into 'next' 
Lua support for slopes

See merge request STJr/SRB2!307
 2018-11-08 15:52:44 -05:00
Monster Iestyn
68305c3b18 Merge branch 'master' into next 2018-11-08 20:50:58 +00:00
Monster Iestyn
8c2a163f5d Merge branch 'winsock-error-handling-fixes' into 'master' 
Winsock error handling fixes

See merge request STJr/SRB2!303
 2018-11-08 15:49:35 -05:00