Commit graph

171 commits

Author SHA1 Message Date
Jaime Passos
398b320aec initial stuff 2019-09-08 18:27:35 -03:00
toaster
b745b4fe1b With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it):
* Port across the additional colour translation maps, including mobj-level support for "colorized" objects.
* Make Fangboss and both Metal Sonic objects greyscale if, on spawn, there is a player in the game who is not a spectator whose skin is that character.
* Allow bosses with MF_GRENADEBOUNCE to opt out of the MF2_FRET colour-flashing tomfoolery, and give this flag to Fang.
2019-06-18 17:55:57 +01:00
TehRealSalt
792b41c406 Merge branch 'v1' into master 2019-05-29 21:50:14 -04:00
Latapostrophe
1bcebaadfd Lua fixes + new drawOnMinimap function 2019-05-26 15:05:10 +02:00
Latapostrophe
142c6aacac Merge branch 'lua-battlefullscreen-expose' into v1-lua-stuff 2019-05-26 11:18:00 +02:00
TehRealSalt
da7e79ac83 Adjust file loading
Many files converted to pk3, and we now have a distinct IWAD
2019-05-12 20:58:26 -04:00
TehRealSalt
089be795a2 Huge splitscreen refactor
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
Latapostrophe
9a12967020 Expose battlefullscreen and battlecomebacktimer huds to lua 2019-02-17 23:39:00 +01:00
wolfy852
db280e64a1 New visuals for ping and fps display alike [REDO] 2019-02-15 21:08:08 -06:00
toaster
56f67c9db5 You will never have Lua consoleplayer.
(This is a quick, cheap hack to make splitscreen not almost impossible to support in major mods like Wipezones.)
2019-01-28 17:28:15 +00: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
mazmazz
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Monster Iestyn
d824e05a6f Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
c2941d6ea5 Item roulette fun-times
- Colorize items, Combi-Catcher style, while the roulette is still going. Nice Chaotix reference, and tells you when the game's just lagged.
- Items blink when you first get them! They blink white when you wait out the whole roulette, red when you mash, or rainbow for enhanced items! Blinking prevents items from being stolen too, so items can't be literally stolen before you even have a chance to see what it was.
- New item roulette sound for mashing
- Fix TC_ limits in Lua
2018-11-23 19:15:14 -05:00
Monster Iestyn
7989e9a482 Merge branch 'public_next'
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/g_game.h
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_hudlib.c
#	src/lua_libs.h
#	src/lua_maplib.c
#	src/lua_script.c
#	src/m_misc.h
#	src/p_mobj.c
#	src/s_sound.c
#	src/sdl12/mixer_sound.c
#	src/w_wad.c
2018-11-10 15:41:57 +00:00
toaster
f5bec0d2e5 Merge branch 'master' into 'lua-hudlib'
# Conflicts:
#   src/lua_hudlib.c
2018-11-07 16:57:11 -05:00
TehRealSalt
c7b0df8172 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
Latapostrophe
9fe01d90d8 Resolved merge conflict and renamed gamerankings to minirankings 2018-10-31 15:18:05 +01:00
Latapostrophe
c7b8836f90 I'm a genius and forgot to rename the stuff correctly 2018-10-30 23:10:56 +01:00
Latapostrophe
7c5ccd7019 Removed some useless stuff 2018-10-30 23:08:58 +01:00
Latapostrophe
24580087d0 got rid of the settop as well 2018-10-30 22:51:05 +01:00
Latapostrophe
5ef97a6ec8 remove gL check 2018-10-30 22:29:28 +01:00
Latapostrophe
6ca6c094db Small hud library additions 2018-10-30 19:40:59 +01:00
Latapostrophe
295bf081a7 A few additions to the hud library 2018-10-30 18:24:03 +01:00
SeventhSentinel
55b29504ae Fade-in intro
Also made flashing not-local, again.
2018-06-26 10:14:59 -04:00
toasterbabe
c959806e23 * M_Random function access to v! (so v.RandomFixed(), etc...)
* Remove deprecated P_Random() from Lua.
2018-03-20 15:00:27 +00:00
toasterbabe
07e47f6ccb * Allow for V_ flag control for hudinfo SOC/Lua stuff through hudinfo[n].f (for flags).
* Fix Old Special Stage offsets.
* Fix drowning number offsets.
* Remove useless "WS" macros.
2018-03-19 23:08:51 +00:00
toasterbabe
a1d12429e4 * Move the non-mapping drawFill out of the source code function and into the Lua interface.
* Add a drawFill fallback for COLORMAP too.
* Correct a few index mishaps.
2018-02-12 18:23:57 +00:00
toasterbabe
b0888c44bd * Total overhaul of V_DrawFadeScreen(color, strength!
- controllable strengths between 0-31 for COLORMAP lump like before
   - arbitrary colour indices in the palette via TRANSMAP lumps, with strengths 0-9
   - exposed to Lua as v.fadeScreen(color, strength)!
* Remove last vestiges of V_STATICPATCH.
2018-02-12 17:47:31 +00:00
Alam Ed Arias
0a7dc63093 Use playersprite_t 2018-01-04 14:49:26 -05:00
Alam Ed Arias
7b86c598fc Undo signed mess 2018-01-04 14:26:16 -05:00
Alam Ed Arias
af76943926 MSVC2015: fixup 2018-01-02 13:22:10 -05:00
TehRealSalt
349b27e0de Change splitscreen into UINT8, fix HUD slightly more 2017-12-18 20:59:04 -05:00
TehRealSalt
0393e24fa6 A lot lol
The importants:
- Fixed compiling
- Combined G_BuildTiccmd for all players, no more need for a function
for each
- You can actually start 3p/4p mode
2017-12-16 22:32:43 -05:00
yellowtd
519414b215 Merge branch 'master' into titlemap 2017-08-22 19:07:32 -04:00
Monster Iestyn
9703aa2864 Feed skin and sprite2 through P_GetSkinSprite2 to change sprite2 if necessary (if for instance the supplied sprite2 didn't actually exist) 2017-08-16 21:00:18 +01:00
Monster Iestyn
c9acc3cee4 Merge branch 'master' into lua-spritedefs 2017-08-16 20:13:26 +01:00
Monster Iestyn
4d740ff783 Change getSpritePatch and getSpritePatch to accept angles 1-8 instead of 0-7, and just decrement the numbers internally
0 now just defaults to front angle (1, or 0 internally), in case people thought it was a separate angle from 1-8 for some reason
2017-07-17 21:31:33 +01:00
Monster Iestyn
e485ac3a7e Add support for getting super sprites with v.getSprite2Patch
You can either add FF_SPR2SUPER directly to the sprite2 arg if it's a number, or you can use the new (optional) boolean arg between sprite2 and frame, where as you'd expect false = normal and true = super.
2017-07-09 16:33:43 +01:00
toasterbabe
ba4275c415 title screen hud hook 2017-05-13 22:38:06 +01:00
Monster Iestyn
d91471b053 check spr2names not sprnames, whoops 2017-05-13 21:43:04 +01:00
Monster Iestyn
c2f03c5953 Fix compiler errors 2017-05-13 21:28:44 +01:00
Monster Iestyn
ce1422a70b Starting work for v.getSpritePatch and v.getSprite2Patch, dunno if these work yet mind 2017-04-30 22:53:05 +01:00
Monster Iestyn
1462c638cb Added the "lua_lumploading" variable for restricting certain Lua functions to lump load time only 2017-04-25 21:45:53 +01:00
Monster Iestyn
6473953c8c Merge branch 'master' into lua-additions 2016-10-22 14:59:01 +01:00
Monster Iestyn
e1baf02b7a Lua now errors if negative scales are used with v.drawScaled 2016-10-18 22:07:20 +01:00
Monster Iestyn
2f85704d87 Merge branch 'master' into lua-additions 2016-09-30 20:14:53 +01:00
toasterbabe
3d9fe7c899 The ability to disable weapon rings, as heavily requested by Lat and Speedwagon for their high effort character .wads and selfishly also desired to make thokker less hacky. 2016-08-19 00:06:12 +01:00