Commit graph

317 commits

Author SHA1 Message Date
Sally Coolatta
5a98c00405 NOW we make it past p_mobj 2020-08-14 22:28:49 -04:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
f8d1e75025 Merge remote-tracking branch 'public/next' 2020-08-12 18:50:41 -04:00
Sally Coolatta
c96bd5f64a Many removals
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
2020-08-10 21:45:51 -04:00
Sally Coolatta
7f94fe0d93 Merge lua_playerlib.c 2020-08-05 14:15:21 -04:00
Sally Coolatta
69b6ba2f18 I tore apart the entire code to try and fix braking friction and gave up, so now it's back to v1
My rewrites clean up a LOT of weird/misleading behavior anyway, so I'm gonna push this regardless. Someone else will have to figure out another way to reimplement braking friction though -- we can't use it as is because it prevents being able to bump people.
2020-07-28 03:34:39 -04:00
Zachary McAlpin
bb46c909ec Allow cmd to be modified using the PlayerCmd hook 2020-07-25 20:08:41 -05:00
Zachary McAlpin
6877df94bc Ported Lat's PlayerCmd hook to vanilla SRB2 2020-07-17 00:08:38 -05:00
Sally Coolatta
59add5abd4 Merge branch 'master' into trick-panels 2020-06-14 20:46:01 -04:00
Latapostrophe
cab9c2a139 Merge branch 'v2-master' into followme-internal 2020-06-07 23:56:32 +02:00
Sally Coolatta
b7a8c1f128 Merge branch 'master' into trick-panels 2020-06-05 18:41:21 -04:00
Latapostrophe
f33e4d62a0 Sort conflicts, fix misordered follower bubble states in dehacked 2020-06-05 02:33:39 +02:00
Sally Coolatta
f4c0011a76 Merge branch 'master' into grand-pricks 2020-06-04 14:41:56 -04:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00
Sally Coolatta
086ea73c2f Merge branch 'master' into respawn-updates 2020-06-01 15:49:30 -04:00
Sally Coolatta
ede66a6632 Trick panels 2020-05-31 21:23:22 -04:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sally Coolatta
0879459142 Add distance based on air time
Using the respawn command gives you barely any distance, while flying off huge  MGZ pits gives you a bunch.
2020-05-29 10:37:34 -04:00
Sally Coolatta
d062a35a3a Huge respawn overhaul
- Moved respawn code to its own file
- Reorganized a lot of the code related to respawning
- As a result of the massive reorganization, I squashed several bugs. Most notably: mid-game joiners having weird spawns, being able to skip laps by respawning.
- Respawn lightsnake no longer takes you straight to your nextwaypoint -- it now has a minimum distance forward that it tries to put you at when you respawn.
2020-05-29 01:04:51 -04:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Sal
ddef9829da Merge branch 'displayplayer-gonna-getcha' into 'next'
displayplayers.iterate crashes in replays, is that based?

See merge request KartKrew/Kart-Public!171
2020-05-19 17:28:14 -04:00
Sally Coolatta
0282615c38 Merge branch 'master' into pet-robo 2020-05-18 15:18:37 -04:00
Sally Coolatta
e425eabf04 Merge branch 'master' into grand-pricks 2020-05-17 11:39:39 -04:00
James R
1f74d7533e Properly bound lua displayplayers and displayplayers.iterate to splitscreen
This is fixes crashes in replays because splitscreen displayplayers are
initialized to INT32_MAX there.
2020-05-15 14:21:25 -07:00
James R
6e3a92ed52 player.ping for the ping in milliseconds of the player 2020-05-13 16:17:40 -07:00
Sally Coolatta
fa5fccffc5 Implement lives system
Lose a life & restart the current race if you place below the top half. Lose all of your lives, and you get kicked to the title screen.
2020-05-13 02:14:39 -04:00
Sally Coolatta
1788d29263 Merge branch 'master' into pet-robo 2020-05-12 22:38:23 -04:00
Latapostrophe
766f7f035f Let followers change colour separatly from players 2020-05-04 18:08:41 +02:00
Sally Cochenour
751fd9ad1b Start on bots, doesn't work 2020-03-27 23:51:49 -04:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Latapostrophe
d7146021c1 Push consoleplayer and displayplayers to Lua 2020-03-10 11:53:28 +01:00
SwitchKaze
9508b23d85 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-29 23:41:16 -05:00
LJ Sonic
9a23fface3 Merge branch 'realmo' into 'next'
Let Lua access spectator mobjs

See merge request STJr/SRB2!756
2020-02-25 15:06:29 -05:00
SwitchKaze
99a1840101 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale
51137837c4 Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine
c0e0721421 Let Lua access spectators mobjs 2020-02-03 19:42:37 +01:00
fickleheart
62c75c0c81 Merge remote-tracking branch 'upstream/next' into viewroll 2020-01-26 18:01:58 -06:00
Louis-Antoine
c2682ac1b6 Let clients rejoin the server without losing their status
This is accomplished by simply preserving
the player's body after disconnecting.

Bodies will despawn after the number of minutes
specified by the "rejointimeout" console variable (float).
A value of 0 disables the feature completely.

Clients rejoining are identified by their IP address,
and may rejoin even if the server is full or joins are disabled,
for as long as their body remains.

From a technical standpoint, when the user disconnects,
the player they were controlling does not leave,
the underlying player_t just keeps working normally,
except it does not receive any input anymore.
When the user reconnects, they are simply "relinked"
to their player_t.

Those "soulless" players can be identified through
their "quittime" field, which is the number of tics
elapsed since the user disconnected, or zero
if still connected. "quittime" is exposed to Lua.
2020-01-22 03:05:08 +01:00
fickleheart
6a80bf2629 wip viewroll stuff 2020-01-14 23:29:56 -06:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Steel Titanium
dc9a09f837 Merge branch 'public_next' into 'master' 2019-11-18 15:39:41 -05:00
Steel Titanium
3c71434a02 Allow access to players userdata outside levels.
In exchange for preventing access to any mobj_t userdata outside levels, including player's own mobj_t.
2019-10-14 22:12:26 -04:00
toaster
09f7dc1350 * Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 22:12:47 +01:00
James R
d51b516446 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
toaster
3b99335605 * Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases.
* Move it into lua_script.h, so it's available to everything that needs it.
2019-07-30 17:57:57 +01:00
toaster
c659e3f26b Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168). 2019-07-30 17:48:13 +01:00
toaster
2fbb0bbb52 I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here. 2019-07-13 13:43:22 +01:00