stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-27 19:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
15168 commits 175 branches 42 tags 316 MiB
Commit graph

187 commits

Author SHA1 Message Date
Hanicef
914cb167a4 Fix console binds incorrectly respecting layout keys 2024-02-08 21:50:43 +01:00
Logan Aerl Arias
456f7ef9a6 Merge branch SRB2:next into devmode-hudlines 2023-12-31 16:43:54 +00:00
Logan Aerl Arias
f5ac585338 Merge branch 'bind-multi-arg' into 'next' 
Allow `bind` to accept more arguments for a command.

See merge request STJr/SRB2!1596
 2023-12-31 14:24:39 +00:00
Lactozilla
2ef5ea86f3 Don't toggle the console if shift is held 2023-12-26 18:31:11 -03:00
Lactozilla
1f65c55074 Don't add text to the console on the same frame it's being toggled 
Resolves #1161
 2023-12-26 18:29:41 -03:00
Lactozilla
a266fbb6a0 Revert 6c701a9312 2023-12-26 17:53:38 -03:00
Logan Aerl Arias
6c701a9312 Revert "Merge branch 'native-keyboard-layout-support' into 'next'" 
This reverts merge request !1952
 2023-12-26 19:21:09 +00:00
Logan Aerl Arias
63a5361d3a Merge branch 'native-keyboard-layout-support' into 'next' 
Implement support for native keyboard layout

See merge request STJr/SRB2!1952
 2023-12-25 23:57:51 +00:00
Gustaf Alhäll
fa050cdebf
Redesign search mechanism 2023-11-18 20:44:26 +01:00
Krabs
4e9915e1ba Merge branch SRB2:next into bind-multi-arg 2023-10-31 04:46:53 +00:00
Zwip-Zwap Zapony
cd6cd53959 Combine vid.dupx and vid.dupy 2023-10-30 04:38:51 +00:00
Alam Ed Arias
2b7e38726e Merge branch SRB2:next into bind-multi-arg 2023-10-25 19:50:36 +00:00
Alam Ed Arias
f2fa2505cd Merge branch SRB2:next into native-keyboard-layout-support 2023-10-25 19:05:06 +00:00
Zwip-Zwap Zapony
8077a1db8f Always allow con_hudlines when using devmode 2023-08-14 19:55:47 +02:00
Sal
3a52e6deb2 Merge branch 'waiting-players-intermission' into 'next' 
SRB2Kart netcode ports

See merge request STJr/SRB2!2019
 2023-07-24 18:03:45 +00:00
sphere
b1e3589210 Merge branch 'hudlines-hudtime-fix' into 'next' 
Fix con_hudlines being off by one, Fix con_hudtime overflow

See merge request STJr/SRB2!1931
 2023-07-18 19:47:21 +00:00
Sally Coolatta
80bf4d6c2d Port SRB2Kart join on intermission fix 
All gamestates besides GS_LEVEL are unsupported by the save game functions. This commit forces players joining during these gamestates into GS_WAITINGPLAYERS, which is a basic gamestate that just maintains the connection until we can enter the start of a new one. Also provides an extremely simple drawer for GS_WAITINGPLAYERS so the joining player knows what's going on.
 2023-07-16 20:53:28 -04:00
Zwip-Zwap Zapony
4d4910c918 Use 99999999 instead of 86400, make "MIN" 0 
Nines might be more pleasing than an exact number for con_hudtime
It'd be bad to make "MIN" in an old config suddenly start displaying lines for con_hudlines
 2023-06-13 14:02:19 +02:00
sphere
cd1b57a901 Merge branch 'textcolortweaks' into 'next' 
Small text colormap tweaks

See merge request STJr/SRB2!1971
 2023-06-09 11:33:26 +00:00
sphere
c37af2bf78 Merge branch 'uncap-console' into 'next' 
Interpolate console animation, Make con_height update on the fly

Closes #905

See merge request STJr/SRB2!1878
 2023-05-25 22:36:24 +00:00
Gustaf Alhäll
b8f8cc1451
fixup! fixup! Implement support for native keyboard layout 2023-05-23 17:40:13 +02:00
Gustaf Alhäll
95d7a486ee
Implement support for native keyboard layout 2023-05-23 17:40:09 +02:00
spherallic
98dcf2d228 Tweak yellow/green/blue/red/peridot text colors 2023-04-24 23:23:47 +02:00
sphere
2df3fb53da Merge branch 'strong-lua-command-restrictions' into 'next' 
Fix up Lua command/cvar safety

See merge request STJr/SRB2!1943
 2023-04-12 17:50:01 +00:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
James R
8a6f2e568b Add a flags parameter to COM_AddCommand 2023-03-15 16:40:21 -07:00
Zwip-Zwap Zapony
702b2acfd3 Limit con_hudtime to 24 hours 
Also rename cons_msgtimeout to cons_hudtime for consistency
 2023-02-04 17:35:44 +01:00
Zwip-Zwap Zapony
cc6eac0886 Fix con_hudlines being off by one 2023-02-04 17:34:43 +01:00
Eidolon
e5dea805fa Revert "Merge branch 'gamepad-refactor' into next" 
This reverts commit 696e2ab909, reversing
changes made to d98d59494f.
 2023-01-26 19:26:28 -06:00
Zwip-Zwap Zapony
396db189e7 Draw the input prompt while the console is moving 2022-11-20 11:51:40 +01:00
Zwip-Zwap Zapony
435e1f6e7e Make con_height adjustable on the fly 2022-11-20 11:50:57 +01:00
Zwip-Zwap Zapony
256d9b5fdb Uncap console opening/closing animation 2022-11-20 11:50:01 +01:00
Jaime Ita Passos
46f7fa406f Refactor gamepad code 
Implements the SDL Game Controller API, haptics, and axis bindings.
 2022-11-14 00:37:08 -03:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
sphere
b83de902a5 Merge branch 'less-console-text-draw' into 'next' 
Pause the console refresh while startup wads are loading. (Competing with !1347) (Resolves #412)

Closes #412

See merge request STJr/SRB2!1357
 2021-11-26 13:57:55 +00:00
Tatsuru
6ed063dcce Merge branch 'polish-lua-inputs' into 'next' 
Polish the Lua input library

See merge request STJr/SRB2!1598
 2021-09-11 14:59:41 +00:00
Tatsuru
eec765749b Merge branch 'drawcroppedpatch-improvements' into 'next' 
V_DrawCroppedPatch(...) Lua exposure and improvements

See merge request STJr/SRB2!1316
 2021-09-10 16:14:38 +00:00
LJ Sonic
5340db5f67 Make gc_ constants uppercase 2021-08-15 16:15:28 +02:00
LJ Sonic
772695741c Rename KeyNumToString to KeyNumToName and vice-versa 2021-08-15 15:24:23 +02:00
GoldenTails
99c4cc246e Rework bind command's argument list to accept additional arguments as arguments to the command being bound. 2021-08-14 21:54:19 -05:00
LJ Sonic
5bc0ce7a62 Give fields in event_t better names 2021-08-14 23:42:39 +02:00
LJ Sonic
cfa48574be Merge branch 'next' into 'lua-inputs' 
# Conflicts:
#   src/lua_script.c
 2021-06-19 10:34:48 -04:00
sphere
c266a27073 Merge branch 'master' into 'master' 
Fix console text bleeding

See merge request STJr/SRB2!1434
 2021-06-06 07:01:30 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Zwip-Zwap Zapony
acff5c1ada Merge branch 'next' into drawcroppedpatch-improvements 2021-04-25 10:15:16 +02:00
SwitchKaze
c3d5740e98 Fix console text bleeding edge case 
A single character could prematurely read if there were enough special characters to push 'c' past 'con_width'.
 2021-04-06 15:06:44 -05:00
James R
84191252d2 Remove code that converts uppercase letters to lower, when coming from dedicated console 2021-04-04 17:01:54 -07:00
SwitchKaze
3895c02330 Revert "Remove key stuff" 
This reverts commit a439e569
 2021-04-02 15:46:08 -05:00
SwitchKaze
cb3a8f7a58 Remove key stuff 2021-04-02 15:46:08 -05:00
SwitchKaze
3faa98cf4a Expose inputs to Lua 2021-04-02 15:45:59 -05:00