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
Latapostrophe
c83127293b
resolve conflict in m_menu
2019-05-12 10:48:54 +02:00
wolfy852
7dff052a64
Expose followerready, match d_player.h organization
2019-05-11 02:13:31 -05:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
TehRealSalt
e59a7175be
Fix skin shit
2019-05-02 00:39:49 -04:00
TehRealSalt
089be795a2
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
Wolfy
2c21b62f65
Merge remote-tracking branch 'remotes/public/master' into followme
2019-04-06 13:48:46 -05:00
fickleheart
272640f49a
Allow reading ticcmd latency
2019-03-16 02:19:43 -05:00
Latapostrophe
169ec43eec
add some Lua support, hit confirm animations and fix some stuff
2019-03-04 21:35:58 +01:00
James R
f8928300ec
Rename splitscreen member to something more meaningful
2019-02-22 15:57:44 -08:00
james
76f2df2c40
Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t
2019-02-16 23:25:50 -08:00
Latapostrophe
62f1ac6ef6
Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook
2019-01-13 14:40:48 +01:00
mazmazz
81352aece1
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
TehRealSalt
668efe9105
Require 3/5ths of checkpoints instead of 1/2
...
This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.
2018-11-27 14:28:11 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
mazmazz
56d9522a62
Merge branch 'master' into nights-dronebox
2018-09-07 09:06:32 -04:00
mazmazz
d24de8bc2f
totalmarescore player variable for NiGHTS scoring
...
# Conflicts:
# src/p_setup.c
2018-08-12 19:59:34 -04:00
mazmazz
9a9a2d94cc
totalmarelap and totalmarebonuslap player variables
2018-08-12 19:57:33 -04:00
mazmazz
269c1a70ba
Add lapbegunat and lapstartedtime player variables
...
There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
2018-08-12 14:21:26 -04:00
mazmazz
c5d6dd55d5
player->oldscale var for pre-Nightserize scale
2018-08-11 00:49:28 -04:00