Commit graph

3645 commits

Author SHA1 Message Date
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
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
Monster Iestyn
d5ea9a1242 Added support for pslope_t userdata variables in Lua archive/unarchive code 2018-10-21 15:00:07 +01:00
Latapostrophe
532b2a26ec Console color default changed to Black + resolved mergeconflict hopefully 2018-10-21 14:58:50 +02:00
Latapostrophe
c578617220 Merge branch 'chat-changes' of git.magicalgirl.moe:KartKrew/Kart into chat-changes 2018-10-21 14:53:22 +02:00
Latapostrophe
84b513a952 Console background color default changed to Black + Resolved merge conflict (hopefully) 2018-10-21 14:51:34 +02:00
toaster
9ad5b9da80 Merge branch 'master' into 'chat-changes'
# Conflicts:
#   src/hu_stuff.c
2018-10-21 08:27:28 -04:00
Latapostrophe
83a51f3b3d More messages in chatbox + new console backcolours 2018-10-21 14:09:25 +02:00
toaster
5a3f515fcc Fix gametype being clobbered when starting up a one-player server by marking it as netgame.
(There were other ways to fix this, but I figured we'd want to keep the netgame pause menu, so this was the simplest solution...)
2018-10-21 12:51:18 +01:00
Latapostrophe
521234b411 ReaperThinker: Changed the conditions in the th iterations and moved that i=0 at the start of the loop. 2018-10-21 10:05:05 +02:00
TehRealSalt
d189fdf1c6 Karma SPB instead of confusing Mine gfx 2018-10-20 21:02:25 -04:00
Monster Iestyn
2ccf0967c9 zangle should be shifted down by ANGLETOFINESHIFT if we're to use FINETANGENT on it 2018-10-20 23:36:06 +01:00
toaster
c51edfa1d5 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
Monster Iestyn
685c8312cb Add P_GetZAt to Lua 2018-10-20 21:08:59 +01:00
Latapostrophe
7bf766eb25 Mementos hardcode 2018-10-20 21:17:13 +02:00
TehRealSalt
4e4a8debda Finish visuals
Sprites, animation, & speed lines
2018-10-20 14:41:49 -04:00
Monster Iestyn
f7c97ba0bb add vector2 and vector3 userdata types to simplify getting a slope's o/d/normal 2018-10-20 19:00:37 +01:00
Monster Iestyn
7729abe5b9 Merge branch 'next' into lua-slopes
# Conflicts:
#	src/lua_maplib.c
2018-10-20 18:31:06 +01:00
Latapostrophe
1a31fa726c Midnight Channel hardcode 2018-10-20 16:10:40 +02:00
Monster Iestyn
a44b368ee0 Merge branch 'master' into next 2018-10-20 14:13:13 +01:00
mazmazz
82e60f806e Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup 2018-10-19 23:56:56 -04:00
mazmazz
bf93dace76 Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
TehRealSalt
71452edda2 Merge branch 'master' into new-spb 2018-10-19 17:45:06 -04:00
Monster Iestyn
55a3e4c81f Merge branch 'endgame-code-refactor-backport' into 'next'
Endgame code refactor

See merge request STJr/SRB2!297
2018-10-19 17:31:19 -04:00
toaster
df4e12ac15 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
toaster
285ae41a6e Two scale things I noticed.
* Change spacing of bustable FOF debris with scale (plus increase its default a bit for less lag).
* Make a few instances of scalespeed take mapheader scaling into account.
2018-10-19 21:32:29 +01:00
TehRealSalt
d93f09ccf4 Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
Sal
d0042f481f Merge branch 'specs_of_dust' into 'master'
Specs of dust

See merge request KartKrew/Kart!50
2018-10-19 15:50:58 -04:00
Sal
faad66969a Merge branch 'thundertweak' into 'master'
Thundertweak

See merge request KartKrew/Kart!49
2018-10-19 15:50:47 -04:00
Sal
79ba8f0dc1 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
d2e8a71ff8 Merge branch 'democam' into 'master'
If I were a bad Democam, I wouldn't be sittin' here discussin' it with ya now would I?!

See merge request KartKrew/Kart!48
2018-10-19 15:50:28 -04:00
Sal
de1d9770b9 Merge branch 'no-spectate-griefing' into 'master'
Prevent spectate griefing

See merge request KartKrew/Kart!43
2018-10-19 15:50:18 -04:00
Sal
46400a08ef Merge branch 'sp_fixes' into 'master'
Singleplayer fixes (no, not record attack, the *other* one)

See merge request KartKrew/Kart!46
2018-10-19 15:50:06 -04:00