Commit graph

19764 commits

Author SHA1 Message Date
Sally Coolatta
d0482b4905 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart 2022-09-18 09:13:23 -04:00
Sally Coolatta
7aa29f80a9 /4 -> /3 2022-09-18 09:13:08 -04:00
Oni
473545d8eb Merge branch 'poh-bee-suited-up' into 'master'
Poh-Bee sprites + laser sound

See merge request KartKrew/Kart!685
2022-09-18 11:57:30 +00:00
Sally Coolatta
fe960530da Pohbee turns around when reaching the waypoint 2022-09-18 05:20:29 -04:00
Sally Coolatta
ab8126b706 Add Tyron's sound 2022-09-18 05:06:45 -04:00
Sally Coolatta
dc350a77df Remove old powerup warning option 2022-09-18 04:58:17 -04:00
Sally Coolatta
e610c41d0f Add Poh-Bee sprites 2022-09-18 04:33:03 -04:00
James R
4c89619ac4 Merge branch 'sdl-vsync' into 'master'
SDL: Support setting vsync at runtime

See merge request KartKrew/Kart!663
2022-09-17 07:28:55 +00:00
James R
6a6a0accee Merge remote-tracking branch 'origin/cvar-default-ports' 2022-09-17 00:18:10 -07:00
James R
3d2d8bce16 Merge branch 'spritestuff-ports' into 'master'
Spritestuff ports

See merge request KartKrew/Kart!669
2022-09-17 07:10:44 +00:00
James R
1cf1643233 Merge branch 'stability-fix-ports' into 'master'
Stability fix ports

See merge request KartKrew/Kart!670
2022-09-17 07:08:26 +00:00
Sally Coolatta
8f38555a86 fixme for james :) 2022-09-16 00:06:02 -04:00
Sal
6d79df0577 Merge branch 'm-for-mini' into 'master'
New Shrink

See merge request KartKrew/Kart!682
2022-09-16 04:03:09 +00:00
Sally Coolatta
01b1a9d3a7 Prevent poh-bees on no-respawn waypoints 2022-09-15 21:44:45 -04:00
Sally Coolatta
94c64519d4 Make grow/shrink particles closer to base scale 2022-09-15 21:44:08 -04:00
Sally Coolatta
cb2d2cb2ba Cleanup objects properly 2022-09-15 20:03:32 -04:00
Sally Coolatta
eda9e0cd9d Offset for shrink particles 2022-09-15 19:54:50 -04:00
Sally Coolatta
c80f46f7c7 Reduce code duplication 2022-09-15 19:52:35 -04:00
Sally Coolatta
04323fc39e Adjust Grow/Shrink camera with scale again 2022-09-15 03:19:57 -04:00
Sally Coolatta
3950a228c0 Lower shrink odds slightly 2022-09-15 02:51:53 -04:00
Sally Coolatta
b1f9dd8264 Line up the laser visual better 2022-09-15 02:42:16 -04:00
Sally Coolatta
dc44196c49 Bigger laser shimmer 2022-09-15 02:27:20 -04:00
Sally Coolatta
d6f5fc117f Merge branch 'master' into m-for-mini 2022-09-15 02:06:51 -04:00
James R
6af7df8d40 Fix -Wsign-compare 2022-09-14 23:02:55 -07:00
Sal
41593330a8 Merge branch 'fixeddiv-overflow' into 'master'
Fix #263

Closes #263

See merge request KartKrew/Kart!681
2022-09-15 05:54:37 +00:00
Sally Coolatta
e2e984ec14 More consistent chain length 2022-09-15 01:54:19 -04:00
James R
ef0ff01ef1 FixedDiv2: divide numerator before taking absolute value to avoid INT32_MIN overflow to 0 2022-09-14 22:38:12 -07:00
Sally Coolatta
71723a803d Implement pohbee chain
Crashes when drawing the sprites after looking at it for like half a second and idk why tf
2022-09-15 01:03:08 -04:00
Sally Coolatta
72948ad49d Make timer more obvious on grow particles 2022-09-14 23:50:48 -04:00
Sally Coolatta
cee2c25e27 Don't drop items from Shrink 2022-09-14 19:17:45 -04:00
Sally Coolatta
c65e5af718 Reduce grow add from lasers 2022-09-14 19:15:42 -04:00
Sally Coolatta
2b86a1ddfe Merge branch 'master' into m-for-mini 2022-09-14 19:09:31 -04:00
Sally Coolatta
81a4cb17c0 Only do it in netgames 2022-09-14 05:14:54 -04:00
Sally Coolatta
ed61140504 Funny mode fixes 2022-09-14 05:13:26 -04:00
Sally Coolatta
a4b63f3ffa Make shrink lasers add timer instead of resetting 2022-09-14 03:15:03 -04:00
Sally Coolatta
970add8b91 Add grow/shrink particles 2022-09-14 02:47:42 -04:00
Sally Coolatta
dd0635fb23 Merge branch 'master' into m-for-mini 2022-09-14 01:55:28 -04:00
Sal
062ac4ccf7 Merge branch 'hostcode' into 'master'
HOSTCODE initial pass

Closes #240

See merge request KartKrew/Kart!615
2022-09-14 01:25:29 +00:00
Sally Coolatta
ec29a978ae Funny 2022-09-13 21:23:04 -04:00
Sally Coolatta
2528ddcbb9 Fix sound order 2022-09-13 20:57:54 -04:00
VelocitOni
92cfb5a677 Just bringing it up to date w/ master
Got it to compile after some cleaning.
2022-09-13 19:17:39 -04:00
VelocitOni
8a5707ad83 Merge branch 'master' into hostcode 2022-09-13 17:08:15 -04:00
toaster
e89290f68d Merge branch 'asan-internal' into 'master'
ASAN fixes for Internal

See merge request KartKrew/Kart!678
2022-09-13 19:53:12 +00:00
X.organic
6dfd49a3b9 Fix use-after-frees around mobjs
# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c
#	src/p_saveg.c
#	src/p_tick.c
2022-09-12 17:00:33 +01:00
X.organic
902fcfa569 Miscellaneous memory bug fixes to make AddressSanitizer happy
# Conflicts:
#	src/d_clisrv.c
#	src/dehacked.c
#	src/hardware/hw_cache.c
#	src/hardware/hw_md2.c
#	src/http-mserv.c
#	src/lua_hudlib_drawlist.c
2022-09-12 16:49:18 +01:00
toaster
3064b2cb7a Fixes for the replay post-game save interface (NOT THE ACTUAL REPLAYS OR HUT, THAT'LL BE LATER)
- `(B) or (X)` for replay saving instead of Press Lookback (HUD) or `(Y)` (input)
- Don't activate while closing pause menu if either of those buttons is shared for menu open/close
2022-09-12 16:01:37 +01:00
toaster
fe0aa349a7 Fix compilation issue with nested defines for r_opengl.c UnSetShader 2022-09-12 12:58:39 +01:00
Sal
89d6506b44 Merge branch 'circuit-pathfind' into 'master'
Circuit pathfinding

See merge request KartKrew/Kart!673
2022-09-12 05:34:28 +00:00
Sal
a251b74e2e Merge branch 'ogl-bbox' into 'master'
renderhitbox for OpenGL

See merge request KartKrew/Kart!677
2022-09-12 05:32:45 +00:00
Sally Coolatta
07f2932d3a Set owner of particle 2022-09-12 00:18:35 -04:00