7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
bf3b7fc5b0
Clean player name before joining!!!
2020-02-01 18:20:35 -08:00
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
233ff8bd27
Merge branch 'exit-move-lj' into 'master'
...
Post-exit movement
See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
2584241a44
Better ping implementation.
2019-11-17 20:22:47 -05:00
82ad6685a6
Remove defaultname, since players are probably sure on their name change
2019-11-15 17:32:43 -08:00
29501a992b
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
ff62a0732a
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
915e50a1e4
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
7d69409cf7
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
2a8e5b7bff
Merge branch 'james-kart' into 'master'
...
My changes to Kart
See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
29a5999a44
"NEWPING" might as well be the only ping
2019-10-22 19:39:26 -07:00
88d239ac36
Set the player's name as soon as they enter the game
2019-10-19 17:09:18 +02:00
77160ae37b
Just revert the `respawn`, `retry` and `suicide` stuff cuz it's apparently contentious. Who knew?
2019-10-16 17:38:38 +01:00
45e5f70eb8
Merge `retry` and `respawn` into one command, `respawn`.
2019-10-16 11:38:09 +01:00
8f3e59b43d
Improved "HELP" command!
...
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
910df54fb5
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
d99026df3b
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 20:27:50 -03:00
f3484f7ded
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
91502f1499
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
dc0a92ea62
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
075f28b7c8
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
b3908755af
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
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
c517862f7e
I must be some kind of idiot.
2018-11-29 07:34:05 -06:00
b59718d3ad
Remove hardcoded limit on admins
...
# Conflicts:
# src/d_netcmd.c
2018-11-29 07:05:49 -06:00
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
224c0fccdb
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
f73ea4f984
Clean up warnings
2018-11-14 10:52:16 -05:00
268bde3fdf
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
f974bb96ac
Merge branch 'music-clean' into 'master'
...
Some code cleanup.
See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05:00
c450a1aee2
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
87d3552ff9
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into music-clean
2018-10-20 14:00:12 -04:00
b3faed190b
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
ef78c942f7
Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore)
2018-10-11 20:00:34 +01:00
38ec0cc50a
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
0ad0f8afc4
Move analog consvars to g_game.h
2018-10-11 19:39:11 +01:00
933508db89
Moved screenshot/movie consvar externs to m_misc.h
2018-10-11 19:38:11 +01:00
e2a4c59e21
cv_controlperkey probably belongs in g_input.h too
2018-10-11 19:37:48 +01:00
4b7af892e1
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
f6670fea76
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop
...
# Conflicts:
# src/r_things.h
2017-08-16 19:29:23 +01:00
6d3691d3d1
woops, compile fix
2017-08-15 22:40:19 +01:00
3186d6a4e4
* An improved Multiplayer menu.
...
* If NONET, the Multiplayer option on the main menu leads directly to the Splitscreen menu, which also includes player 1/2 setup under this circumstance.
* A mechanism to save player name, skin and colour as defaults to config.cfg.
2017-07-25 18:34:13 +01:00
8d8ae2b538
Renamed again, and this time I'm happy with it.
...
* "playstyle" to "coopstarposts"
* "lifedistribution" to "cooplives"
2017-06-03 17:55:03 +01:00
f3cad19184
* Renamed "steallives" to "lifedistribution".
...
* Gave lifedistribution a "Sharing" option to go along with its previous individual and stealing options.
* Made the game over graphic and music only happen if everyone's out of lives if you're sharing or stealing lives.
* Fixed a bug where game over wouldn't come to fruition because it kept on happening each tic of the countdown2.
* Made spectator stuff display in Co-op splitscreen.
2017-06-03 12:26:42 +01:00
964df31ee5
* Combine cv_sharedstarposts and cv_respawntype into cv_playstyle (Individual, Sharing, Together).
...
* Put steallives on menu.
2017-05-29 00:03:46 +01:00
4239036cec
Life theft! No menu item, but anything is possible with zombocom.
...
cv_steallives, defaults to "On"
2017-05-28 21:55:41 +01:00
3723eff9f7
The start of the Co-Op revamp! Not tested over netplay yet, but uses TD's implementation of various Co-op friendly things as a reference (or in one place an outright code steal, thanks Sryder!)
...
* cv_sharedstarposts - Makes everyone share starposts, defaults to "On"
* cv_respawntype - Defaults to "Starpost". If set to that, people respawn at the starpost you just hit (assuming cv_sharedstarposts is on - may have to combine the two variables later, but seperate for testing for now). The other option is the old, unrestricted spawning. We COULD add TD bubble spawning at a later time using this variable, though.
The level DOES reset if everyone dies, but not in a way which allows for Mystic Realm style non-resetting resets. I'll handle that later.
2017-05-28 15:33:35 +01:00
55b85e257e
Per MI's disabling of PT_ASKINFOVIAMS, don't outright remove DELFILE, just mark it for replacement.
2017-05-27 20:02:49 +01:00
James R