Commit graph

220 commits

Author SHA1 Message Date
Sally Coolatta
e1ffc206e7 Finish some unused SDL hat input support to use events rather than polling all of the time 2025-03-11 15:17:51 +01:00
GenericHeroGuy
e61c43a852 Merge branch 'blankart-dev' into newinput 2025-03-10 23:26:30 +01:00
NepDisk
b9ad30c9e2 Add BlanKart Credits and append new scene to intro 2025-03-08 11:00:54 -05:00
GenericHeroGuy
84850ba8a3 Update input handling in menus to use key bindings (port-ish of f17b9484)
G_GetControlForKey -> G_ControlBoundToKey, to make it usable everywhere
2025-03-07 18:12:59 +01:00
Indev
5a0303d649 Only add command to history if it differs from previous one 2025-03-04 15:14:23 -05:00
James R
b31e79b742 Kill last of DJGPP, WATTCP, _WINDOWS (ol' DirectDraw) 2025-02-25 00:42:42 +01:00
James R
8992878b84 Move choose and chooseweighted commands to command.c
Fixes disabled under dedicated and it's the appropriate
place for these. Effectively cherry pick of 35b82b6dd9
2025-02-24 21:08:18 +01:00
NepDisk
c72f81f4e8 Always show the loading text 2025-02-12 11:33:16 -05:00
GenericHeroGuy
6f032ce9c8 Revert "2.1 palette pt 1"
This reverts commit d22db75409.
2025-01-24 16:57:44 +01:00
Sally Coolatta
713ac093bf devmode cheat online 2025-01-10 11:36:04 -05:00
James R.
08e1dd870e Merge branch 'fix-map-plane-crash' into 'master'
Fix some R_MapPlane crashes in splitscreen; debugrender_visplanes and debugrender_portal; some multithreading crashes

Closes #1032 and #1021

See merge request KartKrew/Kart!1997
2024-12-29 14:15:32 -05:00
NepDisk
cf9f6fc570 Merge branch 'v2dev3' into ACS2 2024-10-21 17:30:55 -04:00
NepDisk
d22db75409 2.1 palette pt 1
this is a work in progress conversion to make the engine once again use the srb2 2.1 palette
2024-10-14 02:59:07 -04:00
Sally Coolatta
629b0aa77a ACS basic implementation
- BEHAVIOR lumps successfully load & run from maps. Currently they do not get unloaded between maps, though.
- Print and Timer are the only implemented CallFuncs. All of the base language functions (Delay, etc) are already implemented by the VM though.
- ACS compiler files are included, for use with GDCC. (Picked instead of ACC because it's less ZDoom-centric)
- Additionally, also added the configs for Zone Builder to be able to compile it in editor. Syntax highlighting is very incomplete atm.
2024-10-10 01:41:24 -04:00
NepDisk
ca85f4f94e allow the console anywhere (besides TA) 2024-09-19 20:47:09 -04:00
NepDisk
a32094605f Fix up loading 2024-09-07 11:58:30 -04:00
Zwip-Zwap Zapony
01166ba050 Draw the input prompt while the console is moving 2024-09-05 19:45:13 -04:00
Zwip-Zwap Zapony
34034b9054 Uncap console opening/closing animation 2024-09-05 19:45:07 -04:00
Zwip-Zwap Zapony
75e012c021 Make con_height adjustable on the fly 2024-09-05 19:41:36 -04:00
Wumbo
d1a9080187 Un-rebrand back to SRB2Kart 2024-08-13 21:54:52 -04:00
NepDisk
68482b4216 Add evil mutex bypass hack in console
a68c863087
2024-08-01 10:56:41 -04:00
NepDisk
fbb69305bf Use Kart/SRB2 console colors 2024-08-01 00:50:25 -04:00
Sal
a4d475dc4c Merge branch 'hostcode' into 'master'
HOSTCODE initial pass

Closes #240

See merge request KartKrew/Kart!615
2024-07-31 03:01:45 -04:00
Sally Coolatta
852e9b8ce9 Rebrand all console / window stuff 2022-05-19 15:10:47 -04:00
SwitchKaze
18f0ece073 Fix console text bleeding edge case
A single character could prematurely read if there were enough special characters to push 'c' past 'con_width'.
2022-03-18 17:15:13 +00:00
SwitchKaze
8ef8cb5b5f Fix console text bleeding 2022-03-18 17:15:00 +00:00
toaster
ba3e896655 Make the game loading-bar miniwindow do OS polling, to allow you to tab back into it without it being considered frozen by the OS. 2021-11-28 20:15:42 +00:00
James R
c4af0c2374 Merge remote-tracking branch 'srb2/next' into yet-another-next-merge 2021-04-06 16:20:44 -07:00
James R
aefc6fadbe Remove code that converts uppercase letters to lower, when coming from dedicated console 2021-04-04 17:01:54 -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
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
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
Sally Coolatta
1f082f15e6 Merge SRB2 master 2021-02-27 02:25:14 -05:00
toaster
f290a6c44d Resolves #87 after literally 7 months 2021-02-14 23:07:26 +00:00
GoldenTails
e3c52f4a3b Pressing A Key Combination In The Console Crashes SRB2
get stryder7x in on this
2021-01-05 13:20:02 -06:00
Zippy_Zolton
ffef054dee magenta and green sonicx 2020-12-15 22:19:57 -06:00
Zippy_Zolton
d90d18f33c fixes spaces 2020-12-14 16:14:20 -06:00
Zippy_Zolton
a5d7823f5e Redone colormaps by SonicX8000 2020-12-14 12:52:24 -06:00
Zippy_Zolton
f30ab44564 Merge branch 'next' of https://github.com/STJr/SRB2 into text-color 2020-12-14 00:16:38 -06:00
James R
19af2b9afe Remove trailing whitespace 2020-12-12 02:37:03 -08:00
Jaime Ita Passos
490758eac2 Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03: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
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
ddf466d61f Fix compile errors 2020-10-24 19:52:09 -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
325b481f17 81 2020-10-20 19:59:33 -05:00
Zippy_Zolton
6a705a7aa7 SonicX orange 2020-10-20 15:11:00 -05:00