James R
71b6b816da
Disable player admins
2022-02-14 14:29:55 +01:00
AJ Martinez
3fcea2a37e
my workflow is beyond your understanding
2022-02-14 14:27:12 +01:00
AJ Martinez
1d4a99b6a8
very small tiny fixes
2022-02-14 14:27:12 +01:00
AJ Martinez
ef6ff846d3
Merge branch 'master' into 'director-cam'
...
# Conflicts:
# src/d_netcmd.h
2022-01-23 15:38:14 -06:00
AJ Martinez
24b05451f6
my workflow is beyond your understanding
2022-01-20 03:39:00 -06:00
AJ Martinez
1e4bc482d0
very small tiny fixes
2022-01-20 02:07:48 -06:00
Sally Coolatta
c606e1e96b
Force shrink can be toggled individually online
...
In preparation for a "make yourself small by default" cheat on the char select like SMK.
2022-01-09 04:08:26 -05:00
James R
041dd73555
Let players switch skin at any time (even when moving) if they are playing alone
...
Playing in local splitscreen also counts as "alone".
Actually removes the restriction of only being able to
change skin when not moving altogether. It's annoying,
especially if you're getting bullied in POSITION.
2021-12-12 03:59:47 -08:00
toaster
b716e142a8
Some fixes for bad player info on joining servers.
...
* Don't overwrite the first player's name when joining with multiple local splitscreen players. (resolves #151 )
* The defaults for unprovided names are now consistently "Player A/B/C/D" as opposed to some being letter-based and some being number-based.
* Send local player info once per local splitscreen player, rather than n^2 times (where n is the number of local splitscreen players).
* Since the packet *requires* four names to be sent every time you join a server, send dummy names for local splitscreen players who aren't connecting, instead of your actual cvars (no data leakage you didn't ask for!)
2021-11-30 21:24:00 +00:00
Sally Coolatta
8bb1fa57d4
Merge branch 'master' into 22-merge-again
2021-04-05 01:11:26 -04:00
Sally Coolatta
7f912e1558
Remove unused cv_freedemocamera
...
Not relevant to kart
2021-02-28 21:28:18 -05:00
Sally Coolatta
20e2c78331
Delete seenames code
...
We had SEENAMES disabled before, and vanilla removed the define, so I went ahead and removed it. Repurposed the old seenames console variable for our nametags.
2021-02-28 21:27:23 -05:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sally Coolatta
4b158c44cd
Add debug command to show the bot's prediction
2021-02-26 02:41:41 -05:00
James R
41f1b3b97c
Kill SEENAMES
2020-12-12 02:11:23 -08:00
James R
e3142663aa
Merge branch 'replay-camera-update' into 'next'
...
Make the replay camera follow the player
See merge request STJr/SRB2!1243
2020-11-22 17:23:38 -05:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
Sally Coolatta
e16c7d722f
Cherry-pick e1b265df2
2020-11-16 19:55:28 -05:00
Riku Salminen
0cefac70d3
Declared the cvar in netcmd to get rid of warnings
2020-11-10 13:53:31 +02:00
Sally Coolatta
afbbfc9b1f
Fix cvars
...
My wrist burns...
2020-10-24 21:32:07 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Jaime Passos
b4b4738c94
Changes to sprite rendering:
...
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
Sally Coolatta
40b0a2479e
Wrong file
2020-08-30 23:26:00 -04:00
Sally Coolatta
2d7c835c4d
Dedicated servers can change discordinvites without needing RPC support
2020-08-30 23:20:06 -04:00
Sally Coolatta
38ec458903
Always have XD_DISCORD defined, so that people compiling without Discord support can connect to servers that do.
2020-08-22 05:03:08 -04:00
Sally Coolatta
b761349076
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 01:53:27 -04:00
Sally Coolatta
30144d5d06
Things to get it to run
...
Build is still MASSIVELY broken, you can't even get into a level, still investigating
2020-08-15 20:09:36 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
8731c6b7a4
Another round of fixing up
...
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
Sally Coolatta
a50a9a1843
Lots of splitscreen fixes
...
LOTS of stuff I changed to use arrays instead of constantly duplicated code
2020-08-10 23:38:32 -04:00
Sally Coolatta
b156899390
More d_netcmd.h
2020-08-02 16:36:40 -04:00
Sally Coolatta
178087289e
Merge d_netcmd.c/h
2020-08-02 15:38:53 -04:00
Sally Coolatta
ba6d5e95ba
Add Sneaker x2 to pad out the item table a bit better
...
Jeck mentioned it, we agreed it might be a fun item because stacking sneakers is possible now
2020-07-24 19:11:52 -04:00
Latapostrophe
cab9c2a139
Merge branch 'v2-master' into followme-internal
2020-06-07 23:56:32 +02:00
Latapostrophe
6ac63cca7a
Merge branch 'v2-master' into followme-internal
2020-06-02 22:21:16 +02: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
e51bceb567
Items respawn in GP
2020-05-13 03:04:33 -04:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Sally Coolatta
d2172fc54b
Bot amount & difficulty is now controlled by cvars
2020-05-07 02:37:06 -04:00
Latapostrophe
59452ae026
Merge branch 'v2-master' into followme-internal
2020-05-04 12:52:47 +02:00
Sally Coolatta
cb12d1ebf8
Merge branch 'master' into pet-robo
2020-05-03 21:30:40 -04:00
James R
2e963a46f5
For fun, let the bots vote
2020-04-02 14:16:29 -07:00
James R
1243d0940a
Merge remote-tracking branch 'origin/master' into more-debug
2020-03-31 16:44:04 -07:00
Latapostrophe
4c1459cd4e
Chaos Conflicts
2020-03-29 12:14:27 +02:00
Sally Cochenour
e5ae9d1513
Merge branch 'master' into pet-robo
2020-03-28 08:43:40 -04:00
Sally Cochenour
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -04:00