Commit graph

143 commits

Author SHA1 Message Date
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
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
SwitchKaze
6267abac8a Fix console text bleeding 2021-03-25 12:43:30 -05:00
GoldenTails
70eb3228f8 Pressing A Key Combination In The Console Crashes SRB2
get stryder7x in on this
2021-01-05 13:20:02 -06:00
Zippy_Zolton
45976d2304 magenta and green sonicx 2020-12-15 22:19:57 -06:00
Zippy_Zolton
07034cf441 fixes spaces 2020-12-14 16:14:20 -06:00
Zippy_Zolton
9b8bacd088 Redone colormaps by SonicX8000 2020-12-14 12:52:24 -06:00
Zippy_Zolton
c247b94be7 Merge branch 'next' of https://github.com/STJr/SRB2 into text-color 2020-12-14 00:16:38 -06:00
James R
b31c4db89d Remove trailing whitespace 2020-12-12 02:37:03 -08:00
Jaime Ita Passos
5293c52bca Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
Zippy_Zolton
88c882fa9c 81 2020-10-20 19:59:33 -05:00
Zippy_Zolton
0f771edfd5 SonicX orange 2020-10-20 15:11:00 -05:00
Zippy_Zolton
03198ab31d SonicX aqua 2020-10-20 14:59:30 -05:00
Zippy_Zolton
45dd26476a SonicX8000 purple, peridot, rosy 2020-10-20 14:52:25 -05:00
Zippy_Zolton
b65ac1df30 sonicx azure 2020-10-20 14:40:10 -05:00
Zippy_Zolton
0b48f1052a pencilvoid aqua 2020-10-20 14:03:27 -05:00
Zippy_Zolton
4e985d7145 blue & red really seem like a hassle don't they 2020-10-19 20:36:59 -05:00
Zippy_Zolton
04eae86d0a t 2020-10-19 19:58:50 -05:00
Zippy_Zolton
81c9d2eae9 forgot to send this like 3 hours ago 2020-10-19 18:41:23 -05:00
Zippy_Zolton
d633f2495a red abd bkyue sikbucx 2020-10-19 14:12:28 -05:00
Zippy_Zolton
e5c891932a improvement 2020-10-18 23:47:14 -05:00
Zippy_Zolton
fed2fffaa1 better colors 2020-10-18 22:52:40 -05:00
Zippy_Zolton
5dc90289dc thanks goldie 2020-10-18 21:59:34 -05:00
Zippy_Zolton
e2d686ba42 update 2020-10-18 17:45:46 -05:00
Zippy_Zolton
2403cbd57b possibly final 2020-10-18 17:01:31 -05:00
Zippy_Zolton
94cee68d41 Calloc 2020-10-18 16:41:14 -05:00
Zippy_Zolton
14aec09d13 possibly fixed 2020-10-18 16:21:06 -05:00
Zippy_Zolton
3b79ca4fae Improved text colormaps 2020-10-18 16:00:01 -05:00
Jaime Passos
b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
James R
15008f31a7 Merge branch 'sanity-meter-empty' into 'next'
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
355cc1a697 Merge branch 'autocomplete-aliases' into 'next'
Autocomplete aliases in console

See merge request STJr/SRB2!1113
2020-10-08 20:30:07 -04:00
James R
dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Steel Titanium
4eaa7e969f Add new STARTUP lump, for the splash screen 2020-08-28 17:11:38 -04:00
Jaime Passos
78cc4a78d0 Refactor renderer switching 2020-08-14 22:27:16 -03:00
Jaime Passos
1751d7afed Cache the console patch only once in CON_DrawBackpic 2020-08-14 20:48:15 -03:00
James R
aa19bce4a9 Autocomplete aliases in console 2020-08-14 00:00:45 -07:00
James R
8301e4f93c Merge branch 'word-delet' into 'next'
Word delete and backspace in console

See merge request STJr/SRB2!1092
2020-08-09 20:46:37 -04:00
James R
23f218117c Merge branch 'http-mserv' into 'next'
HTTP Based Master Server + Multithreading

See merge request STJr/SRB2!940
2020-08-09 20:24:26 -04:00
Jaime Passos
91ed56ef40 Refactor patch loading 2020-08-08 05:16:47 -03:00
Steel Titanium
0d48d4c833 WIP: Remove support for DOS
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
James R
a9a68474f7 Ctrl + Backspace/Delete in Console 2020-07-24 04:06:04 -07:00
James R
479bbeacbe Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
SteelT
bff6b19056 Merge branch 'marathonmode' into 'next'
MARATHON RUN

See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
James R
fec8879797 Use Unlock_state here too
(cherry picked from commit a6ce21b450644a79b08b9533166704c7ef093816)
2020-05-14 17:28:55 -07:00