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

16643 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sryder
11386e12ba Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum 
Should have easier merging and be less likely to break current effects.
 2020-10-26 11:18:53 +00:00
Sryder
a585d3c9d1 Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps" 
This reverts commit dc453fbbda.
 2020-10-26 11:07:17 +00:00
Sryder
69f32bfcaf Merge branch 'the-scary-22-merge' of git@git.do.srb2.org:KartKrew/Kart.git into additive-transmap 2020-10-25 23:19:38 +00:00
Sryder
dc453fbbda Fix various things that used NUMTRANSMAPS for the number of translucent trans maps 2020-10-25 23:19:20 +00:00
James R
2c35034960 Fix invincibility music not ending 2020-10-25 13:43:44 -07:00
Sal
00c83dfcf9 Merge branch 'loading-screen' into 'the-scary-22-merge' 
Loading bar for startup

See merge request KartKrew/Kart!322
 2020-10-25 13:53:28 -04:00
Sally Coolatta
79a319ec02 Add a "title screen" 2020-10-25 11:34:58 -04:00
Sally Coolatta
c93330bf20 Use enum for better maintainability & error checking 2020-10-25 11:34:15 -04:00
Sally Coolatta
3469ab12ba Add extra warning for CON_STARTUP_LOADSTEPS being incorrect 2020-10-25 10:48:32 -04:00
Sryder
488ad70da3 Merge branch 'the-scary-22-merge' of git@git.do.srb2.org:KartKrew/Kart.git into additive-transmap 2020-10-25 14:43:44 +00:00
Sally Coolatta
12f56d64a7 Adds a simple white loading bar at the bottom of startup, instead of covering the cool reference with text 
Mockup of what it looks like, since the window's invisble when you try to print-scr it: https://cdn.discordapp.com/attachments/275750804227489794/769931098636943391/unknown.png
 2020-10-25 10:35:24 -04:00
Sally Coolatta
f121ed210a Fix flashing tics 2020-10-25 09:57:51 -04:00
Sally Coolatta
afbbfc9b1f Fix cvars 
My wrist burns...
 2020-10-24 21:32:07 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
ddf466d61f Fix compile errors 2020-10-24 19:52:09 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
Sryder
b16a16027d Fix additive/subtractive walls not working when sectors have multiple lights in OpenGL 
This is a change that could have broken other areas so should be checked too for other areas
 2020-10-25 00:27:28 +01:00
Sally Coolatta
15cfafaeba Merge remote-tracking branch 'public/master' into the-scary-22-merge 2020-10-24 18:38:27 -04:00
Sally Coolatta
fda698a290 Merge master 2020-10-24 18:34:07 -04:00
Sryder
282932862c Fix the additive/subtractive floors not working in OpenGL. 2020-10-24 01:02:01 +01:00
Sryder
4029f5bd00 Fix dumb copy paste error that caused software to crash 2020-10-24 00:50:58 +01:00
James R
f21b2c66b5 Merge remote-tracking branch 'origin/master' into next 2020-10-23 14:57:13 -07:00
James R
bfa32cf2fc Merge branch 'reverse-offsetof-macro' into 'next' 
Turn the lua sector lines hack into a macro

See merge request STJr/SRB2!1187
 2020-10-23 16:44:29 -04:00
James R
239beed0ed Merge branch 'set-cvars' into 'next' 
Set cvars directly from Lua

See merge request STJr/SRB2!1205
 2020-10-23 16:42:42 -04:00
James R
cded5a9416 Merge branch 'cmake-multithreading' into 'master' 
Add multithreading option for CMake

See merge request STJr/SRB2!1204
 2020-10-23 16:42:32 -04:00
James R
e764043a81 Merge branch 'skip-unused-mobj-hooks' into 'next' 
Only invoke the Lua API for mobj hooks that need it

See merge request STJr/SRB2!1209
 2020-10-23 16:40:07 -04:00
James R
cf65d5eb00 Merge branch 'insert-wait' into 'next' 
Do not let previous wait commands affect COM_BufInsertText

See merge request STJr/SRB2!1207
 2020-10-23 16:38:46 -04:00
James R
dc2ecc5013 Merge branch 'fix-ghost-netvar-crash' into 'next' 
Fix G_GhostTicker crashing trying to read netvars as ghost data

See merge request STJr/SRB2!1203
 2020-10-23 16:37:49 -04:00
James R
b3ac8e336a Merge branch 'sw-npo2-span-opt' into 'next' 
NPO2 span function optimization

See merge request STJr/SRB2!1201
 2020-10-23 16:36:18 -04:00
LJ Sonic
e8b6f9db5e Merge branch 'catchup-timeout' into 'next' 
Kick clients that fail to catch up with server gamelogic

See merge request STJr/SRB2!1208
 2020-10-23 16:19:10 -04:00
Sryder
d311242a6e Support for additive/subtractive translation maps on FOFs and Polyobjects 
Polyobjects set translucency to 11 for additive, and 12 for subtractive
FOFs using the regular translucency settings set the top texture to #900 for additive, and #901 for subtractive
 2020-10-22 23:13:51 +01:00
Sryder
4a10861669 Additive/Subtractive translation map support on midtextures 2020-10-22 22:27:14 +01:00
Louis-Antoine
4313f248a5 Fix unfortunate typos 2020-10-22 00:08:06 +02:00
Louis-Antoine
eda92f3f2a Only invoke the Lua API for mobj hooks that need it 2020-10-21 22:48:00 +02:00
James R
eae76ee759 Reset wait period for COM_BufInsertText 2020-10-21 12:34:26 -07:00
Louis-Antoine
bd9a89c82a Kick clients that fail to catch up with server gamelogic 2020-10-21 20:25:29 +02:00
James R
f99cdc6b99 Add CV_Set, CV_SetValue, CV_StealthSet, CV_StealthSetValue and CV_AddValue to Lua 
CV_SetValue merged with CV_Set (same with CV_StealthSetValue and CV_StealthSet).
 2020-10-20 16:08:34 -07:00
GoldenTails
e7b3e2598d Add i_threads.h too 2020-10-20 15:58:34 -05:00
GoldenTails
0fb69e75e1 Add multithreading option for CMake 2020-10-20 15:44:01 -05:00
Steel Titanium
3f50b92ee2 Fix G_GhostTicker crashing trying to read netvars as ghost data 
Also fixed possible issue with incorrectly reading the demo pointer due to the wrong type being passed to sizeof in G_ConsGhostTic
 2020-10-19 20:20:08 -04:00
Sryder
b341cacb0a Subtractive translation map 2020-10-19 11:57:12 +01:00
James R
b84c45acaa Merge branch 'model-fallback' into 'next' 
Model fallback

See merge request STJr/SRB2!1167
 2020-10-18 16:52:42 -04:00
James R
e10e4d79c3 Merge branch 'bustflags' into 'next' 
Bustable Wall and Floor flags.

See merge request STJr/SRB2!1163
 2020-10-18 16:42:15 -04:00
Hannu Hanhi
45611033c3 Remove leftover commented code from previous commit 2020-10-18 23:04:01 +03:00
James R
f34a761d48 Merge branch 'perfstats' into 'next' 
Performance stats

See merge request STJr/SRB2!1186
 2020-10-18 15:33:20 -04:00
James R
a444304f55 Merge branch 'sw-findplane-opt' into 'next' 
R_FindPlane optimization

See merge request STJr/SRB2!1199
 2020-10-18 15:16:51 -04:00
Hannu Hanhi
cb40b2a7f2 NPO2 span function optimization 2020-10-18 21:27:22 +03:00
Sryder
5558fb073a Basic additive transmap/blend support 
Can currently be used on sprites only
added to flames by default because it makes sense
 2020-10-18 19:10:19 +01:00
Sal
08dc784c17 Merge branch 'the-big-step-up' into 'the-scary-22-merge' 
Fix steep slope jank

See merge request KartKrew/Kart!318
 2020-10-18 01:20:19 -04:00
Sal
bceffa9c2f Merge branch 'the-big-large-slope-physics' into 'the-scary-22-merge' 
The big large slope physics

See merge request KartKrew/Kart!320
 2020-10-18 01:16:24 -04:00