Commit graph

2830 commits

Author SHA1 Message Date
Monster Iestyn
fb6c96de00 Merge branch 'stopleakingnames' into 'master'
Stop leaking names via metadata.

See merge request STJr/SRB2!223
2018-02-08 16:14:15 -05:00
Monster Iestyn
6f491daa94 Merge branch 'playdemo-custom-home-fix' into 'next'
Fix for "playdemo" not working with custom home paths

See merge request STJr/SRB2!221
2018-02-08 15:29:39 -05:00
Monster Iestyn
a550ff6692 Merge branch 'lua-archive-crash-hotfixes' into 'next'
Hotfix for "LUA PANIC" crash when joining a netgame

See merge request STJr/SRB2!222
2018-02-08 15:29:20 -05:00
Sryder13
2a8d91c79f The main explosion particles bounce off the floor too 2018-02-08 15:46:07 +00:00
TehRealSalt
a299222db7 Guess what.
A typo. :V
2018-02-08 00:53:25 -05:00
TehRealSalt
ef0770edda /me tears away a piece of drywall
What's revealed is that democracy is actually made *entirely* out of
extremely minor 1 character long typos eating away at the structural
integrity of the building, and then the crack starts oozing green slime,
and then a creepy hand comes out and grabs you
2018-02-08 00:45:59 -05:00
TehRealSalt
c32591e767 Minor fixes 2018-02-07 22:45:40 -05:00
TehRealSalt
782a5d7fd9 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-07 22:34:33 -05:00
TehRealSalt
acc4b0bb76 Belp
- Minimap heads that aren't yours are transparent
- Minimap has a visibility slider
- Bomb stuff renamed to Mine
2018-02-07 22:33:27 -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
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
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
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
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
TehRealSalt
2141ac174d Spectating is properly implemented now
- Spectate button works
- Spectating & objectplace controls are usable now
- New spectator HUD
2018-01-22 22:18:57 -05:00