ZTsukei
5d0b9ef551
Friction updated. Added KARTSTUFF to lua. Added ->kartstuff to network syncing stuff (surprised it even worked before now???), also maybe items correctly reset at the end of level now.
2017-02-27 17:55:26 -05:00
ZTsukei
f50ecc0dcd
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 17:38:24 -05:00
ZTsukei
98137822b8
Fake Items working - Still a weird bug where the item won't throw if you're turning.
2017-02-26 10:19:33 -05:00
ZTsukei
d9944e9c41
Steering fixes, drifting changed, weight has effect now
2017-02-23 20:37:16 -05:00
Monster Iestyn
6f2f244aef
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2017-02-22 21:07:29 +00:00
ZTsukei
66a206cc55
Driftboosting now increases player accleration
...
Consolidated the turning and drifting values to k_kart functions for easier editing
Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-21 23:42:21 -05:00
ZTsukei
493436dc1a
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 15:54:23 -05:00
ZTsukei
7b7a6e5458
Added fancypants mega shroom, fixed drift boosting
2017-02-19 12:19:02 -05:00
Sryder
35b789d330
Fix random duplicate code from merge in hw_main.c and r_segs.c
...
Whitespace cleanup
2017-02-18 00:25:16 +00:00
Sryder
68d439a783
Merge branch 'upstream/next' into zarrotsu_vanillamerge
...
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
ZTsukei
580f909c6c
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 17:19:58 -05:00
Monster Iestyn
f9b41898a9
Don't allow skipping stats in record attack/nights attack
2017-02-05 22:04:29 +00:00
toasterbabe
d670189c89
* Fixed the Mode Attack cv_nextmap issue Salt found.
...
* Improved the defaulting system to work cross-gametype.
* Cleaned up the code. Less hacks!
2017-02-05 21:20:32 +00:00
toasterbabe
05ebc93f6c
After discussion with Mystic and Rob, you now keep your lives, score and emerald count when changing maps in Co-op mode. Reset when you declare -force.
2017-02-01 21:31:35 +00:00
toasterbabe
38c7436565
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into charabilities_mk3
...
# Conflicts:
# src/d_clisrv.c
2017-01-09 11:10:47 +00:00
toasterbabe
3f92a2305a
* Modified MT_SEED to have aesthetically nicer behaviour.
...
* Removed Soniccd command, as flicky selection involves a P_RandomKey call - this messes with replays and demos.
2017-01-01 21:54:30 +00:00
toasterbabe
877065250e
Some NiGHTS change oversights I forgot to correct before.
2016-12-25 19:56:33 +00:00
ZTsukei
66c6b6885f
Updates done a while ago... Not 100% sure what they were. :x
2016-11-20 23:23:10 -05:00
Monster Iestyn
0fb89c620d
Merge branch 'master' into damage-control
2016-09-30 21:05:44 +01:00
Monster Iestyn
20555c8887
Merge branch 'public_next'
2016-09-30 16:07:26 +01:00
toasterbabe
be0e898bae
* Skin-controlled radius is no longer set each tic, only on skin change and player spawn.
...
* Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin.
* P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions.
* Extra protection against switching to a locked skin.
2016-09-25 18:21:52 +01:00
toasterbabe
dcb82c292a
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into s_skinprovements
2016-09-12 19:23:44 +01:00
ilag11111
3b503f1336
Use function va to avoid having to delcare a new variable. Thanks MonsterIestyn.
2016-09-11 14:59:24 -07:00
ilag11111
4abfe1e8f3
Fix MinGW/AppVeyor build.
2016-09-11 10:57:14 -07:00
ilag11111
2798bd5c16
Ensure demo files will save to srb2home, where SRB2 already looks for them.
2016-09-11 10:40:49 -07:00
Monster Iestyn
31b9e762e1
Merge branch 'public_next'
...
# Conflicts:
# src/p_mobj.c
2016-09-05 21:28:43 +01:00
ZTsukei
da7a513c9a
Some drift code, some control code
2016-08-21 17:55:37 -04:00
ZTsukei
3a3180ce05
Redid control names, some item code, start of drift shenanigans
2016-08-20 22:15:11 -04:00
Inuyasha
44df9358dd
If the game becomes modified during a record attack run, end it
...
RA menu can be opened if the game is modified, but Start can't be selected. (Obvious reason: so scripts to display info can be used easier)
Fixed the stupid background for messages in the Record Attack menu, it was bugging me
2016-08-19 22:18:43 -07:00
ZTsukei
d631d0ef04
S_PLAY states, HUD stuff
2016-08-14 23:51:25 -04:00
ZTsukei
4112d44529
Some Color code, Kart powers
2016-08-11 21:42:16 -04:00
toasterbabe
810e1ec041
SUPERCOLOR BONANZA COMMIT.
...
* Several new supercolours.
- SKINCOLOR_SUPERSILVER1-5 (for fun) - "Silver"
- SKINCOLOR_SUPERPERIDOT1-5 (nyeheheh) - "Peridot"
- SKINCOLOR_SUPERCYAN1-5 (for fun) - "Cyan"
- SKINCOLOR_SUPERPURPLE1-5 (for fun) - "Purple"
- SKINCOLOR_SUPERRUST1-5 (mecha/metal sonic) - "Rust"
- SKINCOLOR_SUPERTAN1-5 (shadow/silver the hedgehog) - "Tan"
* SKINCOLOR_SUPER1-5 renamed to SKINCOLOR_SUPERGOLD1-5, one index for darkest is changed - "Gold"
* SKINCOLOR_TSUPER1-5 renamed to SKINCOLOR_SUPERORANGE1-5, ported properly to the new palette - "Orange"
* SKINCOLOR_KSUPER1-5 renamed to SKINCOLOR_SUPERRED1-5, ported properly to the new palette - "Red"
* new S_SKIN attribute - supercolor - uses an entirely different function to get the names (R_GetSuperColorByName instead of R_GetColorByName)
* a fun little secret - typing "god on" in the console whilst super makes the player hyper (visual only, no sparkles - just rainbow flash) - can be removed if no fun is allowed
2016-08-10 19:48:20 +01:00
toasterbabe
bc7389327a
Mario invincibility colours now span solely the saturated colours (no white to black, no peach, no brown)
2016-08-09 13:59:31 +01:00
ZTsukei
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
Monster Iestyn
9007904a72
Merge branch 'master' into damage-control
...
# Conflicts:
# src/p_inter.c
# src/p_mobj.c
2016-05-25 15:33:09 +01:00
Alam Ed Arias
032313260a
Merge branch 'public_next' into master
2016-05-20 17:58:57 -04:00
Inuyasha
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Alam Ed Arias
398dbed4ed
Merge branch 'public_next' into master
2016-05-07 11:35:05 -04:00
Monster Iestyn
300275534f
Merge branch 'next' into demo-replay-fixes
2016-05-03 15:10:30 +01:00
Alam Ed Arias
fbd9cb73c3
Merge branch 'public_next' into private
2016-04-27 16:54:37 -04:00
ZTsukei
84cbc2ce43
Porting rough p_inter.c (and a reference from g_game.c)
2016-04-24 15:28:24 -04:00
Monster Iestyn
60ec0ff294
Merge branch 'next' into demo-replay-fixes
2016-04-20 18:15:36 +01:00
Alam Ed Arias
b9eed02123
whitespace clean
2016-04-07 16:34:36 -04:00
Monster Iestyn
249d25a316
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into damage-control
2016-04-07 20:47:12 +01:00
Monster Iestyn
e8a4d7b7b8
Fix replay camera not being turnable when climbing, sliding ...and several other things.
...
If in analog mode, this does not apply (also analog mode replay camera no longer borks)
2016-04-05 20:56:48 +01:00
Inuyasha
50d3fe15b8
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
...
# Conflicts:
# src/d_main.c
# src/doomdef.h
2016-03-31 21:17:29 -07:00
Alam Ed Arias
d77e541f29
Merge branch 'next' into bp_random2
2016-03-31 12:15:09 -04:00
Inuyasha
3812b6bc20
the abs() is necessary; force unsigned shift and signed result
2016-03-31 06:48:08 -07:00
Alam Ed Arias
a935ac21e8
Merge branch 'next' into bp_random2
2016-03-30 20:40:48 -04:00
Alam Ed Arias
75f65c4d44
using abs() on unsigned have no effect
2016-03-30 20:17:09 -04:00