Steel Titanium
55c86f3e15
Successful attempt at restarting the music
2017-11-08 14:48:05 -05:00
Monster Iestyn
7cb0138293
Change version number to 2.1.20
2017-11-08 15:06:42 +00:00
Steel
ba3ed30c5d
Merge branch 'master' into window_center_fix
2017-11-08 00:32:23 -05:00
Steel Titanium
c1405137ec
Extra tab space to make the compiler happy
2017-11-07 23:48:03 -05:00
TehRealSalt
890637c4ab
Expose some functions to Lua
2017-11-07 18:35:05 -05:00
Steel Titanium
4f8b91c770
Attempt to restart music
2017-11-07 16:26:45 -05:00
TehRealSalt
cacc9ee97f
Made Frantic Mode work in Battle Mode & provide more silly results
...
Also fixed flashing
2017-11-07 15:04:21 -05:00
TehRealSalt
01afd52ad0
Bounce pad sector type
...
Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 02:36:27 -05:00
TehRealSalt
7fcca8f2d1
Added feather
2017-11-07 00:57:42 -05:00
TehRealSalt
7eb9f56741
Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
...
# Conflicts:
# src/p_mobj.c
2017-11-06 17:44:32 -05:00
TehRealSalt
bd7e5bc313
HUD shenanigans
...
In battle because it messes with CHECK, and also I'm too lazy to switch
branches
2017-11-06 17:31:52 -05:00
Sryder13
8f532b48ef
Various held and thrown items tweaks
...
"Missile" items are spawned on the ground and should follow slopes when the player is on the ground
Forwards thrown items should work in reverse gravity
Dropped items are dropped slightly closer (depends on player and item radius) and have their position set correctly
Held items are held closer (depends on player and item radius)
2017-11-06 15:27:15 +00:00
TehRealSalt
7eb4a958f7
More adjustments
...
- Comeback timer gets higher the more you get hit
- Your ghost appears over the bomb
- Speed & accel is set to worst while a bomb
- CHECK range scales with kartcc
2017-11-05 23:18:58 -05:00
TehRealSalt
8756293906
Minor fixes
2017-11-05 20:41:54 -05:00
TehRealSalt
98afcbbd5a
Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
2017-11-05 16:45:31 -05:00
TehRealSalt
9bea44e5c1
Fix this garbage
2017-11-05 16:34:12 -05:00
Sryder13
3d11e2ae28
Increase minimum bounce
...
Don't run xy bouncing if objects are directly ontop of each other
Don't run xy bouncing if objects are moving away from each other
Move z bouncing to be done first so that returning from xy collision doesn't stop it
2017-11-05 21:33:22 +00:00
TehRealSalt
a0b8eff8f1
fuck OFF stepmove dick
2017-11-05 12:29:19 -05:00
Sryder13
351670513d
Give explosion particle mobjs the target of who spawned it (bomb thrower, blue lightning user)
...
So that explosion particles can trigger voice lines (and not crash) and add points for players in battle
Also don't play voice lines when you hit yourself
2017-11-05 17:15:19 +00:00
Sryder13
10818f254b
Minimum bounce speed
2017-11-05 16:46:26 +00:00
Sryder13
5054ce72e0
Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks
...
# Conflicts:
# src/d_player.h
# src/k_kart.h
# src/lua_playerlib.c
2017-11-05 14:51:52 +00:00
TehRealSalt
57b4d73ec2
Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
...
# Conflicts:
# src/k_kart.h
2017-11-05 02:19:05 -05:00
TehRealSalt
c0ed28e828
why didn't this merge before??
2017-11-05 02:17:13 -05:00
TehRealSalt
d3e888cc44
Merge remote-tracking branch 'refs/remotes/origin/master' into battle
...
# Conflicts:
# src/d_player.h
# src/k_kart.c
# src/k_kart.h
# src/lua_playerlib.c
2017-11-05 02:16:39 -05:00
TehRealSalt
7b01a6c46e
Less strict item respawn requirement
2017-11-05 01:49:31 -05:00
TehRealSalt
a9c1b3e747
Everything.
...
- Player arrows now show if a player is in the item roulette
- Boo has been improved, and added back to Battle's item roulette
- The CHECK HUD item is now more accurate, and should appear more often
- Early comeback mechanic. Functional, but really unpolished
- Attempted (again) to make the first player to join in a netgame spawn
with balloons
- No longer shows respawn text on death
2017-11-05 01:43:47 -05:00
Sryder13
bb35f222c9
1 tid duration on drifting too
2017-11-04 21:58:21 +00:00
Sryder13
51af54d0ff
Voices for when you hit someone else
...
Not totally sure on them, but it's worth a try, would make it more obvious when you hit someone with a trap item in battle anyway
2017-11-04 20:42:01 +00:00
Sryder13
33beff0d5f
Slow and Fast states use 1 tic duration animation
...
Disable adjusting of frame speed (can be re-enabled through MAINCFG if people want it for whatever reason)
2017-11-04 17:49:14 +00:00
Sryder13
c9ddb7a4b5
Re-add lost player vibration frames
...
Separate sprites for fast moving frames
Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
Sryder13
81a077b9af
New player frameangle used instead of mobj angle for players
...
Set to mobj angle except when spinning where it's set to spin
Only 1 spin frame needed now
2017-11-04 14:07:53 +00:00
Sryder13
28ec48c02c
Make the bump and item throw graphics fullbright.
2017-11-04 13:33:38 +00:00
Sryder13
8315ccd475
Change player collision again, they bounce away from each other naturally
...
Need to meddle and test with a "minimum bounce" still
2017-11-04 13:19:06 +00:00
Louis-Antoine
67aba2648c
Fix download freezes (well, most of them)
2017-11-03 22:58:47 +01:00
Alam Ed Arias
7f4424b4a0
whitespace cleanup
2017-11-02 23:13:34 -04:00
Alam Ed Arias
3e3065f67c
Move FindFolder
2017-11-02 23:09:52 -04:00
TehRealSalt
1dcdaf0c44
I actually didn't do any of this right!! Whoops!!
...
Also made red shells dumb in battle mode
2017-11-02 21:40:06 -04:00
TehRealSalt
2cbef008c8
Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
...
# Conflicts:
# src/k_kart.c
2017-11-02 21:03:14 -04:00
Sryder13
e5a32eb699
New collision mechanics, player's transfer their speed along movement when they collide, then bounce off at a set speed away depending on weight from each other
2017-11-03 00:43:51 +00:00
TehRealSalt
9a822fae80
Balloon stealing! Mushroom is back!
2017-11-02 20:43:03 -04:00
toasterbabe
c89b1ec234
Always allow the first singleplayer level in the MP level platter.
2017-11-02 21:20:55 +00:00
toaster
7d15afe6fb
Merge branch 'md2_interpfix' into 'master'
...
(re-)fix MD2 interpoleration.
See merge request STJr/SRB2Internal!128
2017-11-02 16:47:24 -04:00
toaster
82a868ec8f
Merge branch 'lua-sector-find-funcs' into 'master'
...
Lua sector find funcs
See merge request STJr/SRB2Internal!127
2017-11-02 16:46:16 -04:00
toaster
b302607c2e
Merge branch 'nights_colours_again' into 'master'
...
More NiGHTS tweaks
See merge request STJr/SRB2Internal!125
2017-11-02 16:45:09 -04:00
toaster
29c3ff1c0e
Merge branch 'demo_shit' into 'master'
...
Demo shit
See merge request STJr/SRB2Internal!123
2017-11-02 16:44:13 -04:00
toaster
c84d4261d1
Merge branch 'unca_scrooge' into 'master'
...
The hardcoded part of ACZ3 so far
See merge request STJr/SRB2Internal!124
2017-11-02 16:43:11 -04:00
toasterbabe
2a42291b30
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit
...
# Conflicts:
# src/d_netcmd.c
2017-11-02 20:39:07 +00:00
toaster
49a1266ccc
Merge branch 'sal-misc-stuff' into 'master'
...
Sal misc stuff (state overwriting, gamepad tweaks)
See merge request STJr/SRB2Internal!116
2017-11-02 16:35:12 -04:00
toaster
605e51f6f3
Merge branch 'more_about_menus' into 'master'
...
More about menus
Closes #72
See merge request STJr/SRB2Internal!122
2017-11-02 16:31:51 -04:00
toaster
927e74e406
Merge branch 'FileManagement' into 'master'
...
File management - PK3 support.
See merge request STJr/SRB2Internal!121
2017-11-02 16:27:54 -04:00
