stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 21:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
4063 commits 60 branches 11 tags 94 MiB
Commit graph

461 commits

Author SHA1 Message Date
TehRealSalt
2f5e8ceee2 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-09 15:34:59 -05:00
toaster
b0246d6cba 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
TehRealSalt
6c5acd6e0d A few mobj_scale fixes I missed on signposts 2018-11-08 20:39:18 -05:00
TehRealSalt
499faec555 Merge remote-tracking branch 'srb2public/next' 
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
 2018-11-07 16:15:14 -05:00
TehRealSalt
d3944fe29b Battle arrow fixes and cleanup 2018-11-03 17:45:38 -04:00
TehRealSalt
5c1cc6e1df Merge branch 'master' into all_hardcode 2018-11-02 01:42:34 -04:00
TehRealSalt
e758e0f8fd Merge branch 'master' into resync 2018-11-01 20:39:50 -04:00
TehRealSalt
0c2a5cf9d3 Merge branch 'master' into more-fixes 2018-11-01 18:10:53 -04:00
TehRealSalt
7e103be393 Change default brake color from Yellow to White 2018-11-01 17:37:59 -04:00
TehRealSalt
6a31959381 Merge branch 'master' into brake-drift 2018-11-01 17:37:10 -04:00
TehRealSalt
7891a11fba Battle points are visible 2018-11-01 00:57:38 -04:00
TehRealSalt
ea4ca2eb1f Brake drfit effect 2018-10-31 21:35:17 -04:00
TehRealSalt
6da700629f Fix incorrect scale of player arrows in non-splitscreen 
whoops
 2018-10-31 04:55:00 -04:00
TehRealSalt
66a7adfc34 Push fakes away from other items 
Prevents stupid item stacking in Battle (you can still do it with bananas, but THOSE are removable, and don't have a similar sprite)
 2018-10-31 04:46:24 -04:00
TehRealSalt
cc5d248c90 Time over cam & signposts support mobjscale 2018-10-31 03:13:56 -04:00
toaster
52523fc4b4 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:37:06 +00:00
toaster
f1a6e1e6cd Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 
# Conflicts:
#	src/info.c
#	src/info.h
#	src/p_mobj.c
 2018-10-29 21:36:39 +00:00
TehRealSalt
14fcda0eca Make shadows more consistent on slopes for non-players 2018-10-29 05:21:47 -04:00
TehRealSalt
9f18164ad4 The motherload: all of my Lua is hardcoded 
This took like 6 straight hours of work, never ask me for anything ever again
 2018-10-29 05:00:08 -04:00
TehRealSalt
9630e01616 Camera crash fixes 
UNRELATED, but they made this branch a pain in the ass to test so I needed to fix this here :V
 2018-10-28 17:31:59 -04:00
TehRealSalt
f1f8f91aea Higher default scale, WANTED indicator scales properly 2018-10-27 20:56:11 -04:00
toaster
4595328e6d Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 2018-10-25 19:09:22 +01:00
Sal
7f2090aeae Merge branch 'karma-touchups' into 'master' 
Karma touchups

See merge request KartKrew/Kart!59
 2018-10-25 14:06:22 -04:00
toaster
19a6bd948c Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
#	src/p_enemy.c
#	src/p_mobj.c
 2018-10-25 10:46:18 +01:00
TehRealSalt
974f6d47e1 Fullbright explosion and fire 2018-10-24 21:25:22 -04:00
TehRealSalt
25414edb57 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
TehRealSalt
224408210c Extra safety 
The turn action happens on (k_timeovercam > 2*TICRATE). This ensures it happens immediately, although it was probably fine as is
 2018-10-24 21:18:15 -04:00
TehRealSalt
326955dd30 Turn cam on wall hit 2018-10-24 21:05:02 -04:00
TehRealSalt
0e4d5fd50e Merge branch 'master' into karma-touchups 2018-10-24 17:21:34 -04:00
TehRealSalt
3dba084fd9 Give karma items their own hitbox size 
Bombs & fakes get 24, items get 36. Technically a slight nerf to bomb, but it's more consistent and it's so tiny of a change that it'll be unnoticeable I feel :V
 2018-10-24 17:16:32 -04:00
toaster
3d2efc751f Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 
# Conflicts:
#	src/info.c
#	src/p_inter.c
 2018-10-24 22:15:08 +01:00
Sal
08791269be Merge branch 'new-spb' into 'master' 
New SPB

See merge request KartKrew/Kart!56
 2018-10-24 16:04:29 -04:00
Sal
2a375e0f1c Merge branch 'howdyalikethemcherries' into 'master' 
How'd'ya like them cherries

See merge request KartKrew/Kart!53
 2018-10-24 16:01:47 -04:00
Sal
d93a4106b6 Merge branch 'some_scaling_stuff' into 'master' 
Two scale things I noticed.

See merge request KartKrew/Kart!51
 2018-10-24 16:01:39 -04:00
TehRealSalt
9d7163675d Remove the local dontdraw 
Not only did I not implement this for everything, but I also REALLY like seeing other player's. If it's a problem, then let's just turn down the fuse and/or tics
 2018-10-23 19:45:35 -04:00
TehRealSalt
017d606828 fzboom.wad hardcode 2018-10-23 17:48:09 -04:00
toaster
75669a4b9b SOC_COAT and SOC_SMOK. 
To make the MT_PETSMOKER make vaping clouds for Volcanic Valley instead, apply MTF_OBJECTSPECIAL on the spawnpoint.

Since I had to compile, I ALSO discovered SOC_PALM's palmtree was already hardcoded as well!!!! Gosh dang inconsistencies...
 2018-10-23 20:44:54 +01:00
toaster
43bb6749fe D2 Balloon Panic, plus minor, minor touchup to Rusty Rig lamp's light positioning. (Sorry, Drt.) 2018-10-22 22:36:04 +01:00
toaster
ffa9289cc6 Rusty Rig plus minor touchups to what I did already (I haven't made a new exe this stuff is simple enough, and I'll test it when I do the balloon panic stuff) 2018-10-22 21:56:14 +01:00
toaster
dceab0ce70 Hardcoding start! toast's stuff specifically. 
* Marble Zone!
	* Torch decoration.
	* Incense burner decoration.
* CD Special Stage 1!
	* The UFO, now with improved death animation!
	* Turns out I duplicated sounds that already existed in sounds.kart. When we touch up the files later, yalls can remove both `DSFUFOx`'s from it.
 2018-10-22 00:34:47 +01:00
TehRealSalt
04212cc506 Karma SPB instead of confusing Mine gfx 2018-10-20 21:02:25 -04:00
toaster
e193353c08 There's no spike or moon, but there sure is fruit, and that fruit is slightly awkward in that it pops out of existence when it slows down! 
Instead, I've made it flicker out of existence on a second-long timer.

This is the *absolute* last in-game thing I'm doing before the original freeze deadline. Hardcoding and menu pokes are all that remain of my code development...
 2018-10-20 23:32:38 +01:00
mazmazz
a288b95458 Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
TehRealSalt
2021897972 Merge branch 'master' into new-spb 2018-10-19 17:45:06 -04:00
toaster
1f15d87b68 No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal) 2018-10-19 21:53:02 +01:00
TehRealSalt
553066b48b Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
Sal
9a818ae7fb Merge branch 'you_can_sometimes_have_too_many_rings' into 'master' 
You can sometimes have too many rings

See merge request KartKrew/Kart!47
 2018-10-19 15:50:37 -04:00
Sal
ab4bf563e0 Merge branch 'sweet-new-kicks' into 'master' 
Sweet new kicks

See merge request KartKrew/Kart!39
 2018-10-19 15:49:51 -04:00
TehRealSalt
7556cca505 Huge restructuring & more fine-tuned speed, following, & turn behavior 2018-10-18 19:51:36 -04:00
TehRealSalt
8d6e203bd2 New SPB 
May not make it to R1, but oh well
 2018-10-18 04:43:50 -04:00