James R
7533109dfc
Fix few poor conflict resolution
2020-09-20 14:24:50 -07:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
James R
2d5b48e08c
Disable DRPC if dedicated
2020-09-15 19:56:08 -07:00
James R
7b1f974397
Basically, update master server code to v2
...
Removes rooms, replaced with cv_advertise and "Advertise" on the host menu.
According to the new API, SRB2APPLICATION is sent instead of MODID. A contact
field was added, but there is no means of accessing it or setting it.
As a slight change, the server list will be populated even on an outdated
version of the game. (The new API was designed with this in mind.) The update
alert is still presented first of course.
2020-09-11 06:11:41 -07:00
Steel Titanium
861118ac53
Allow the game to continue even if the STARTUP lump is somehow missing
2020-09-01 14:46:03 -04:00
Steel Titanium
ca08a7675c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat
2020-09-01 13:54:27 -04:00
James R
6466291ac6
Oops :v
2020-08-31 19:34:43 -07:00
James R
d78befc713
Merge branch 'master' into next
2020-08-31 16:10:05 -07:00
James R
e4b7257ec9
Fix NOHW compiling
2020-08-31 16:09:41 -07:00
James R
9ad0a0660c
Just SetCurrentDirectory to the exe's folder on windoze
2020-08-31 01:23:56 -07:00
Steel Titanium
2f06ff44cc
Add new STARTUP lump, for the splash screen
2020-08-28 17:11:38 -04:00
Sally Coolatta
61d6ee0982
Misc changes to how the program runs
...
- Call DRPC_Init at the end of D_SRB2Main instead of in the middle
- Call Discord_RunCallbacks in D_SRB2Loop instead of G_Ticker
- Fix errorcount nums in I_Error, an old leftover from when Discord_Shutdown was not handled by I_AddExitFunction
2020-08-27 18:50:36 -04:00
Sryder
ce18be8a7d
Fix the splash screen again, I accidentally got rid of scaling
2020-08-23 19:30:08 +01:00
Hannu Hanhi
baaf19249b
Add tic and ui times to render stats
2020-08-23 20:09:55 +03:00
Sryder
3c10405852
Fix instant crash on startup in OpenGL
2020-08-18 15:58:28 +01:00
James R
45091555b2
hate hate hate hate
2020-08-17 21:22:25 -07:00
James R
a29785aec3
Save srb2path to %LOCALAPPDATA%\SRB2Kart\lastwaddir, and chdir here if srb2.srb cannot be found
...
Windows code goes brrr
2020-08-17 20:11:32 -07:00
Sally Coolatta
b5a378f850
Merge remote-tracking branch 'public/master' into discord-rpc-support
2020-08-16 22:12:36 -04:00
Sally Coolatta
632df264a3
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-16 20:57:31 -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
172ffea590
update srb2win.rc, D_ConvertVersionNumbers uses kart's 2 number style instead of vanilla's 3 number style
2020-08-15 11:54:50 -04:00
Sally Coolatta
631f698432
Cleanup
...
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.
I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
2020-08-15 08:32:56 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Jaime Passos
cb3660331a
Refactor renderer switching
2020-08-14 22:27:16 -03:00
Louis-Antoine
8471f9e71f
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
...
# Conflicts:
# src/d_clisrv.c
# src/d_clisrv.h
# src/d_net.c
# src/p_saveg.c
# src/p_saveg.h
2020-08-13 13:53:10 +02:00
Sally Coolatta
5319ef434e
Compiling reaches g_demo.c again after the merge
2020-08-12 22:40:15 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
7b4d84c3f3
Merge remote-tracking branch 'public/master'
2020-08-12 18:55:43 -04:00
Sally Coolatta
b9436ee015
More fixing up
...
Got tired again, but now it makes it to f_finale
2020-08-11 18:46:00 -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
a442b6a4f6
Fix up D_SRB2Main
2020-08-10 21:11:46 -04:00
Sally Coolatta
76241bb26b
D_AddFile fixes
2020-08-10 20:35:17 -04:00
Sally Coolatta
a8a88c9e53
This string got really mad at me for this
2020-08-10 20:09:40 -04:00
Sally Coolatta
7ac6723e46
gamecontrol has another index for player num, instead of being duplicated for players 2-4
2020-08-10 20:08:32 -04:00
Sally Coolatta
a6b2bc99de
Demo variable fixes
2020-08-10 19:42:45 -04:00
Sally Coolatta
78d4d3c3e9
Fix broken indenting in D_Display
2020-08-10 19:30:05 -04:00
SteelT
9446a397d6
Remove some stray endifs
2020-08-10 18:45:32 -04:00
Sally Coolatta
a68d68f8db
Some D_Display issues
2020-08-10 17:29:27 -04:00
Sally Coolatta
3b34b3230c
Bruh
2020-08-10 12:01:11 -04:00
Sally Coolatta
2710d50d99
Merge d_main.c
2020-08-10 12:00:37 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
James R
f9e74e8ba2
Merge branch 'kill-cd-support' into 'next'
...
Kill CD support
See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
James R
42dbdd8c4a
Merge branch 'http-mserv' into 'next'
...
HTTP Based Master Server + Multithreading
See merge request STJr/SRB2!940
2020-08-09 20:24:26 -04:00
Jaime Passos
a7f3dd7eff
Refactor patch loading
2020-08-08 05:16:47 -03:00
Steel Titanium
913c07959e
Kill CD support
2020-08-07 17:06:19 -04:00
James R
9077a4ff03
Kill MIDI
2020-08-07 12:39:08 -07:00
Sally Coolatta
c1b1641f35
Merge d_main.c
2020-08-02 14:45:23 -04:00
Steel Titanium
62c85ea4a5
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
47719474ef
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-13 08:58:43 -07:00
James R
3a34fa8561
Merge remote-tracking branch 'origin/master' into next
2020-07-12 17:11:22 -07:00
