Commit graph

253 commits

Author SHA1 Message Date
James R
b2226e95d6 Merge branch 'master' into next 2020-08-31 16:10:05 -07:00
James R
6c2370f894 Kill NOHS
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
2020-08-31 16:06:40 -07:00
James R
679bfa21ed Fix stupid NONET 2020-08-29 17:51:59 -07:00
James R
a6e59cbb24 Do not do master server things when NOCURL
(cherry picked from commit 7a05a8acf73ac0f012135339447c9a935e3b7939)
2020-08-29 17:45:28 -07:00
Steel Titanium
0d48d4c833 WIP: Remove support for DOS
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
James R
00ceca8cc6 Merge remote-tracking branch 'origin/master' into next 2020-07-12 17:11:22 -07:00
James R
8bcc2662d1 Merge branch 'netid-take-2' into 'next'
Use ordered id for netvars instead of shitty hash

See merge request STJr/SRB2!1010
2020-07-11 02:00:06 -04:00
James R
99e0c48f7b Fix a lot of stuff related to the version automation 2020-07-10 22:39:46 -07:00
James R
1757002ddb Automate VERSION/SUBVERSION; move version related definitions to version.h
CMake support. Srb2win.rc still needs touchy, whatever.
2020-07-10 22:20:33 -07:00
Steel Titanium
e22964ee0a I screwed up 2020-07-10 23:16:18 -04:00
Steel Titanium
307125e84e Update version number 2020-07-10 17:29:03 -04:00
James R
d31c6ac5b5 Contact the master server admims 2020-07-06 19:15:40 -07:00
Steel Titanium
7d75c72263 Update the version number 2020-07-06 21:29:02 -04:00
Louis-Antoine
c96e07b61c Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines 2020-06-27 02:01:16 +02:00
James R
db34d70faa Cvar compatibility with older demos 2020-06-19 18:04:20 -07:00
SteelT
bff6b19056 Merge branch 'marathonmode' into 'next'
MARATHON RUN

See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
Hannu Hanhi
da98ea242e Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
sphere
71cf31fcaf Fix the "Custom skincolors" branch not compiling with GCC 10. 2020-05-28 18:43:04 +02:00
SwitchKaze
b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Louis-Antoine
d0abd6e86c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_spec.c
2020-05-18 16:14:05 +02:00
toaster
2aa542d2bf Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode
# Conflicts:
#	src/doomdef.h
2020-05-15 13:23:37 +01:00
toaster
d593e2e1bb Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.)
Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features.

Benefits include:
* An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending.
* Disable the console (pausing is still allowed, but the timer will still increment).
* Automatically skip intermissions as if you're holding down the spin button.
* Show centiseconds on HUD automatically, like record attack.
* "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout.
* "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port).
* Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them.
* Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext).
* Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for).
* Gorgeous new menu (no new assets required, unless you wanna give it a header later).

Changes which were required for the above but affect other areas of the game include:
* "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories).
* Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true).
* Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.)
* The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs).
* A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier.
* Minor m_menu.c touchups and refactorings here and there.

Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 23:10:00 +01:00
Monster Iestyn
89cd756cd8 make savegamename in doomdef.h an extern, put the actual definition in d_main.c 2020-05-12 18:37:15 +01:00
James R
c52c8e0282 Update version names, SUBVERSION, MODVERSION 2020-05-11 14:41:36 -07:00
Monster Iestyn
baee6a1d57 Update version number to 2.2.3 in all the usual files, also updated MODVERSION 2020-05-10 16:02:23 +01:00
MascaraSnake
485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
James R
fe9b933b97 Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
James R
536fb1ef2a Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
Louis-Antoine
ea631715a6 Remove unused define 2020-03-22 17:29:15 +01:00
fickleheart
f32ab5918e Define SERVER_URL_PROTOCOL const for easy reconfiguration 2020-03-21 07:47:29 -05:00
Louis-Antoine
892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
fickleheart
b9d7b3e5c5 Merge remote-tracking branch 'upstream/master' into shaders-222
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
#	src/i_video.h
#	src/r_main.c
#	src/r_main.h
#	src/screen.c
#	src/sdl/i_video.c
#	src/sdl/ogl_sdl.c
#	src/w_wad.c
2020-03-14 12:52:15 -05:00
SwitchKaze
6415e10216 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
Steel Titanium
03e38e9486 Enable use of the patch file 2020-02-22 16:42:24 -05:00
Steel Titanium
1c1163bd0f Update version number to 2.2.2 2020-02-22 16:37:13 -05:00
James Hale
56b67a3b4f Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Steel Titanium
f0e2ba9e6a Merge branch 'next' into the-colors-feel-so-right 2020-02-18 14:29:50 -05:00
Jaime Passos
00bdb41640 Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-17 12:28:16 -03:00
Steel Titanium
0299f21dc7 Merge branch 'next' into the-colors-feel-so-right 2020-02-16 22:56:27 -05:00
fickleheart
c4b390bc76 Merge remote-tracking branch 'upstream/master' into viewroll 2020-02-16 21:32:57 -06:00
Steel Titanium
d9e2256a3c Add six new skin colors 2020-02-14 22:30:37 -05:00
Monster Iestyn
f1bdaa2fda Updated version number to 2.2.1, increment MODVERSION.
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
2020-02-05 19:55:40 +00:00
Jaime Passos
11c3721db4 Fix warnings around load_shaders 2020-01-23 22:30:36 -03:00
Sally Cochenour
a12d6885a3 Merge branch 'gl-dropshadows' into oglshaderport 2020-01-17 22:29:31 -05:00
fickleheart
2b7d75126e Add DBG_VIEWMORPH to view pre-transformed view 2020-01-17 20:39:15 -06:00
Alam Ed Arias
b97b9ac7a8 Merge branch 'master' into next 2020-01-16 20:18:54 -05:00
James R
f8666d6cee Merge branch 'word' into 'master'
Word jumping

See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00