Commit graph

17146 commits

Author SHA1 Message Date
Sally Coolatta
1665e72b99 Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-25 13:56:53 -04: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
48d8bb242a Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-25 09:58:25 -04:00
Sally Coolatta
f121ed210a Fix flashing tics 2020-10-25 09:57:51 -04:00
Sally Coolatta
449d1df014 Remove flashing tics increase in Battle 2020-10-24 21:46:23 -04:00
Sally Coolatta
5db7b337d9 Speed up sphere respawn 2020-10-24 21:45:35 -04:00
Sally Coolatta
2509d5a29c Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-24 21:39:32 -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
Sally Coolatta
5504cb8cee Don't show comeback timer & screen fade after you've been eliminated 2020-10-24 11:46:56 -04:00
Sally Coolatta
dc7fe0bd58 Fix overtime barrier not applying to bombs/flashing players 2020-10-24 11:33:07 -04:00
Sally Coolatta
c92871d317 Fix name tags showing for dead or invisible players 2020-10-24 11:28:02 -04:00
Sally Coolatta
0969ca1af9 Karma bombs rework
- Fixed the bugs with them in our last netgame
- Karma bombs are no longer slippery or have stat changes
- Karma bombs cannot pick up spheres. Their remaining spheres before they died are removed 1 per tic.
- Karma bombs are out of the game permanently when touching the overtime barrier
- When successfully hurting another player, instead of getting 0.5 bumpers, they steal ALL of the opponent's bumpers, effectively swapping places with them. One bumper is lost in the process, meaning bumpers are slowly flitered out the more people need to come back.
- Removed karma items/eggboxes... hopefully this is temporary and we can bring them back later, but currently we don't have a design for how they should work under the new rules :x. They are still in the code behind the `OTHERKARMAMODES` define
- Bumpers & comeback timer are now player_t variables instead of kartstuff shit
- eliminated boolean on player_t for checking when a player touched the barrier
2020-10-24 11:27:42 -04:00
Sally Coolatta
cc1268cdf3 Lost bit of the commit 2020-10-24 09:18:43 -04:00
Sally Coolatta
81a3a1c108 Steal bumpers from other players on any hit 2020-10-24 09:18:28 -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
Sally Coolatta
6c2884b7d6 Fix leftover from old code causing desync, part 2 2020-10-23 16:40:34 -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
Sally Coolatta
ffe4f4a400 Fix leftover from old code causing desync 2020-10-23 03:05:10 -04:00
Sally Coolatta
362c98e5d6 Add blue sphere meter 2020-10-23 02:42:04 -04:00
Sally Coolatta
69e4a1c59f Blue sphere jiggle physics 2020-10-22 22:15:07 -04:00
Sally Coolatta
f5788b34e6 Fix players not being able to turn in certain scenarios 2020-10-22 21:25:40 -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
Sally Coolatta
344acfece2 Make laser transparent before it's active 2020-10-22 17:51:18 -04:00
Sally Coolatta
9ad88cdfa9 Add center point mobj, polish the visual a bit more, reduce the speed that the barrier shrinks 2020-10-22 17:38:06 -04:00
Sryder
4a10861669 Additive/Subtractive translation map support on midtextures 2020-10-22 22:27:14 +01:00
Sally Coolatta
7430df5f4f Fix time limit, make overtime kill you instantly and close in faster, remove minimum radius
Radius SHOULD be doubled to 8192 to be reasonable... but something gets severely messed up, makes me MAD
2020-10-22 05:36:36 -04:00
Sally Coolatta
7ce53ac104 Add blue spheres
Doesn't have animations, and doesn't have stat-specific buffs. But it's already a massive improvement
2020-10-22 02:52:33 -04: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