Commit graph

508 commits

Author SHA1 Message Date
SteelT
2af1c6fc30 Fix sounds playing multiple times during intro if interpolation is on 2022-01-12 21:07:30 -05:00
Sally Coolatta
0179466107 Finalize char select multiplayer
- Add menu control fallbacks.
    - If it could not find a bind using your existing keys, then it looks at default controls.
    - If it could not find it then, and you're P1, then it looks through gamepads, and then lastly settles for keyboard.
    - Changed around the order of operations on the character select menu, to accommodate for this change.
- Added initroutine to menu_t, which is called every time without question when going to a new menu. This solves many, many minor bugs you could experience in the character select menu when changing between menus, due to things only being properly reset when selecting the character select menu option.
2021-12-28 12:02:31 -05:00
Sally Coolatta
e628894b47 Merge branch 'new-menus' into profiles 2021-12-25 06:09:53 -05:00
SinnamonLat
019d15ccd5 Merge branch 'master' into new-menus 2021-12-10 14:17:58 +01:00
toaster
a149fa9db9 GL now loads in netgames and doesn't memory leak
What is broken:
* Encore mode remapping in GL only
* Seizure effect in Daytona (NOT IVO SAFE)
* God knows what else has been waiting in the wings
2021-12-09 20:57:15 +00: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
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
Sally Coolatta
de1f67b72a Use strings in the map header for next level, marathon next, thumbnails, minimaps, encoremaps, and tweakmaps 2021-04-09 21:10:46 -04:00
Sally Coolatta
359cf86efb Merge branch 'master' into big-large-map-markers 2021-04-09 19:49:33 -04: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
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
Jaime Ita Passos
7e28b7d3e9 OpenGL backend: Manage uploaded GPU textures with an internal list
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
2021-01-27 17:48:57 -03:00
Tatsuru
8bc1904468 Put his name at the right order 2021-01-11 21:49:31 -03: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
Tatsuru
923cc0d8f2 Add Logan to the art credits 2021-01-10 23:17:40 -03:00
SteelT
29b5f38347 Merge branch 'master' into big-large-map-markers
# Conflicts:
#	src/d_netcmd.c
2021-01-09 15:52:34 -05:00
James R
15d4732015 Credits: add Zolton and Ors to the programming section 2020-12-10 13:40:47 -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
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
Sally Coolatta
91ed67bece Start on Chaos Emeralds
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -05:00
James R
8f68a21f2f Fix many instances of G_BuildMapName
Some things are gonna be busted. Fix it later, BYE.
2020-10-31 20:17:12 -07:00
James R
37c345c7eb Map lump names can be anything, map number is dynamically allocated 2020-10-30 20:10:31 -07:00
Sal
00c83dfcf9 Merge branch 'loading-screen' into 'the-scary-22-merge'
Loading bar for startup

See merge request KartKrew/Kart!322
2020-10-25 13:53:28 -04:00
Sally Coolatta
79a319ec02 Add a "title screen" 2020-10-25 11:34:58 -04:00
Sally Coolatta
c93330bf20 Use enum for better maintainability & error checking 2020-10-25 11:34:15 -04:00
Zolton Auburn
dded1554fe Update f_finale.c 2020-10-24 20:17:20 -04:00
Zolton Auburn
b9806cba7e Update f_finale.c 2020-10-24 20:16:21 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
Zippy_Zolton
a3728c2215 Credits Changes 2020-10-17 20:13:29 -05:00
Jaime Passos
b44837324f Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
sphere
5e876fc805 Fix Arrietty's name being misspelled. 2020-09-29 18:06:50 +02:00
sphere
e00753e427 Game design is a team effort. 2020-09-29 17:23:44 +02:00
sphere
c020257d1d Merge Programming and Programming Assistance, and some other tweaks. 2020-09-28 15:54:10 +02:00
sphere
5a1b87689b These people deserve to be in the credits proper, also formatting fixes. 2020-09-28 14:48:55 +02:00
James R
0c71e6f431 Add Jeck to the credits 2020-09-25 11:47:24 -07:00
Jaime Passos
98c6b54994 Improved memory management for patches 2020-09-07 02:23:07 -03:00
James R
c33f3e0cb2 Update SuperPhanto's name with real name per request 2020-09-02 17:59:53 -07:00
James R
e438d55720 Add SuperPhanto to the art credits 2020-09-01 18:51:47 -07:00
Steel Titanium
08aa1a5ad7 Fix compile error 2020-08-29 20:04:11 -04:00
Steel Titanium
13033c521b Attempts to make the intro a bit more shorter
Make the scene time be 5 seconds long max

Use the standard fade which is much shorter in length.
2020-08-29 19:28:16 -04:00
Steel Titanium
f0ec718aae Make the intro shorter as I felt it was a bit too long
Change the code a bit so less magic numbers.
2020-08-28 20:08:46 -04:00
Steel Titanium
6a37f39ca8 New STJR Intro, replaces the old PURE FAT intro 2020-08-28 17:10:54 -04:00
Sally Coolatta
b081dd5d7e Make title screen full black
Don't care about making it use our old title screen since we're replacing it anyway
2020-08-18 21:49:37 -04:00
SteelT
296e974e9d Fix the title music being played early 2020-08-18 15:09:09 -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