Commit graph

308 commits

Author SHA1 Message Date
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
9bea44e5c1 Fix this garbage 2017-11-05 16:34:12 -05: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
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
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
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
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
e60b3e1b88 Move Player collision check into the regular collision checking 2017-11-01 18:40:32 +00:00
TehRealSalt
d3387f816b Battle Mode item respawning 2017-10-24 17:04:22 -04:00
TehRealSalt
b36fd5c5f9 Did you know: Battle Mode
- Different sizes for the balloons, depending on how many you have
- Balloons are fullbright, cast shadows, and stick closer to players
- Mega Mushrooms can now appear
- Can steal items with Boo in Battle Mode now, as intended
- Death pits make you lose only 1 balloon
- Balloons disappear properly if you use Boo
- Boo item icon should no longer appear if you're out of balloons
- You can now properly respawn in Battle Mode
- Can no longer collide with items if you are already holding one
2017-10-22 17:26:43 -04:00
TehRealSalt
94aedc1f78 Change color in menu, replay support for specific staff ghosts
Todo: replace the vague number with the demo's recorded player name
2017-10-20 22:01:07 -04:00
TehRealSalt
3994008d31 More score/rings cleanup, hide some hud elements, and most importantly: staff ghosts!
Would be nice to have an option to directly replay a specific staff
ghost, but this should be fine for now
2017-10-17 23:14:51 -04:00
TehRealSalt
e770f82ad7 Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back 2017-10-17 16:36:29 -04:00
TehRealSalt
5fe2f4928f Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
# Conflicts:
#	src/doomdef.h
#	src/sdl/i_main.c
#	src/sdl/i_video.c
#	src/y_inter.c
2017-10-17 15:53:34 -04:00
TehRealSalt
cce7b4374a Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back 2017-10-17 00:45:30 -04:00
TehRealSalt
9c0437bcd1 Thought I heard something about camera changing, it hasn't, so I decided to port work I did for internal
Basically:
1.) farther camera defaults
2.) different camera settings save
3.) cam_dist automatically increases with splitscreen (& analog mode,
but that's irrelevant for kart :p)

(IIRC someone said that this branch is fine to commit directly to,
please feel free to revert immediately if this isn't the case :V)
2017-10-16 23:52:13 -04:00
TehRealSalt
4ed0511013 Some cleanup
No longer save score/rings, use the Race tally as a placeholder
replacement for the butchered vanilla one
2017-10-16 20:23:26 -04:00
TehRealSalt
b5e0a80c35 Oho, here's the problem!
Too many fixed_t!
2017-10-16 17:52:42 -04:00
TehRealSalt
3e74ac2b97 Ghost scale fix 2017-10-16 07:11:48 -04:00
TehRealSalt
540bea911a First, minor steps to Record Attack support
To-Do:
- fix demo desync (desync is only super noticeable on slopes, but a
message pops up when the player starts moving regardless)
- fix ghosts not appearing
- replace that dumb level tally
- remove a bunch of things that made the assumption that race & record
attack would never mix (ex: "next map x doesn't support race mode, using
map y anyway" message)
2017-10-15 02:33:28 -04:00
ZTsukei
ba7580d8e2 = Nerfed Megas across the board.
- Rarer
 - Speed reduced from +25% to +20%
 - Getting squished doesn't last as long
= Nerfed the Banana Meta - or at least changed it
 - You don't wipeout for as long
 - You don't lose as much speed from wiping out (1/2 instead of 1/4)
= Respawning after death is faster
 - Lakitu drops you faster, only three floaty sounds instead of four
= Adjusted the camera to the values given by Sev
2017-10-13 15:44:17 -04:00
ZTsukei
b95f1d568a Updated item weights
Fix attempt for thrown items
2017-10-10 21:09:38 -04:00
Alam Ed Arias
ec125628ab Merge branch 'master' into next 2017-09-28 10:16:35 -04:00
Alam Ed Arias
55f377ba3d Build: kill GCC 7's format-overflow warnings 2017-09-28 09:13:46 -04:00
ZTsukei
a1f2f5b675 New level tag "ZONETITLE" can be set to replace the word "ZONE" in a level. "NOZONE" overrides it and forces no display at all. 2017-09-01 13:01:59 -04:00
ZTsukei
fd85c536ff v1.3.19
-------
Moved the Lakitu respawn code so that it isn't console-only.
2017-08-09 23:45:13 -04:00
ZTsukei
80990da828 v1.3.18
-------
Fixed really poorly done netcode stuff. This should fix the kartstuff desyncing, maybe collision stuff too?
Fixed Megashroom's growth animation lasting too long.
2017-08-09 18:14:20 -04:00
ZTsukei
8d19d18200 v1.3.17
-------
Lakitu returns from his ironically-not-pillowshaded-cloud grave
Dropboosting works on respawn
Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 12:06:29 -04:00
ZTsukei
3cdcaa6f2f G_PlayerReborn desync fix, maybe? 2017-06-26 21:41:05 -04:00
Monster Iestyn
da2f5fe0a2 Fix PlayerSpawn hook not being called if the player is respawned at a starpost 2017-06-20 16:18:51 +01:00
Monster Iestyn
ba6d011d7b Scale should be fixed_t not UINT16!
This is probably a leftover from how scaling worked in v2.0 I take it
2017-06-17 17:22:45 +01:00
ZTsukei
04432f7789 v1.3.10
-------
Accelcode now factors in forwardmove value rather than a boolean. This is used to enable clutching (or whatever you call it; accel+brake) to give its own result.
Fixed Thwomps killing players rather than crushing them.
Reverted buggy collision experiment from previous version.
2017-04-19 21:05:17 -04:00
ZTsukei
cfdb127630 v1.3.04 - The Bouncy One
--------
Hardcoded Collide.lua.
Added player boolean array "Collide", used by Collide.lua.
Walls are now bouncy by default again, like they were in 1.09.
Buffed Orange Drift sparks, the boost now lasts 60 frames up from 40.
2017-04-17 13:20:52 -04:00
Sryder
56153bbac0 Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value.
This reverts commit aff9a78d76.

# Conflicts:
#	src/d_player.h
#	src/g_game.c
#	src/k_kart.c
2017-04-16 19:01:32 +01:00
Sryder
1ac0f8c5a8 Fix really weird crash I should've checked for
Make the returning of top kart speed slightly cleaner
2017-03-10 03:24:15 +00:00
Sryder
6dc9339ab0 Get rid of Lakitu and the specific things for the final lap sound
Lakitu is completely commented out currently and we will be able to re-add it back later
Final lap sounds do some wacky stuff with the variables of the local player only, and also block out the music just to restart it at the same speed currently, changed it to just be the lap sound, we can use a new sound for it later
2017-03-08 21:41:52 +00:00
Sryder
c224929345 Fix player 2 using player 1 accelerate and brake controls 2017-03-07 23:23:35 +00:00
Sryder
42d541f6df Limit turning so mouselook doesn't let you turn too fast
Still could have the very slight advantage of letting you start your turns faster, but it's too cumbersome to really bother with
2017-03-07 18:30:37 +00:00
Sryder
0d16d6c1f4 Further drift fixes
Fix weird start drifting wrong way bug
Drifting no longer adds to regular turn speed
Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
Sryder
cac7171d48 Merge branch 'cleanupv2' into sonickart 2017-03-07 01:07:55 +00:00
Sryder
515054c599 Fix drifting
No longer does all the angle adjustments inside of the player thinker and instead does it with the controls
Should hopefully avoid any desynch from drifting
Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
Sryder
2807c45b03 Merge branch 'cleanupv2' into sonickart 2017-03-06 21:26:25 +00:00
Sryder
bdd03bc830 Remove driftfix and disable looking backwards
I believe editing the player data in G_BuildTiccmd will cause desync, especially for anything that would effect gameplay
driftfix didn't seem to do much, will find a way to re-enable looking backwards properly later (probably change one of the buttons, DRIFTLEFT or DRIFRRIGHT?)
2017-03-06 21:24:23 +00:00
Sryder
f00f74d69b remove checkpointtimes and k_playerahead
they are basically unused outside of timeattack and checkpointtimes isn't sent for netplay anyway
we can reimplement later with a more sensible solution for lap times in time attack
2017-03-06 21:02:36 +00:00
Sryder
aff9a78d76 Remove kart offroad variable and workings.
We can set a standard for friction sectors in maps and people can then do what they want with it.
Also caused problems with Ice and FOFs above friction sectors.
2017-03-06 02:38:35 +00:00
Sean Ryder
be3acfff0b Fix warnings
Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
ZTsukei
592c4482a9 Thwomps now squish the player - might need to reduce player height to 1 or something temporarily
Mushrooms rewritten to not use Instathrust, instead they jack up your accel to 10x. Feels nicer.
Floor mushroom panels no longer activate while above them
Mushrooms force player to accelerate (and cannot brake)
K_PlayTauntSound works now. (YES YES YES HUP HUP YES HUP HERE WE GO)
Star and Mega sfx might stop correctly now in netgames (need to test)
Item box radius and height increased from 32 to 36.
2017-03-02 17:59:38 -05:00
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
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
ZTsukei
66c6b6885f Updates done a while ago... Not 100% sure what they were. :x 2016-11-20 23:23:10 -05: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
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
ZTsukei
e4a970f894 Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
Inuyasha
f07585191b copyright dates/statements updated and such
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Monster Iestyn
300275534f Merge branch 'next' into demo-replay-fixes 2016-05-03 15:10:30 +01: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
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
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
Inuyasha
ac03ce39c8 *_Random is now *_RandomByte.
P_RandomChance is now a macro for something that should happen a
certain percentage of time.

P_SignedRandom was moved to a macro. Nobody cared.

# Conflicts:
#	src/p_inter.c
2016-03-29 16:27:55 -07:00
ZTsukei
242edbf86a Finished off g_game.c - Still some sketchy stuff I'm unsure of in there. 2016-03-20 21:22:54 -04:00
ZTsukei
aa31e9378b Stuff from a few weeks ago - Added button inputs for 'Kart (Untested). 2016-03-20 08:47:06 -04:00
Monster Iestyn
4302cfaa00 Merge branch 'playerspawn-hook' into 'next'
Add PlayerSpawn hook to Lua

I don't know how I did this but I did. Something about staring at code from 3AM till 5AM...

Here's a test script too:

```Lua
addHook("PlayerSpawn", function(player) player.health = 99 end)

```

See merge request !48
2016-03-04 10:19:18 -05:00
Inuyasha
a8bca89dbd Merge branch 'backport_unslot-music' into 'next'
BACKPORT: removal of music slots

Relevant commits cherry-picked. Basically everything except the internal music track name switches.

See merge request !43
2016-03-03 22:31:21 -05:00
Inuyasha
fc35c8557e Super color code cleaning, speed 50%, nothing special 2016-02-29 01:18:33 -08:00
ZTsukei
fbdb98c8b1 Menu toggles. Doesn't work yet. 2016-02-27 11:11:14 -05:00
wolfy852
8f0abb267e Don't mix declarations and code 2016-02-25 22:47:52 -06:00
wolfy852
5c9aaf2fe4 Move hook into G_SpawnPlayer 2016-02-25 22:28:19 -06:00
ZTsukei
ba18d968e5 Added vars to d_clisrv, renamed autoexec.cfg, added menu variables to d_netcmd.h, added powers to dehacked.c for LUA, and made sure things can actually compile correctly as-is (squished two errors). 2016-02-21 12:40:01 -05:00
ZTsukei
9d2e9e24c3 Fixing tabs 2016-02-15 20:39:08 -05:00
ZTsukei
69f9c10a99 16/02/15 Starting some setup 2016-02-15 11:08:54 -05:00
Inuyasha
1203b0aa73 Fix crash on game clear
(No, game, you can't allocate a map header for the credits, why were you doing that before and how did it not break anything??)

(cherry picked from commit e1f9a012297d5220dcdd9395265467621a170e32)
2016-02-09 02:48:34 -08:00
Inuyasha
8c17dac589 The concept of "music slots" doesn't exist anymore.
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.

(cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457)

# Conflicts:
#	src/p_user.c
2016-02-09 02:48:33 -08:00
Inuyasha
e49f531ba1 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-01-29 18:27:33 -08:00
Alam Ed Arias
0d327c7c16 kill logical-not-parentheses warning in g_game.c
g_game.c: In function 'G_CheckDemoStatus':
g_game.c:5588:22: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
   if (!modeattacking == ATTACKING_RECORD)
                      ^
2016-01-28 21:15:51 -05:00
Monster Iestyn
01ef2d3ca3 If this isn't an accidental copy+paste then I'd be very surprised 2016-01-14 16:41:19 +00:00
JTE
8d7b5941a8 Changed super colors to make them pulse instead of flash. Removed alt. supercolors from replay ghost stuff, because that's stupid. :/
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8999 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:43:11 -05:00
Matt Walsh
f3e6770e9a Well that shows you how much we care about the old special stages *or* race!
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8985 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 19:38:00 -05:00
Alam Ed Arias
73b3287b19 SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
Alam Ed Arias
404b5f666c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
Alam Ed Arias
c028c83235 SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
Alam Ed Arias
02a3b0776c SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
Alam Ed Arias
32de698f5e SRB2 2.1.6 release 2014-03-24 22:17:59 -04:00
Alam Ed Arias
15bd266cac SRB2 2.1.5 release 2014-03-23 12:00:29 -04:00
Alam Ed Arias
ed72bd8fa1 SRB2 2.1.4 release 2014-03-21 19:21:06 +00:00
Alam Ed Arias
2fed5d1270 SRB2 2.1.3 release 2014-03-18 13:56:54 -04:00
Alam Ed Arias
b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00