Commit graph

25568 commits

Author SHA1 Message Date
Steel Titanium
361bd92b4a Smoother MD2 interpolation 2018-02-06 14:50:08 -05:00
TehRealSalt
d6d0a38a23 Merge remote-tracking branch 'refs/remotes/origin/flair' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/p_enemy.c
2018-02-05 21:08:01 -05:00
TehRealSalt
c1dab359e0 Forgotten 2018-02-05 20:23:09 -05:00
TehRealSalt
648c7e6af6 Colored boom
Not tested *yet*
2018-02-05 20:10:20 -05:00
TehRealSalt
fdf70ebbc5 Merge remote-tracking branch 'refs/remotes/origin/master' into flair 2018-02-05 19:56:49 -05:00
TehRealSalt
3e6761c3a1 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 2018-02-05 19:43:32 -05:00
TehRealSalt
48f7a894c1 Fix more conflicts that I forgot 2018-02-05 19:40:26 -05:00
Sryder13
ba07bb7a54 Fix the explosion smoke ring (and warning) 2018-02-06 00:23:10 +00:00
TehRealSalt
bfe58a819a Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/dehacked.c
#	src/hardware/hw_main.c
#	src/info.c
#	src/info.h
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_user.c
#	src/r_things.c
2018-02-05 19:08:49 -05:00
TehRealSalt
806dba97ae So much
- Renamed fucking everything
- Threw out all of the item code because it looks at me funny
2018-02-05 18:55:52 -05:00
Sryder13
b1b3cf52cc New bomb explosion effect 2018-02-05 22:53:31 +00:00
Sryder13
fb87601d52 Some explosion stuff
Sphere spawns at centre and quickly grows before stopping
While sphere grows players get flung up
Fix some issues with battle mode stuff stopping bobombs from working
2018-02-05 19:24:54 +00:00
Sryder13
ea384ce4a2 Draw Minimap at regular size
Also positioned the minimap completely at the side of the screen as they're 5% scaled anyway
2018-02-05 03:59:36 +00:00
Sryder13
64bebe246d Merge branch 'minimapfix' into flair 2018-02-05 03:28:09 +00:00
Sryder13
303ea2dbbc Pure white and pure black shouldn't change on star colormap 2018-02-05 02:53:55 +00:00
Sryder13
58a6d59a5c Star colour support for MD2s 2018-02-05 02:11:17 +00:00
Sryder13
fe89ce941b Star colormap is decided to be used per mobj with mobj->colorize
Star creates afterimages that are colorized and fullbright
Star makes the player fullbright
2018-02-05 00:00:36 +00:00
Sryder13
be079b2fe6 Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks
# Conflicts:
#	src/g_game.c
2018-02-04 20:39:53 +00:00
TehRealSalt
62192316ba Everything
Been a while since I synced :V
2018-02-03 23:47:47 -05:00
Monster Iestyn
17bedfbd87 Correct backwards skies for OpenGL too 2018-02-03 21:39:36 +00:00
Monster Iestyn
e95987f4ae Added proper support for upside-down thok barriers, in both renderers
Thankfully it was really just a copy+paste of the code I already tinkered with for the normal ceiling sky based thok barriers, but tweaked for floors instead
2018-02-03 19:48:18 +00:00
Monster Iestyn
7f7b459f69 Cleanup of the code I've tweaked for skies, added SLOPEPARAMS macro to R_StoreWallRange for use in getting seg end z positions 2018-02-03 18:30:49 +00:00
Monster Iestyn
c41b3a186a Pushing all my work to make OpenGL consistent with my changes to software's sky so far 2018-02-01 22:04:04 +00:00
toasterbabe
c444a460a3 cv_playername already has a valid default value of "Sonic". We do NOT need to expose things like this. 2018-01-30 22:48:53 +00:00
TehRealSalt
2a015a85b8 Setup vote is a XCMD now
But now the rest of voting can get desynced easily now... this is
increasingly getting more and more fucked.
2018-01-30 16:42:44 -05:00
toasterbabe
e03e97edc8 Stop leaking names. 2018-01-30 21:25:28 +00:00
TehRealSalt
921222ba95 welp 2018-01-29 21:39:13 -05:00
TehRealSalt
2d89e62822 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:44:41 -05:00
TehRealSalt
9cda1d8d7b Quick fix :V 2018-01-29 19:43:22 -05:00
TehRealSalt
b2db0f8750 Adjust for taller thinstring 2018-01-29 19:22:08 -05:00
TehRealSalt
912cf14781 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:20:23 -05:00
TehRealSalt
ffe8a9199f Merge remote-tracking branch 'refs/remotes/origin/menus-cvars-unlocks' 2018-01-29 19:17:25 -05:00
TehRealSalt
bd87988aba Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle 2018-01-29 19:15:25 -05:00
Monster Iestyn
d6427c4148 some cleanup of software's seg rendering code, moved Red's polyobject plane hack to R_StoreWallRange since it doesn't actually need to be done every column draw
(I suspect polyobject planes don't actually need the minx/maxx hacks anymore, but I haven't the time to test that tonight nor is this branch really suited for it anyway)
2018-01-29 22:05:04 +00:00
TehRealSalt
2c160df998 Minor adjustments for a taller thin font 2018-01-28 20:37:53 -05:00
TehRealSalt
2abc973517 Minor adjustin's to the unlock list 2018-01-28 20:05:18 -05:00
TehRealSalt
6399bd49e9 Double-check legitimacy on match completion 2018-01-28 19:57:38 -05:00
Monster Iestyn
26578a8952 More sky fixes for software:
* Thok barriers with slopes now render fine in software
* The solid "sky walls" between different-height thok barriers adjacent to each other are gone. Forever.
2018-01-28 22:08:58 +00:00
TehRealSalt
f2ae0cf418 Remove a really minor 1-tic discrepancy 2018-01-27 23:55:43 -05:00
TehRealSalt
0cfd432d56 Functional, ready for netgame! 2018-01-27 23:52:01 -05:00
TehRealSalt
fc88ae3860 Getting there.
Should *theoretically* be functional... if it didn't crash on vote end.
I'm like 90% sure I'm missing a patch unload somewhere...
2018-01-27 20:59:29 -05:00
Monster Iestyn
aabf2b096f Fix skies in software being displayed backwards
(I'll get round to OpenGL later)
2018-01-27 19:29:41 +00:00
Monster Iestyn
2a75523be9 Move sky plane-drawing code from R_DrawPlanes to a new function called by R_DrawSinglePlane
This potentially allows FOFs and polyobjects to display sky flats on them properly, unless skyboxes are involved in which case they'd fail either way

I also updated or added comments to some places of the sky drawing code and related where useful
2018-01-27 19:18:17 +00:00
TehRealSalt
1ed0202b1e Work so far
Crashes, but baseline's there
2018-01-27 01:17:08 -05:00
TehRealSalt
83fab0d1c9 Oops
Changed my mind about my prior decision to comment out crosshair
drawing, forgot to readd it when I fixed it :V
2018-01-24 17:00:22 -05:00
TehRealSalt
a907717f4f Spectator-only looking, fixed crosshairs 2018-01-24 16:53:20 -05:00
TehRealSalt
13477267e0 Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks
# Conflicts:
#	src/g_game.c
#	src/m_cheat.c
#	src/p_user.c
2018-01-24 16:24:36 -05:00
TehRealSalt
8198a798ae Merge remote-tracking branch 'refs/remotes/origin/stuff-we-need-but-not-stuff-we-deserve' 2018-01-24 02:47:27 -05:00
TehRealSalt
30c84057dd Restructured some ticcmd stuff, temporary keyboard defaults, commented out mouse options menu
No more weapon number buttons, button constants reordered, and BT_JUMP
renamed to BT_DRIFT, and removed a lot of commented out stuff or stuff
we didn't need. Spectator-only support for looking up/down soon.
Keyboard defaults are just what I use, plan on adjusting it further
after more feedback
2018-01-24 02:45:06 -05:00
toasterbabe
7266c7b3ec RIP smiles 2018-01-24 02:07:30 +00:00