James R
bd560130d5
Merge branch 'holy-zip' into 'next'
...
Disallow pk3s with extra bytes
See merge request STJr/SRB2!1275
2020-12-10 15:21:20 -05:00
James R
2e649de64f
Merge branch 'high-resolution-timer-2' into next
2020-12-10 02:55:02 -08:00
James R
d5688f53a0
Don't print W_VerifyFile errors more than once
2020-11-28 20:51:21 -08:00
Jaime Ita Passos
490758eac2
Remove SHORT macros for referencing patch width/height/offsets
2020-11-22 20:02:47 -03:00
Jaime Ita Passos
2170ca3a50
Some interface fixes
2020-11-22 17:22:18 -03:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
Sally Coolatta
e6a9e5a68e
Merge branch 'master' into new-menus
2020-11-08 02:49:28 -05:00
James R
27fbf77922
Huge perfstats refactor
...
I needed to update it to make it functional with the precise timer. But I also
got sick of looking at the mess of sprintf followed by draw call.
2020-11-07 01:32:59 -08:00
James R
81b8abed53
Merge remote-tracking branch 'origin/master' into paper-items-i-hate-my-life
2020-10-28 21:51:28 -07:00
James R
f5329f25bf
Use music.pk3
2020-10-27 17:20:57 -07:00
Sally Coolatta
b83f9afecb
Merge branch 'master' into battle-rethink
2020-10-26 22:22:40 -04:00
James R
9bff8c2ecb
Remove the other -splitscreen parameter
2020-10-26 19:03:24 -07:00
Sally Coolatta
1665e72b99
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-25 13:56:53 -04:00
Sally Coolatta
c93330bf20
Use enum for better maintainability & error checking
2020-10-25 11:34:15 -04:00
Sally Coolatta
3469ab12ba
Add extra warning for CON_STARTUP_LOADSTEPS being incorrect
2020-10-25 10:48:32 -04:00
Sally Coolatta
12f56d64a7
Adds a simple white loading bar at the bottom of startup, instead of covering the cool reference with text
...
Mockup of what it looks like, since the window's invisble when you try to print-scr it: https://cdn.discordapp.com/attachments/275750804227489794/769931098636943391/unknown.png
2020-10-25 10:35:24 -04:00
Sally Coolatta
2509d5a29c
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-24 21:39:32 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Sally Coolatta
fda698a290
Merge master
2020-10-24 18:34:07 -04:00
Louis-Antoine
ddec491b0b
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate
2020-10-24 16:21:44 +02:00
Sally Coolatta
7430df5f4f
Fix time limit, make overtime kill you instantly and close in faster, remove minimum radius
...
Radius SHOULD be doubled to 8192 to be reasonable... but something gets severely messed up, makes me MAD
2020-10-22 05:36:36 -04:00
James R
f34a761d48
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
James R
737ea51ace
Merge remote-tracking branch 'origin/the-scary-22-merge' into sloped-camera
2020-10-04 16:32:19 -07:00
gm3k4g
73ae63d8c4
Added splitscreen command line parameter
2020-10-05 00:12:13 +03:00
James R
3dad7ca226
Move HU_LoadGraphics after startuppwads are loaded
...
This is needed for graphics replacements to take effect.
2020-10-02 11:54:58 -07:00
James R
d612fb5c99
Add wads from the -file parameter after netvars are registered
...
This is so netvars registered by any lua scripts will load in the correct order.
2020-10-01 16:50:31 -07: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
Lachlan Wright
0060bac482
Merge branch 'more-stats' into 'next'
...
Add tic and UI times to render stats
See merge request STJr/SRB2!1125
2020-09-25 08:54:01 -04:00
James R
c9e3281b99
Merge remote-tracking branch 'origin/master' into tinnitus
2020-09-25 01:57:08 -07:00
James R
68bd632bac
You have entered the comedy area
2020-09-24 16:49:34 -07:00
James R
031665cdfc
View morph splitscreen support!
...
There are some issues I ran into:
- Rotation is jittery (not introduced by this commit)
- 2P is wack, I don't care
2020-09-23 17:50:47 -07:00
James R
997d142cb5
SPLITSCREEN FOV
...
Object tracking is off, but it was off before so I don't know if I actually
broke it. Minor refactoring in HWR_RenderPlayerView and HWR_RenderSkyboxView.
2020-09-23 17:50:47 -07:00
James R
d0bdbff9f9
Add back R_ApplyViewMorph
2020-09-23 17:50:47 -07:00
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
