Commit Graph

150 Commits

Author SHA1 Message Date
Monster Iestyn 1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt ad79b4b83b Add S_StopSoundByID to Lua
It was brought up to me in another server that character creators might want to have unique engine sounds. While I don't want to support that ourselves, as we have consistent engines for gameplay reasons, this gives people the ability to script around it if they so choose.

Plus, it's just generally useful and I'm surprised vanilla hasn't added it, even though they have the function to stop ALL sounds on an object.
2018-11-14 15:35:16 -05:00
TehRealSalt 1e4d196e5e Merge remote-tracking branch 'srb2public/next' 2018-11-08 17:37:05 -05:00
TehRealSalt 0feb1d557d Foolish typo 2018-11-08 16:04:26 -05:00
TehRealSalt df3c6051e8 Make K_FindJawzTarget and K_GetKartDriftSparkValue HUD safe 2018-11-08 15:11:22 -05:00
TehRealSalt 03bf72bf9e This fake Lua function is probably no longer needed, now. 2018-11-08 15:02:19 -05:00
TehRealSalt f5a45534fa Make the texture stuff completely integer-based again, but expose R_TextureNumForName
Decided that being able to set a string and then have it return an integer when retrieving would ultimately be confusing, so let's just let the user handle the string functions.
2018-11-08 14:58:31 -05:00
TehRealSalt aa3ad733af Textures' string bits are now optional.
I thought about just exposing R_TextureNumForName and leaving it to the user, since that makes it obvious that this is still an integer field, but I also liked being able to just specify a string and be done with it. I'm not picky either way.
2018-11-07 22:01:57 -05:00
TehRealSalt bc7e865e6b Serious deep-cleaning to most of the kartstuff
More optional fields, more careful eye placed on return values and other checks
2018-11-07 21:04:57 -05:00
TehRealSalt b9161871a1 typo 2018-11-07 18:24:44 -05:00
TehRealSalt 7ad0347ab0 Add missing K_ functions 2018-11-07 18:23:28 -05:00
TehRealSalt 868118d0cd IsPlayerAdmin support, since admin was removed 2018-11-07 18:07:34 -05:00
TehRealSalt 7891a11fba Battle points are visible 2018-11-01 00:57:38 -04:00
Latapostrophe 26093de2e9 Merge branch 'master' into chat-changes 2018-10-25 11:14:49 +02:00
toaster 791dc079ec Merge branch 'master' into 'chat-changes'
# Conflicts:
#   src/hu_stuff.c
2018-10-21 08:27:28 -04:00
Monster Iestyn 4edeeb6953 Add P_GetZAt to Lua 2018-10-20 21:08:59 +01:00
TehRealSalt 2021897972 Merge branch 'master' into new-spb 2018-10-19 17:45:06 -04:00
TehRealSalt 553066b48b Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
TehRealSalt f8fc6862b5 SPB knockback is more punishing
Hopefully to prevent instances like the Megablock video, where SPB double-dips just because the 1st one wasn't enough but another is overkill
2018-10-18 20:49:30 -04:00
Latapostrophe 346c6bce96 HU_AddChatText cleanup for future use + chat mode Window (Hidden) added. 2018-10-10 21:24:55 +02:00
TehRealSalt 0d56f68abc Merge branch 'master' into sweet-new-kicks 2018-10-10 13:43:05 -04:00
TehRealSalt 8132dd6be5 Merge branch 'master' into net-screen 2018-10-09 14:41:59 -04:00
TehRealSalt 842430dbdb Rocket Sneakers appear beside you 2018-10-07 18:53:46 -04:00
Sryder d3e489e986 Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue. 2018-10-07 15:35:54 +01:00
TehRealSalt cc2af8a329 Merge branch 'master' into net-screen 2018-10-05 16:13:25 -04:00
TehRealSalt 3c567b39f1 Minor splitscreen+netgame fixes
Mainly related to drawing Battle arrows or Hyudoro
2018-09-30 01:23:59 -04:00
toaster 7f5b5ecb60 Spring *panels* now use `sfx_kc2f` again (but pogo spring *items* still do `sfx_kpogos`, in case you were worried). 2018-09-27 18:32:07 +01:00
mazmazz e1a4bf4dd7 MP Lua: FadeMusic signed/unsigned comparison fix (buildbots) 2018-09-19 19:55:22 -04:00
mazmazz 37f27888c8 MP Lua: MusicExists Mixed D+C fix (buildbots) 2018-09-19 19:29:38 -04:00
mazmazz 0cfe0824b6 Lua P_RestoreMusic else if fix 2018-09-18 15:11:37 -04:00
mazmazz 88d37fd76e musicplus-lua 2.2 -> 2.1 backport 2018-09-18 11:52:29 -04:00
mazmazz 66283ce36a MusicPlus core: Lua separation fixes 2018-09-18 11:39:08 -04:00
mazmazz c5ea6b5efe MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
Latapostrophe b09019dc4a Fix old chat detection. 2018-08-19 11:12:21 +02:00
SeventhSentinel cde54211c2 eggman
broken
2018-08-11 20:19:09 -04:00
TehRealSalt cc009aca4f Flashing tics length depends on speed stat
Change to speed-weight when the bump buff gets added
2018-08-11 00:12:41 -04:00
toaster b319c2d9b8 * Homogenise old chat mode detection, which includes `cv_consolechat.value`, `dedicated`, and `vid.width < 640`.
* Make the chat notification sounds work in old chat mode.
2018-08-03 23:01:09 +01:00
toaster ad119af07b * Get chat to compile with errormode on.
* Add chat options to the HUD and Sound Option menus.
2018-08-02 23:52:07 +01:00
Latapostrophe 3af7b7bf91 merge sonicitems into chat-changes so that it's not lagging 10 years behind 2018-07-31 19:45:49 +02:00
Latapostrophe ac7c249fd2 SRB2chat test rework 2018-07-31 11:10:02 +02:00
TehRealSalt f9e5a11060 - Instashield on failed damge
- Ballhog explosion separated onto another sprite
- Disabled banana jitter
2018-07-26 20:12:42 -04:00
TehRealSalt 0dc2c43a67 Banana drag touches
- Banana drag timer resets when placing one, for x3 & x10 bananas
- Banana dragging spawns transulcent dust
- Dragging bananas make them twitch up & down
2018-07-25 12:49:30 -04:00
TehRealSalt a63b172351 Merge branch 'sonicitems' into bumpstuff 2018-07-20 19:13:04 -04:00
TehRealSalt 6eaed1ac7b Spectator overhaul
- New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2.
- Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 19:11:36 -04:00
TehRealSalt d25cb1aa56 Wipeout bumps
- You can bump other people during spinout.
- Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics.
- You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-19 22:37:32 -04:00
TehRealSalt f6e5571948 Chao's requests 2018-07-16 21:27:50 -04:00
TehRealSalt 534766df40 Expose P_SpawnShadowMobj 2018-07-16 18:11:35 -04:00
SeventhSentinel 80c2b56927 Changed all instances of "balloon" to "bumper"
Also changed "It's you!" to "Select character & color..."
2018-07-03 15:14:47 -04:00
TehRealSalt 5c7b66cc0f WANTED 2018-07-01 04:36:09 -04:00
SeventhSentinel dd04d68c09 Held item changes 2018-06-27 15:58:43 -04:00
SeventhSentinel 18b3d2d14c Spinout type is now passed through K_SpinPlayer
This means we don't have to reset spinouttype's value immediately after using it, which means no more wipeout timer garbage.
2018-06-25 06:58:23 -04:00
TehRealSalt d1929d3a37 Linked list bananas, hnext/hprev fixes 2018-06-16 19:57:08 -04:00
wolfy852 8abeae7805 Chat Manager 2018-06-15 05:20:01 -05:00
TehRealSalt a554763128 Maintenence
- Fix merge issues
- Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking
- K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player.
- Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 16:10:24 -04:00
TehRealSalt 07a18e5185 Merge branch 'master' into sonicitems 2018-06-09 22:50:21 -04:00
Sryder f00e3dfd5a New Drift dust
Applies all the time as long as the object is turning tight enough
New Sound
Works on Red Shells too!
2018-06-08 21:13:52 +01:00
TehRealSalt 00e913bbcc Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_baselib.c
#	src/p_inter.c
#	src/p_spec.c
2018-03-31 00:44:03 -04:00
TehRealSalt 3d8441fe54 Unsuck start boosts 2018-03-29 21:43:02 -04:00
TehRealSalt 00d2038d61 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 4348be7d80 Chaotix sound effects, new music names 2018-02-10 16:01:09 -05:00
TehRealSalt 2889687d1d 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 85a81ed087 Minor adjustments in hopes that I fixed the resynch bomb on gametype switch? 2018-02-08 17:13:06 -05:00
TehRealSalt cbff4bbf44 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
TehRealSalt db09f7b3d6 Lots of changes
- Menus now have all of the Kart cvars
- Removed any cvars that aren't useful for Kart from the menu (they
still exist in the console, though)
- Removed SP and NiGHTS Mode options from the main menu
- "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples
of 50, or the terms "Relaxed", "Standard", and "Turbo"
- Many gametype options (game speed, frantic, mirror, & karma comeback)
are now changed on map load instead of instantly
- New cvar, "kartminimap", for disabling the minimap
- The maxplayers cvar now actually matches up with our 16 player limit
- Game now keeps track of matches played. Has a condition type
associated with it, as well.
- Game checks for unlocks and saves gamedata when finishing a match,
even in MP
- Removed most of the normal emblems, added a single emblem for Green
Hills. Didn't know what to do with extra emblems and such so I just left
them (FOR NOW c:<)
2018-01-15 22:31:14 -05:00
TehRealSalt 9908339989 A bunch of little things
- Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT
- Solid objects now bump players instead of stop them
- Bounce pad strength scales with object scale
- Fixed Boo stealing being inconsistent and sometimes not stealing
anything
2018-01-08 15:48:19 -05:00
wolfy852 732cef777f Merge in battle, unfuck the code 2017-11-21 01:23:06 -06:00
TehRealSalt a2767fe341 Some more minor comeback tweaks
- Comeback players are now 1 speed with -20 friction
- Bombing gives 2 karma now
- Item players should no longer be able to be hit
- Attempted to fix instances of trying to bomb someone while they can't
be touched causing you to lose all your karma and start a console
message saying you're back in the game, despite not rewarding a balloon
- Fixed a few places where kartspeed & kartweight were being read as
fixed point numbers, despite being UINT8's
- Fixed up kartstuff Lua support more, functions properly now
2017-11-19 19:39:40 -05:00
TehRealSalt 81c723b9b5 Bounce Pad stuff
- K_DoBouncePad now uses mobj_t instead of player_t
- Bounce pads can now bump thrown shells
- Bounce pads now give heavier gravity to players
- The suicide command now works in all gamemodes
2017-11-19 02:37:28 -05:00
TehRealSalt cca30d1095 Lots of small tweaks & fixes, that should make Battle a LOT more bearable
- Comeback timer is now always 10 seconds instead of scaling
- Takes 10 seconds before exiting
- Flashing tics is doubled in Battle Mode
- Removed a bunch of bomb nerfs
- Bombs are back to making only 1 point per hit
- Exposed K_GetKartAccel & K_GetKartFlashing to Lua
- Item boxes should no longer drop while going up slopes
- Trading item boxes with a bomb should turn you back into a bomb
- Balloons should no longer all respawn when dying in pits in 2-player
games
- Flashing players are able to kill *thrown* shells again (shields and
trap items are still unkillable). Prevents red shells from being able to
stick to a flashing player and hurt them again as soon as they're done
flashing
- CHECK appears at a farther distance
2017-11-17 00:48:36 -05:00
TehRealSalt 890637c4ab Expose some functions to Lua 2017-11-07 18:35:05 -05:00
TehRealSalt c0ed28e828 why didn't this merge before?? 2017-11-05 02:17:13 -05:00
toasterbabe 661da15146 Reinforcing encapsulation I originally broke down to allow for P_GetMobjGravity.
When I first wrote this, I thought the .h file that contained a function declaration needed to have the same name as the .c file the function was in. Now I know that's not the case, off to p_local.h with you.
2016-06-09 18:16:13 +01:00
toasterbabe 76d108d760 Whoops, didn't realise pushing fixed and integer were different. My mistake. 2016-06-01 14:49:14 +01:00
toasterbabe 62c4338d60 Added P_GetMobjGravity to Lua. Check /toaster/gravitytest.lua for sample script. 2016-06-01 13:19:44 +01:00
Inuyasha f07585191b copyright dates/statements updated and such
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Inuyasha 3235351b99 And now Lua yells at you for doing what I just fixed 2016-05-11 14:33:50 -07:00
Monster Iestyn 2ddde83601 General improvements to Lua error messages for out-of-bounds stuff.
The idea is for the layman Lua user to understand better what range of values to use for mobj types, states, sfxs, player #s etc. Additionally, mobjinfo/states/sfxinfo/hudinfo tables all now have actual bound checks when accessing/editing them. Yikes, why didn't they have any before?!
2016-05-01 22:14:42 +01:00
Alam Ed Arias 1c16943be8 Merge branch 'next' into bp_random2 2016-03-31 21:44:03 -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
Monster Iestyn bc8ea700ed Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into closestpointonline 2016-03-26 18:32:51 +00:00
Inuyasha cfcd7ce0d3 Readded EvalMath to Lua.
There is a caveat to this: The first time EvalMath is used, a
deprecated function warning will be shown to the user that tells
them to use _G[] instead.

This reverts commit 9d36cf37bd.
2016-03-08 22:15:26 -08:00
Inuyasha 7349cbdbc0 Backwards compatibility.
A test WAD for all possible use cases I can think of
can be found here:
https://dl.dropboxusercontent.com/u/3518218/21/secret/bc_test.wad
2016-03-03 02:54:07 -08:00
Monster Iestyn 668cc85d7b P_ClosestPointOnLine can now (optionally) take custom coordinates that you want to make up your line 2016-03-02 20:31:04 +00: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
Monster Iestyn fa935be129 Fixed the issue where diagonal springs couldn't teleport you to their centers anymore (guess whose fault that was! =D ). Basically I just made P_DoSpring boolean, which probably could be useful to Lua peeps as well. (it returns true if you were sprung, false if not) 2015-07-28 19:28:51 +01:00
JTE ef0e61fc33 Change LUA_NUMBER to fixed_t, change angle_t handling in Lua.
Angles now go from 0 to 0xFFFF (360 degrees == FRACUNIT) instead
of using a full UINT32. Lua only has one number type, so signedness
gets in the way of using angle_t directly. This handling of angles
matches up with how ZDoom ACS scripting and the like does it.

I also changed all the integer casts and pushes of fixed_t to
their own macro in preperation for possible future seperation.
2015-05-20 23:54:04 -04:00
JTE 9d36cf37bd Removed EvalMath from base Lua.
EvalMath is for SOC only.
It spawns an entirely seperate instance of Lua and requires
uppercase-only strings, and it's ability to parse strings to
enums is redundant to Lua's _G table (try using
_G["MT_BLUECRAWLA"] for instance)
2015-05-20 18:44:03 -04:00
Alam Ed Arias 404b5f666c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
Alam Ed Arias d6c29e19ab SRB2 2.1.10 release 2014-08-05 19:59:40 -04:00
Alam Ed Arias c028c83235 SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
wolfy852 9ab60d1295 Add LUA_EvalMath to Lua with function name EvalMath 2014-07-19 17:46:53 -05:00
wolfy852 a8f5406233 Add P_Telekinesis and P_IsFlagAtBase to Lua. 2014-05-25 21:41:05 -05:00
Wolfy 9987d132fb Add P_DoSpring to base library. 2014-05-24 12:51:59 -04:00
Wolfy 5316f8da96 Add P_SpawnSpinMobj to base library. 2014-05-24 12:46:46 -04:00
Wolfy ec443af3d9 Add P_SpawnThokMobj to Lua base library.
I don't know too much about this but I THINK I did it right.
2014-05-24 12:35:01 -04:00
Alam Ed Arias 8a9759a3e4 SRB2 2.1.8 release 2014-04-19 13:41:29 -04:00
Alam Ed Arias 02a3b0776c SRB2 2.1.7 release 2014-04-14 01:14:58 -04: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