James R
1c0ddc7bca
P_AddWadFile: only reload graphics when replaced
2021-12-17 02:41:47 -08:00
James R
8de36a9ab0
Load titlecard font with font system
2021-12-17 02:41:34 -08:00
James R
8012d00684
Add HU_UpdatePatch, recaches patch only if it exists in pwad
2021-12-17 01:07:54 -08:00
Sally Coolatta
f17b948491
Update how input is handled in menus to use key bindings
...
VERY broken right now, it lost the delay between key presses. Kinda already sick of the reorganization needed though
2021-11-29 12:02:56 -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
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
toaster
00972a83d2
remove the prefix since everything seems to function
2021-04-17 11:30:08 +01:00
toaster
b3d006b093
structs gunched
2021-04-17 00:27:13 +01:00
toaster
40cbc30bff
Mammoth commit, sorry.
...
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.
Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.
If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
Sally Coolatta
420a6ccccb
Fix Dehacked loading
2021-02-28 22:39:47 -05: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
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
LJ Sonic
0117cedd70
Show an alternate ping icon when the player is disconnected
2021-02-15 22:19:48 +01:00
LJ Sonic
9c9d7c07ab
Make the names of disconnected players flicker in tab HUD
2021-02-15 16:21:26 +01:00
Sally Coolatta
8289bf252f
Chengi's menu selectors
...
- Menu BG image is defined by menu option
- Menu BG image slides in
- Gamemode menu options are now like Chengi's mockup
2021-01-13 01:16:14 -05:00
LJ Sonic
dd1d2314f7
Let Lua toggle the crosshair
2020-12-29 21:36:15 +01:00
Jaime Ita Passos
490758eac2
Remove SHORT macros for referencing patch width/height/offsets
2020-11-22 20:02:47 -03:00
Sally Coolatta
e6a9e5a68e
Merge branch 'master' into new-menus
2020-11-08 02:49:28 -05: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
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
SteelT
6a168ac5e9
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Sally Coolatta
a251c3909b
Lots of little fixes
...
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
2020-08-16 00:29:04 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
James R
e1a745db1f
REMOVE THE LAST OF CV_ALLCAPS
2020-08-14 21:01:41 -07:00
Sally Coolatta
1500d682d2
hu_stuff & y_inter
2020-08-14 01:06:55 -04: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
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
135e9b9797
f_finale now compiles
2020-08-11 23:13:25 -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
c96bd5f64a
Many removals
...
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
2020-08-10 21:45:51 -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
1a058cb0cd
Fix extra V_MAGENTAMAP definition
2020-08-10 17:07:47 -04:00
Sally Coolatta
3f68fa02d1
Merge hu_stuff.c
2020-08-10 14:21:22 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
3ebc8517be
Merge hu_stuff.c/h
2020-08-06 10:52:00 -04:00
Sally Coolatta
f3a607bf4f
Proper snapping for splitscreen!
2020-07-26 21:35:13 -04:00
Jaime Passos
10189ecdc0
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-21 22:25:00 -03:00
Jaime Passos
c385eca5d2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -03:00
Jaime Passos
615c7121ed
gr_ -> gl_
2020-07-06 01:15:08 -03:00
LJ Sonic
5c61f059e8
Merge branch 'sf_nosupersprites' into 'next'
...
Add SF_NOSUPERSPRITES
See merge request STJr/SRB2!1000
2020-07-04 06:51:11 -04:00
James R
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
lachwright
47b9a296b3
Whoops, forgot hu_stuff.c
2020-06-17 05:27:42 +08:00
Sally Coolatta
3e36e15628
Merge master
2020-06-08 00:52:37 -04:00
James R
5f39dba432
Don't add color code to string address
2020-06-07 19:36:29 -07:00
Sally Coolatta
a3ec4f22a1
Finished nametags
2020-06-03 23:29:43 -04:00
Sally Coolatta
120dc253af
Merge remote-tracking branch 'origin/iwantmychat' into nametags
2020-06-03 20:19:26 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
toaster
97e261f443
Fix some issues with the tab rankings and end screen that bots exposed.
...
* Laps now have an initial zero instead of being directly indexed from 1, so start counting from there.
* Clean up the circumstances under which LAGLESS! is shown next to a name - specifically removing it from both non-netgames in general, and bots in netgames.
* Fix `(powertype == -1)` being broken on the intermission drawer, which was especially obvious with bots outside of netgames.
2020-05-22 21:27:55 +01:00