toaster
d9ad9fba8b
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
toaster
6bb2329800
SPR_VAPE on S_VVVAPING1
2018-10-24 21:48:09 +01:00
Latapostrophe
508862a158
Reaper will repeat chain sound + 1 small targetting bugfix
2018-10-24 22:28:44 +02:00
Sal
ec80cfc3d2
Merge branch 'new-spb' into 'master'
...
New SPB
See merge request KartKrew/Kart!56
2018-10-24 16:04:29 -04:00
Sal
b4033a3811
Merge branch 'battleoffline' into 'master'
...
Battle Offline
See merge request KartKrew/Kart!54
2018-10-24 16:01:58 -04:00
Sal
87d51cc491
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
5a6524fc93
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
Latapostrophe
2301cc322e
Reaper new anim + fast spawn for testing
2018-10-24 21:07:25 +02:00
TehRealSalt
5e41e6fb5b
Partially revert Jawz x2 changes
...
Several races in a row with several people getting x2 Jawz in the same spot... sorry Oni, it's BAD. Kept the increase in the further behind spot, we'll see if it's any better
2018-10-23 21:13:14 -04:00
TehRealSalt
5ebd3119da
Divide sound volume by number of local players
2018-10-23 20:53:05 -04:00
TehRealSalt
3c4b3342c5
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
4bb92418f6
Fix camera movement when turning
2018-10-23 19:43:20 -04:00
TehRealSalt
abb50683ff
reset these too
2018-10-23 19:08:13 -04:00
TehRealSalt
ad2efe658f
Reset cam pan if dead/reset/still
2018-10-23 19:06:26 -04:00
TehRealSalt
e11fe766ef
fzboom.wad hardcode
2018-10-23 17:48:09 -04:00
toaster
45616eb4bb
With the permission of Sev, SOC_SEV, SOC_SG, SOC_PEAC and SOC_DHST are now done.
2018-10-23 22:16:40 +01:00
toaster
83fcfc45c1
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
b461a69a04
Remove all of the DKRBALLOON stuff I added from SOC_PALM, as the object already existed as MT_DOOD_BALLOON.
2018-10-23 17:47:15 +01:00
Latapostrophe
fa03c99412
another few whitepsaces i forgot from copypasting...
2018-10-23 18:35:42 +02:00
Latapostrophe
7be547950a
I'm an idiot and COMPLETELY forgot about dehacked, also removed whitespaces
2018-10-23 18:31:34 +02:00
Latapostrophe
7e16795c64
Jack In The Box + Color Drive hardcode
2018-10-23 17:59:19 +02:00
toaster
5a11bdc580
SOC_XMAS (untested). Well, mostly. At least, all elements with sprites provided - there are two bushes that, weirdly enough, do not have their graphics provided in gfx.kart but ARE soc'd, and I feel like there's no point hardcoding that stuff..?
...
Also, I'm being cheeky and doing this in the middle of a lecture. :shitsfree:
2018-10-23 14:59:09 +01:00
TehRealSalt
988c0d07e3
Spread out SPB odds
2018-10-22 22:29:30 -04:00
TehRealSalt
a922a9b805
New item odds to accomedate new SPB behavior
2018-10-22 21:09:37 -04:00
toaster
c98d00a8f6
SOC_PALM (untested)
2018-10-22 23:28:38 +01:00
TehRealSalt
30e83ff305
Cam follows faster in 2P
2018-10-22 17:48:21 -04:00
toaster
3abcf552b0
D2 Balloon Panic, plus minor, minor touchup to Rusty Rig lamp's light positioning. (Sorry, Drt.)
2018-10-22 22:36:04 +01:00
TehRealSalt
14522752fe
Minor mistakes on my part
2018-10-22 17:24:58 -04:00
TehRealSalt
8e3f4d5a63
Fix Thunder Shield not killing SPBs
2018-10-22 17:08:34 -04:00
TehRealSalt
1171e5b3e0
Don't destroy all of your balloons in 3 tics
2018-10-22 17:05:44 -04:00
TehRealSalt
0c9295cf78
Remove restart audio system from the menu
...
Learned the cause of the seemingly random crashes it causes; doesn't seem easy to fix, so it can stay a relatively-unknown console command until it does
2018-10-22 17:03:02 -04:00
toaster
b3392d0e33
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
TehRealSalt
5a4045095d
Use COM_ImmedExecute("restartaudio") instead of duplicated code
2018-10-22 16:32:06 -04:00
TehRealSalt
a45f86c1fd
Keep specator join request on respawn
2018-10-22 16:26:24 -04:00
TehRealSalt
18864ac533
No more cheesing Shrink by dying
...
(If that was kept, we'd see it exploited all the time on release :V)
2018-10-22 16:22:41 -04:00
TehRealSalt
6832cd7195
Fix camera not noclipping FOFs
2018-10-22 16:16:57 -04:00
TehRealSalt
e3d40a3878
Modify distx/disty to ensure it never goes too low
2018-10-22 16:08:46 -04:00
TehRealSalt
5e2d3035e0
Falling rocks only collide with players and other rocks
2018-10-22 15:08:04 -04:00
TehRealSalt
c3d535ae90
Don't f12 time over'd players
2018-10-22 15:06:07 -04:00
toaster
11a3eb5122
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
toaster
752711479c
Initial commit, revert this before merging the branch: Make it so it uses a seperate copy of gfx.kart with the Lua lumps hardcoded taken out, for easier work without conflict.
2018-10-22 00:29:17 +01:00
Monster Iestyn
ea009ae304
missed this ESLOPE-needed area from a few commits ago apparently :V
2018-10-21 20:35:14 +01:00
Monster Iestyn
7fb41f4bfa
Fix editing slope xydirection with Lua
2018-10-21 18:25:13 +01:00
Monster Iestyn
1c9f6fa5a6
Fix up the ability to edit slope zdelta and zangle with Lua (zangle is untested as of writing)
2018-10-21 17:32:53 +01:00
Monster Iestyn
3895de5ab0
add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved
2018-10-21 16:27:54 +01:00
Monster Iestyn
d0db97974f
Merge branch 'next' into lua-slopes
2018-10-21 16:03:48 +01:00
Monster Iestyn
ccd5ee5127
Merge branch 'master' into next
2018-10-21 15:39:30 +01:00
Monster Iestyn
cf0c450536
Merge branch 'mapheader-lua-unarchive-hotfix' into 'master'
...
mapheader lua unarchive hotfix
See merge request STJr/SRB2!302
2018-10-21 10:37:17 -04:00
Monster Iestyn
d55b4ea3dd
Fix unarchiving of mapheader_t userdata Lua variables
2018-10-21 15:15:54 +01:00
Monster Iestyn
6e73d2d0bb
Add mobj.standingslope to Lua
2018-10-21 15:12:51 +01:00