Commit graph

680 commits

Author SHA1 Message Date
James R
5ed55aca3d Disable wad loading in TESTERS build 2022-02-14 14:22:29 +01:00
Sally Coolatta
16730b02ef Merge branch 'master' into profiles 2021-12-25 06:10:51 -05:00
Sally Coolatta
e628894b47 Merge branch 'new-menus' into profiles 2021-12-25 06:09:53 -05:00
James R
de0b2c2e75 Add followers before patch 2021-12-18 21:00:30 -08:00
James R
efa92b0206 Add followers.pk3 to main files list 2021-12-18 20:40:56 -08:00
SinnamonLat
7c9f3385d4 Merge branch 'master' into new-menus 2021-12-17 12:32:01 +01:00
James R
29399f6033 Send R_GenerateBlendTables number crunch to parallel thread 2021-12-15 15:34:51 -08:00
SinnamonLat
019d15ccd5 Merge branch 'master' into new-menus 2021-12-10 14:17:58 +01:00
Sally Coolatta
d067c1ddef First pass on character select device select
Ultra mega hacked in, by saving all "discarded" joysticks to an array so they don't get totally closed & we can still poll them. Events now properly send the device number instead of the player number, which means we can store all controllers pressing buttons, and thus, can detect when ANY controller is pressing anything, and THUS we can make the character select work like we wanted to :V

Did not bother fixing any of the bugs, however. First of all, the opening menus do not properly fallback to default controls. Yet again, we may need a more robust system -- storing all keys from gamekeydown separately? Additionally it seems like when I input gamepad it makes me use keyboard anyway, so I think something fishy is up.
2021-12-06 17:43:52 -05:00
Sally Coolatta
7d0597d864 Merge branch 'master' into profiles 2021-12-04 15:46:28 -05:00
James R
a64263c96d Merge remote-tracking branch 'origin/master' into new-menus 2021-12-03 14:56:48 -08:00
Sally Coolatta
6ecac4159a This seems to fix the camera stuttering in netgames when I try it on my own
Feel like this might be wrong so TRY IT first!!
2021-12-01 06:45:02 -05:00
Sally Coolatta
43356ca73e Nope, it actually just causes camera hitches even when alone, even if this fixes the problem its not the solution 2021-11-30 18:10:51 -05:00
Sally Coolatta
4a8222d397 Just set default renderdelta when paused
Supports multiple pause types too
2021-11-30 14:28:27 -05:00
Sally Coolatta
f19e8be3a0 Enable lagless cam
I left it off because I think Kart intentionally removed it, but the reason we did might not apply anymore...?
2021-11-30 14:03:56 -05:00
Eidolon
f398004a18 Ensure + commands get executed before map start 2021-11-29 07:25:46 -05:00
Sally Coolatta
f16b567319 Menu interpolation (renderdeltatics)
`renderdeltatics` can be used as a standard delta time in any place,
allowing for smooth menus. It will always be equal to `realtics`
when frame interpolation is turned off, producing consistent
framerate behavior everywhere it is used.

Co-Authored-By: Eidolon <furyhunter600@gmail.com>
2021-11-29 07:23:04 -05:00
Eidolon
1550210188 Implement interpolation at the renderer level
Instead of interpolating thinkers, we interpolate mobjs inside the
renderer. Further interpolation is TBI.
2021-11-29 06:43:46 -05:00
Sally Coolatta
cd8862f0bc New input handling
Events have a player ID instead of adding billions of keys for separate gamepads. Axis movement (mouse movement, analog sticks) now are counted as keys, so axes don't need to be separately implemented for all controls. Game controls emulate a Saturn controller (some of the external functions like screenshot / gif should be readded, but I got lazy)

This will allow later us to save a config for a controller that can be reused for any player slot, which is one of the main goals for profiles.

Only just enough was made to use the new input system to make it compile. Menus in this branch should aim to move to using PlayerInputDown entirely, instead of using hardcoded keys & simply remapping to those
2021-11-26 14:56:25 -05:00
SinnamonLat
1412b96b20 EXPERIMENTAL: Save last 3 IPs manually joined to allow rejoining them later 2021-11-16 23:03:46 +01:00
SinnamonLat
cbf108a627 autoload newmenus.pk3 2021-11-13 19:36:42 +01:00
toaster
b4af07ffed Merge branch 'master' into new-menus
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/v_video.c
#	src/y_inter.c
2021-10-18 01:18:37 +01:00
Latapostrophe
f2f0a6cbe2 New titlecards 2021-04-30 18:11:36 +02:00
Sally Coolatta
c0ba14a752 Use sounds.pk3 instead of sounds.wad 2021-04-25 20:42:25 -04:00
Sally Coolatta
8bb1fa57d4 Merge branch 'master' into 22-merge-again 2021-04-05 01:11:26 -04:00
James R
04b6911e21 Merge branch 'sloped-camera' into 22-merge-again 2021-04-01 20:55:22 -07:00
toaster
72defa325f * Add a seperate step for I_STARTUPSKINS - "Load characters" - since it takes a similar length to loading all other types of sprites.
* Adjust several loading strings, and left-align their rendering.
* Don't call HU_LoadGraphics() again (startup cached ALL FONTS twice).
* Adjust when some functions are called during loading to more effectively compartmentalise sections of loading that depend on each other.
    * LOADED_ISTARTUPGRAPHICS now comes after SCR_Startup, as we can explicitly guarantee the palette has been loaded after that function.
    * Make sure everything closely related to configurations (gamedata, console stuff, etc) which is not directly dependent on anything else is loaded under LOADED_CONFIG - "Load settings" (formerly LOADED_MINIT).
    * The `-warp` command line parameter is now checked alongside LOADED_DCHECKNETGAME.
* Don't attempt to draw the loading bar before LOADED_ISTARTUPGRAPHICS, as the palette is not loaded, which means you're wasting cycles on a white screen.
2021-03-29 17:02:08 +01:00
toaster
f7f1202a37 woops 2021-03-28 20:20:06 +01:00
toaster
99a764dbc0 Loadbar plus.
* Resolves #145.
* Increased granularity, to seperate out texture loading and sprite loading from other render structure initialisation.
* Shows small loading string in DEVELOP builds, to show where we can optimise loading times when we're polishing.
* Clean up con_refresh/startup, which got split into two variables in the merge by mistake.
2021-03-28 20:16:47 +01:00
James R
ec00710396 Use 2.2's version of the -warp parameter 2021-02-28 21:51:44 -08:00
Sally Coolatta
4c9aceded1 Merge remote-tracking branch 'srb2/next' into 22-merge-again 2021-02-28 21:03:09 -05:00
Jaime Ita Passos
a8909190ff Fix "implicit declaration of function 'DEH_TableCheck'" warning 2021-02-27 12:04:48 -03:00
James R
6cb0e9667d Conflicts da7e79ac83 d5688f53a0 2021-02-27 03:29:01 -08:00
James R
1ce3a7dd56 Conflicts cb3660331a 031665cdf 2021-02-27 03:26:17 -08:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
X.organic
5e832ece89 Move Dehacked table sanity check to deh_tables.c 2021-02-16 19:46:31 +01:00
James R
dd5223f4d7 Draw an icon above players when they are typing in chat or console
A little speech bubble is drawn, with dots cycling as they type.
No typing = no dots.
2021-02-16 09:24:22 -08:00
Sally Coolatta
2af75a2bd1 Fix merge conflicts 2021-01-11 00:06:34 -05:00
Sally Coolatta
a14cf1f029 Merge branch 'master' into new-menus 2021-01-10 21:31:09 -05:00
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