incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8326 commits 1 branch 0 tags 204 MiB
Commit graph

173 commits

Author SHA1 Message Date
James R
c9e3281b99 Merge remote-tracking branch 'origin/master' into tinnitus 2020-09-25 01:57:08 -07:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
FlykeSpice
2424418390 Remove ESLOPE #ifdef(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
James R
aedc5ae7af Kill MIDI more >:) 2020-08-07 13:00:04 -07:00
Sally Coolatta
3d53adaa2b Sliding HUD 
- Split HUD stuff into k_hud.c/h
- V_SPLITSCREEN replaces the old function that sets V_SPLITSCREEN/V_HORZSCREEN flags system, and instead automatically moves it based on player number
- V_SLIDEIN makes HUD items slide in after the intro animation.
 2020-07-26 05:47:53 -04:00
Sal
f0ed1a58ce Merge branch 'demoman-tf2' into 'master' 
Additional local explosion effects.

See merge request KartKrew/Kart!263
 2020-05-23 21:29:38 -04:00
Latapostrophe
fc789790bb Create a quick P_StartQuake without epicenter/radius support and clean up the grand total of 4 earthquake uses in the code 2020-05-14 17:28:33 +02:00
Sally Coolatta
249fff87ad Merge branch 'new-cars-movie' into colorize-tweak 2020-05-12 22:46:46 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f5d931cc Skincolor code cleanup 
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
 2020-05-11 02:28:25 -04:00
Wolfy
1d1b1514b4 Remove stupid dumbfuck #ifdefs 
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
 2020-04-07 05:24:38 -05:00
Wolfy
8fabcc1228 Fix unterminated #ifdef 2020-04-07 04:25:11 -05:00
Wolfy
d96d86dc5d Merge remote-tracking branch 'remotes/digiku/public-musicplus-lua' into awful-mix 
Reimplements removed MusicPlus functions.

# Conflicts:
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_script.h
 2020-04-07 03:41:26 -05:00
Wolfy
ffc232f970 Revert the removal of S_MusicExists 2020-04-07 02:56:45 -05:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Latapostrophe
f98a74638f More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
Latapostrophe
1abe899060 Push race countdowns and functions to set them 2020-03-10 12:57:30 +01:00
James R
253ab49c07 Merge remote-tracking branch 'origin/master' into 22shadows 2020-03-05 21:36:58 -08:00
Sally Cochenour
30d391b6b2 FINISH removing the shadows... 2020-03-01 17:35:49 -05:00
Sally Cochenour
76e75d9756 Fix offroad collision 
Adds an option to P_MobjTouchingSectorSpecial to only use non-FOF sectors' special if you're touching their floor/ceiling.
 2020-03-01 14:36:13 -05:00
James
f9ea683312 P_PlayerTouchingSectorSpecial turned into P_MobjTouchingSectorSpecial 2019-10-22 08:45:38 -04:00
TehRealSalt
22796b7633 Merge master 2019-09-27 03:44:37 -04:00
TehRealSalt
47da526313 Use texture names instead of predesignated sky numbers 2019-09-18 19:29:28 -04:00
TehRealSalt
1ef09699d1 Functional gameplay 
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score

Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
 2019-09-15 20:19:48 -04:00
TehRealSalt
5c3cac52e6 Merge branch 'master' into rings 2019-05-12 15:28:15 -04:00
wolfy852
9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1 
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
 2019-05-12 03:40:02 -05:00
TehRealSalt
3d129ad4ca Merge branch 'v1' into rings 2019-05-06 23:54:20 -04:00
wolfy852
2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
 2019-05-06 22:40:12 -05:00
TehRealSalt
f48a08cd53 Merge v1 2019-05-06 21:23:29 -04:00
TehRealSalt
8f4d93995b Merge v1 2019-05-02 17:51:54 -04:00
TehRealSalt
833cf980b4 Finish this 
Now that I was told that the spinout slowdown bug was caused by this I was 100% convinced that we need to remove all of this bullshit ASAP
 2019-05-02 09:20:49 -04:00
TehRealSalt
ab7e747648 Fix warnings 
Remove entries from dehacked, remove P_DoJump, remove debug stuff
 2019-05-02 02:51:13 -04:00
TehRealSalt
f1f664e9b1 Merge v1 2019-05-02 01:36:19 -04:00
Steel Titanium
13bfbac72b Lua: fix K_PlayPowerGloatSound mistype 2019-04-06 21:59:58 -04:00
fickleheart
be458c1d05 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
 2019-03-19 22:17:25 -05:00
TehRealSalt
40093a9213 Merge branch 'master' into rings 2019-03-12 01:27:11 -04:00
wolfy852
82d93a95fd Remove P_CanRunOnWater 2019-03-11 00:28:30 -05:00
TehRealSalt
129268121d Added rings. 2019-03-07 17:11:31 -05:00
fickleheart
7c6226ee91 Try to keep the RNG seed in sync 2019-02-16 14:24:00 -06:00
Sal
809138e285 Merge branch 'expose-more-lua-stuff' into 'next' 
More Lua stuff + PlayerCmd hook

See merge request KartKrew/Kart-Public!28
 2019-01-26 13:19:41 -05:00
fickleheart
03f9459257 Merge remote-tracking branch 'remotes/internal/master' into movementchecks 
# Conflicts:
#	src/g_game.c
#	src/p_user.c
 2019-01-15 21:01:30 -06:00
Latapostrophe
62f1ac6ef6 Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook 2019-01-13 14:40:48 +01:00
TehRealSalt
66bb728363 Expose S_ShowMusicCredit to Lua 2019-01-09 21:17:24 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
mazmazz
5807384dbd Remove S_MusicExists lua 2019-01-02 06:26:18 -05:00
mazmazz
0724d042bc Add safe lua music functions 
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
 2019-01-02 04:58:03 -05:00
mazmazz
c60339bb84 Merge branch 'public-musicplus-core' into public-musicplus-lua 2019-01-02 04:25:30 -05:00
mazmazz
2326a58bc7 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
Latapostrophe
47a329807a Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01:00
Latapostrophe
09dbb6d631 Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages. 2018-12-22 12:34:17 +01:00