Sally Coolatta
14b379fd27
Cherry-pick 4eb69a664
2020-11-16 19:52:26 -05:00
Sally Coolatta
56a20d05df
Merge branch 'master' into battle-rethink
2020-11-11 00:11:18 -05:00
Sally Coolatta
fc934b38e1
Merge public next
2020-11-10 15:32:48 -05:00
Sally Coolatta
0e28470228
Merge master
2020-11-08 02:34:24 -05:00
James R
1cedb32e51
Let access spectator mobj
2020-11-05 20:05:04 -08:00
James R
3386ff6b90
Allow accessing a player even if there is no mobj
...
The worst part is you could've just saved the player userdata and accessed it
later anyway while player.mo is nil.
2020-11-05 20:04:14 -08:00
James R
745b293c47
Always allow access to the serverplayer
2020-11-05 20:00:21 -08:00
Sally Coolatta
2509d5a29c
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-24 21:39:32 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
7ce53ac104
Add blue spheres
...
Doesn't have animations, and doesn't have stat-specific buffs. But it's already a massive improvement
2020-10-22 02:52:33 -04:00
Sally Coolatta
953afddd03
Fix camera not updating when F12ing, fixed camera not taking aiming into account, and minor cleanup
2020-09-25 09:28:19 -04:00
Sally Coolatta
99a1bacb81
Turning code overhaul
...
Packet drops are still broken, but at least netgames are playable now.
2020-09-22 00:35:44 -04:00
SteelT
d8bcc13fec
Merge branch 'master' into trick-panels
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
# src/k_kart.c
# src/p_user.c
2020-09-18 00:54:45 -04:00
Sally Coolatta
a251c3909b
Lots of little fixes
...
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
2020-08-16 00:29:04 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
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
