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

25568 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Ed Arias
f1fa3855e5 Merge branch 'public_next' into private 2018-02-14 10:34:36 -05:00
Alam Ed Arias
8722b369a3 Merge branch 'master' into next 2018-02-14 10:29:24 -05:00
Alam Arias
d23d0e0e5b Merge pull request #231 from LJSonik/net-command-leak-fix 
Fix net commands not always being freed
 2018-02-14 10:28:32 -05:00
Louis-Antoine
64a108e24a Don't allocate memory for net commands already executed, as it would cause them to be never freed 2018-02-14 15:09:52 +01:00
TehRealSalt
9c5a09d770 sonicitems porting, Part 2 
BUT with more tweaks on top of that:
- matchesplayed can go up & unlock stuff regardless of modifiedgame
- votetime added to menu
- flame jets are fullbright (been meaning to do this for a while)
- screenshots are prefixed with kart instead of srb2 (ditto)
 2018-02-13 18:13:27 -05:00
TehRealSalt
1a424ba756 Porting over some things from sonicitems 2018-02-13 16:48:09 -05:00
Monster Iestyn
4885c3b719 Merge branch 'master' into hardcoding-time-again 2018-02-13 21:21:30 +00:00
Monster Iestyn
c44a1dc543 Merge branch 'file-loading-cleanup' into 'master' 
File loading cleanup

See merge request STJr/SRB2Internal!129
 2018-02-13 16:18:55 -05:00
Monster Iestyn
f5035e70ea Don't attempt to load the "Lua/" or "SOCs/" folder lumps themselves as Lua/SOC lumps 2018-02-13 21:12:42 +00:00
Louis-Antoine
851c52f3dd Do not prevent all net commands for the current tic from being executed because of an unkown net command ID 2018-02-13 17:53:18 +01:00
toasterbabe
78bb534550 Fixed the strengths going in the wrong direction of transparency in GL! 2018-02-12 21:31:03 +00:00
toasterbabe
4d5dac0d03 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 2018-02-12 18:59:01 +00:00
toasterbabe
a1d12429e4 * Move the non-mapping drawFill out of the source code function and into the Lua interface. 
* Add a drawFill fallback for COLORMAP too.
* Correct a few index mishaps.
 2018-02-12 18:23:57 +00:00
toasterbabe
b0888c44bd * Total overhaul of V_DrawFadeScreen(color, strength! 
- controllable strengths between 0-31 for COLORMAP lump like before
   - arbitrary colour indices in the palette via TRANSMAP lumps, with strengths 0-9
   - exposed to Lua as v.fadeScreen(color, strength)!
* Remove last vestiges of V_STATICPATCH.
 2018-02-12 17:47:31 +00:00
TehRealSalt
3be938d04a Updated player arrows 2018-02-11 21:47:19 -05:00
TehRealSalt
ff1462898a Fuck this weird tabbing 2018-02-11 12:50:42 -05:00
TehRealSalt
62b45ff4b0 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 
# Conflicts:
#	src/k_kart.c

(Also I added some extra music for voting, because I forgot I didn't
commit the merge :V)
 2018-02-11 12:18:25 -05:00
TehRealSalt
c94df11be1 Merge remote-tracking branch 'refs/remotes/origin/democracy' 2018-02-10 20:00:20 -05:00
TehRealSalt
df600ba780 Remove comment 2018-02-10 19:56:05 -05:00
TehRealSalt
ed55d21682 Random picking animation 2018-02-10 19:02:15 -05:00
TehRealSalt
3db2ff37a2 One last thing: don't add whatever the game rolls for the random option 
Makes it even more of a wild-card option, also makes sure that you
actually *see* all of the maps before it empties
 2018-02-10 16:50:44 -05:00
TehRealSalt
a1be15134e Maybe fixed 2018-02-10 16:28:45 -05:00
TehRealSalt
e4b1bd3365 Minor fixes, mostly mobjscale and spectators 2018-02-10 16:19:22 -05:00
TehRealSalt
495ee25f18 Chaotix sound effects, new music names 2018-02-10 16:01:09 -05:00
TehRealSalt
eab1120950 New invincibility effect, grow/shrink stuff 
Whenever grow/shrink effects get made, I'll remove the Mario-style
stuttered growth and whatever else needs doing beyond that
 2018-02-10 01:19:33 -05:00
TehRealSalt
b83dd75a99 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 2018-02-09 21:16:10 -05:00
TehRealSalt
2a563d6f25 Faster 2018-02-09 21:14:14 -05:00
Monster Iestyn
02862511ae Fix SOC/Lua loading messages to display full names or even display at all (for PK3s at least), and otherwise some cleanup of existing code for the messages. 
Also, I moved lua_lumploading on/offing to LUA_LoadFile.
 2018-02-09 22:43:08 +00:00
TehRealSalt
c542e0453c Slight adjustment 2018-02-09 16:04:52 -05:00
Monster Iestyn
7243355923 Make sure both software and OpenGL ignore patches that are completely out of a multi-patch texture's bounds. 
This fixes OpenGL in particular crashing because of such a weird situation.
 2018-02-09 17:23:35 +00:00
TehRealSalt
74ccda156b Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-08 21:24:56 -05:00
TehRealSalt
184ec0340b Added axis support 2018-02-08 21:24:44 -05:00
Sryder13
864f55b57b Some warning fixes 2018-02-09 00:58:10 +00:00
TehRealSalt
80ba8792bd P != M 2018-02-08 18:14:56 -05:00
TehRealSalt
496eac9705 Minor adjustments in hopes that I fixed the resynch bomb on gametype switch? 2018-02-08 17:13:06 -05:00
Monster Iestyn
fb6c96de00 Merge branch 'stopleakingnames' into 'master' 
Stop leaking names via metadata.

See merge request STJr/SRB2!223
 2018-02-08 16:14:15 -05:00
Monster Iestyn
de8b6e2c96 Merge branch 'master' into hardcoding-time-again 2018-02-08 20:33:17 +00:00
Monster Iestyn
46704455bb Merge branch 'master' into file-loading-cleanup 2018-02-08 20:32:59 +00:00
Monster Iestyn
78d3ddcb34 Merge branch 'public_next' 2018-02-08 20:31:53 +00:00
Monster Iestyn
6f491daa94 Merge branch 'playdemo-custom-home-fix' into 'next' 
Fix for "playdemo" not working with custom home paths

See merge request STJr/SRB2!221
 2018-02-08 15:29:39 -05:00
Monster Iestyn
a550ff6692 Merge branch 'lua-archive-crash-hotfixes' into 'next' 
Hotfix for "LUA PANIC" crash when joining a netgame

See merge request STJr/SRB2!222
 2018-02-08 15:29:20 -05:00
Monster Iestyn
8a9bbb9a2b Merge branch 'general-sky-fixes' into 'master' 
General sky fixes

See merge request STJr/SRB2Internal!132
 2018-02-08 13:41:57 -05:00
Sryder13
2a8d91c79f The main explosion particles bounce off the floor too 2018-02-08 15:46:07 +00:00
TehRealSalt
a299222db7 Guess what. 
A typo. :V
 2018-02-08 00:53:25 -05:00
TehRealSalt
ef0770edda /me tears away a piece of drywall 
What's revealed is that democracy is actually made *entirely* out of
extremely minor 1 character long typos eating away at the structural
integrity of the building, and then the crack starts oozing green slime,
and then a creepy hand comes out and grabs you
 2018-02-08 00:45:59 -05:00
TehRealSalt
c32591e767 Minor fixes 2018-02-07 22:45:40 -05:00
TehRealSalt
782a5d7fd9 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-07 22:34:33 -05:00
TehRealSalt
acc4b0bb76 Belp 
- Minimap heads that aren't yours are transparent
- Minimap has a visibility slider
- Bomb stuff renamed to Mine
 2018-02-07 22:33:27 -05:00
Monster Iestyn
2692d6f9dc optimised R_ExpandPlane too 2018-02-07 18:11:32 +00:00
Monster Iestyn
5533c97c69 Fixed sky-sky thok barriers showing HOM (turns out the floor and ceiling share the same plane, so I've modified the code to account for this) 
Additionally, place some optimisations in both software and OpenGL; in particular one has been added for when all of back and front sector (floor and ceiling) is sky: since everything is "open" anyway, we can simply the usual checks involved.
 2018-02-07 17:46:01 +00:00