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
Riku Salminen
0cefac70d3
Declared the cvar in netcmd to get rid of warnings
2020-11-10 13:53:31 +02: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
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
LJ Sonic
e0f3a5b8f5
Merge branch 'lua-io' into 'next'
...
Support for Lua's I/O library
See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Louis-Antoine
a09d46a092
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io
2020-02-19 22:40:54 +01:00
James R
9192e1eade
Clean player name before joining!!!
2020-02-01 18:20:35 -08:00
Louis-Antoine
6d42930c8e
Update Lua I/O support to 2.2
2020-01-22 23:08:57 +01:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
MascaraSnake
abdfc2d237
Merge branch 'exit-move-lj' into 'master'
...
Post-exit movement
See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
Steel Titanium
b1f39e836d
Better ping implementation.
2019-11-17 20:22:47 -05:00
James R
d2cd9e7239
Remove defaultname, since players are probably sure on their name change
2019-11-15 17:32:43 -08:00
Louis-Antoine
d3b113c84a
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
Louis-Antoine
28b0b7c404
Let players move after completing the level
...
This only takes effect in co-op,
and can be disabled with "exitmove off"
2019-11-15 15:35:28 +01:00
toaster
2a16cf539a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
...
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
MascaraSnake
a039814673
Merge branch 'set-name-on-join' into 'master'
...
Set the player's name as soon as they enter the game
See merge request STJr/SRB2Internal!397
2019-10-25 15:38:21 -04:00
MascaraSnake
2004577314
Merge branch 'james-kart' into 'master'
...
My changes to Kart
See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
James R
4f5d32a73f
"NEWPING" might as well be the only ping
2019-10-22 19:39:26 -07:00
Louis-Antoine
209a883821
Set the player's name as soon as they enter the game
2019-10-19 17:09:18 +02:00
toaster
036c6aa829
Just revert the respawn, retry and suicide stuff cuz it's apparently contentious. Who knew?
2019-10-16 17:38:38 +01:00
toaster
3e3ee8717f
Merge retry and respawn into one command, respawn.
2019-10-16 11:38:09 +01:00
toaster
69d43435f5
Improved "HELP" command!
...
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
toaster
8bab035279
Added some examples of cvars that can use named values.
...
* Pandora's box now has infinite lives show up as "Infinite" instead of "-1".
* `pointlimit None`
* `timelimit None`
* Ported `basenumlaps` (with "Map default" value) from Kart to replace `usemaplaps`, for if Circuit ever gets shown any love ever again.
* `respawndelay Off`
* `resynchattempts Don't`
2019-10-15 11:49:37 +01:00
Jaime Passos
24d08edf05
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 20:27:50 -03:00
Monster Iestyn
0b6a463cff
Merge branch 'public_next'
...
# Conflicts:
# src/config.h.in
# src/d_clisrv.c
# src/d_netcmd.c
# src/doomdef.h
# src/p_map.c
# src/p_maputl.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-08-20 13:54:48 +01:00
James R
6fdfd3b90c
Don't send login final hashes to everyone
...
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.
P.S. The netcode is LOL XD by VincyTM -Telos
2019-07-15 16:14:00 -07:00
mazmazz
14df513db6
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04: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
mazmazz
fe93469dc4
Add CSV functionality to timedemo
...
* Append timedemo trials to timedemo.csv
* Specify -csv <trialid> to toggle CSV behavior
* Specify -quit to immediately quit after timedemo
* Add ticrate, rendermode, video mode, demo name, bits to CSV timedemo row
2018-12-29 04:51:00 -05:00
Monster Iestyn
94ad0b880f
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
wolfy852
beb58c55ac
I must be some kind of idiot.
2018-11-29 07:34:05 -06:00
Wolfy
42fc67a639
Remove hardcoded limit on admins
...
# Conflicts:
# src/d_netcmd.c
2018-11-29 07:05:49 -06:00
Wolfy
cabe9871e3
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Monster Iestyn
eb4eef6104
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
2018-11-20 14:33:10 +00:00
Alam Ed Arias
45c8920bb1
Clean up warnings
2018-11-14 10:52:16 -05:00
Monster Iestyn
7989e9a482
Merge branch 'public_next'
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
2018-11-10 15:41:57 +00:00
Monster Iestyn
74f221d73f
Merge branch 'music-clean' into 'master'
...
Some code cleanup.
See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05:00
Monster Iestyn
c941971a0a
Merge branch 'mi-minor-refactoring-backport' into 'master'
...
MI minor refactoring
See merge request STJr/SRB2!294
2018-10-31 16:49:30 -04:00
Steel Titanium
0980e9b4b1
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into music-clean
2018-10-20 14:00:12 -04:00
Steel Titanium
9b8b5ea57c
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
Monster Iestyn
a8e9805c06
Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore)
2018-10-11 20:00:34 +01:00
Monster Iestyn
6ba97b03a6
These convar externs aren't moving files, I'm just shifting them up to live with their relatives
2018-10-11 19:39:28 +01:00
Monster Iestyn
40c0e554e5
Move analog consvars to g_game.h
2018-10-11 19:39:11 +01:00
Monster Iestyn
277fd8daa8
Moved screenshot/movie consvar externs to m_misc.h
2018-10-11 19:38:11 +01:00
Monster Iestyn
865da5f351
cv_controlperkey probably belongs in g_input.h too
2018-10-11 19:37:48 +01:00
Monster Iestyn
940b393aae
Moved most of d_netcmd.h's 2P mouse consvar externs to the files with their 1P counterparts
2018-10-11 19:37:24 +01:00