TehRealSalt
d07160bcba
Quick fix
2018-02-20 18:18:10 -05:00
Monster Iestyn
bef710aa8f
Make CON_Responder eat Ctrl+key combos that have no effect, instead of passing the key on to G_Responder
2018-02-20 17:06:03 +00:00
TehRealSalt
af10a43fc7
Minor but important fixes
2018-02-17 01:53:44 -05:00
Steel Titanium
6d663fefa7
Removed some redundant checks
2018-02-17 00:37:17 -05:00
Steel Titanium
8ba644679b
Don't init the sound system on dedicated servers
2018-02-17 00:01:42 -05:00
Alam Ed Arias
8722b369a3
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
Alam Arias
d23d0e0e5b
Merge pull request #231 from LJSonik/net-command-leak-fix
...
Fix net commands not always being freed
2018-02-14 10:28:32 -05:00
Louis-Antoine
64a108e24a
Don't allocate memory for net commands already executed, as it would cause them to be never freed
2018-02-14 15:09:52 +01:00
TehRealSalt
9c5a09d770
sonicitems porting, Part 2
...
BUT with more tweaks on top of that:
- matchesplayed can go up & unlock stuff regardless of modifiedgame
- votetime added to menu
- flame jets are fullbright (been meaning to do this for a while)
- screenshots are prefixed with kart instead of srb2 (ditto)
2018-02-13 18:13:27 -05:00
TehRealSalt
1a424ba756
Porting over some things from sonicitems
2018-02-13 16:48:09 -05:00
TehRealSalt
3be938d04a
Updated player arrows
2018-02-11 21:47:19 -05:00
TehRealSalt
ff1462898a
Fuck this weird tabbing
2018-02-11 12:50:42 -05:00
TehRealSalt
62b45ff4b0
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
...
# Conflicts:
# src/k_kart.c
(Also I added some extra music for voting, because I forgot I didn't
commit the merge :V)
2018-02-11 12:18:25 -05:00
TehRealSalt
c94df11be1
Merge remote-tracking branch 'refs/remotes/origin/democracy'
2018-02-10 20:00:20 -05:00
TehRealSalt
df600ba780
Remove comment
2018-02-10 19:56:05 -05:00
TehRealSalt
ed55d21682
Random picking animation
2018-02-10 19:02:15 -05:00
TehRealSalt
3db2ff37a2
One last thing: don't add whatever the game rolls for the random option
...
Makes it even more of a wild-card option, also makes sure that you
actually *see* all of the maps before it empties
2018-02-10 16:50:44 -05:00
TehRealSalt
a1be15134e
Maybe fixed
2018-02-10 16:28:45 -05:00
TehRealSalt
e4b1bd3365
Minor fixes, mostly mobjscale and spectators
2018-02-10 16:19:22 -05:00
TehRealSalt
495ee25f18
Chaotix sound effects, new music names
2018-02-10 16:01:09 -05:00
TehRealSalt
eab1120950
New invincibility effect, grow/shrink stuff
...
Whenever grow/shrink effects get made, I'll remove the Mario-style
stuttered growth and whatever else needs doing beyond that
2018-02-10 01:19:33 -05:00
TehRealSalt
b83dd75a99
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
2018-02-09 21:16:10 -05:00
TehRealSalt
2a563d6f25
Faster
2018-02-09 21:14:14 -05:00
TehRealSalt
c542e0453c
Slight adjustment
2018-02-09 16:04:52 -05:00
TehRealSalt
74ccda156b
Merge remote-tracking branch 'refs/remotes/origin/master' into democracy
2018-02-08 21:24:56 -05:00
TehRealSalt
184ec0340b
Added axis support
2018-02-08 21:24:44 -05:00
Sryder13
864f55b57b
Some warning fixes
2018-02-09 00:58:10 +00:00
TehRealSalt
80ba8792bd
P != M
2018-02-08 18:14:56 -05:00
TehRealSalt
496eac9705
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 17:13:06 -05:00
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
