Sally Coolatta
9bf325eec6
Put the cvar in the menu
2020-08-17 02:31:30 -04:00
James R
b681b6e9e6
Do not do master server things when NOCURL
2020-08-16 21:42:58 -07:00
Sally Coolatta
3a94a2db44
enum for the different face icon types
2020-08-16 03:45:09 -04:00
Sally Coolatta
a2caa2dc16
Character select can open without crashing
2020-08-15 22:40:49 -04:00
Sally Coolatta
e0e506ec55
Ran through a different compiler, fixing the minor warnings it had
2020-08-15 09:32:10 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Sally Coolatta
9efdc98de6
Makes it through all kart files
...
All that's left is SDL, OGL, maybe also Lua
2020-08-15 04:42:56 -04:00
Sally Coolatta
c09e54d073
m_menu compiles
2020-08-14 06:28:35 -04:00
Sally Coolatta
2f2e813e52
m_anigif, m_cheat, m_cond, m_fixed
...
Up to m_menu, and it's screaming, so I'm going to take a break :V
2020-08-14 01:31:37 -04:00
Sally Coolatta
6ef0af4ba5
g_game and g_input now compile
2020-08-13 00:05:44 -04:00
Sally Coolatta
5319ef434e
Compiling reaches g_demo.c again after the merge
2020-08-12 22:40:15 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
7b4d84c3f3
Merge remote-tracking branch 'public/master'
2020-08-12 18:55:43 -04:00
Sally Coolatta
f8d1e75025
Merge remote-tracking branch 'public/next'
2020-08-12 18:50:41 -04:00
Sally Coolatta
b9436ee015
More fixing up
...
Got tired again, but now it makes it to f_finale
2020-08-11 18:46:00 -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
a50a9a1843
Lots of splitscreen fixes
...
LOTS of stuff I changed to use arrays instead of constantly duplicated code
2020-08-10 23:38:32 -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
Sal
80d37b1939
Merge branch 'http-mserv' into 'master'
...
Make the HTTP Master Server official
See merge request KartKrew/Kart-Public!193
2020-08-10 16:49:47 -04:00
Sally Coolatta
0b6621371c
master m_menu again
2020-08-10 15:19:03 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
James R
42dbdd8c4a
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
Sally Coolatta
90bd22aac3
Replace m_menu with ours
...
No, we're not fixing 229 conflicts for a file that we're completely deleting later.
2020-08-09 20:08:11 -04:00
James R
9955ff1357
Merge branch 'kill-dos' into 'next'
...
Remove support for DOS
See merge request STJr/SRB2!1090
2020-08-08 21:26:18 -04:00
James R
2e3b0ae4c8
Merge remote-tracking branch 'origin/next' into http-mserv
2020-08-08 15:05:03 -07:00
AJ Martinez
4f1642bbce
Clarify addon-related messages
2020-08-05 00:40:56 -05:00
Sally Coolatta
3d53adaa2b
Sliding HUD
...
- Split HUD stuff into k_hud.c/h
- V_SPLITSCREEN replaces the old function that sets V_SPLITSCREEN/V_HORZSCREEN flags system, and instead automatically moves it based on player number
- V_SLIDEIN makes HUD items slide in after the intro animation.
2020-07-26 05:47:53 -04:00
James R
38d9fddac2
Merge branch 'musicpref-var' into 'next'
...
Console variable to select music preference
See merge request STJr/SRB2!939
2020-07-25 20:14:22 -04:00
Steel Titanium
62c85ea4a5
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
Sally Coolatta
ba6d5e95ba
Add Sneaker x2 to pad out the item table a bit better
...
Jeck mentioned it, we agreed it might be a fun item because stacking sneakers is possible now
2020-07-24 19:11:52 -04:00
James R
47719474ef
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-13 08:58:43 -07:00
James R
e09a430804
Merge remote-tracking branch 'origin/next' into remove-glide-2
2020-07-12 16:05:15 -07:00
James R
84d9aa93c7
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-11 17:41:46 -07:00
toaster
517b243cb7
Hopefully fix the issue, which I can't recreate, of live event backups being created even if they shouldn't.
2020-07-10 21:27:34 +01:00
toaster
3c3143effa
Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback.
2020-07-10 21:24:25 +01:00
Latapostrophe
fb978f9b91
Merge branch 'v2-master' into followme-internal
2020-07-09 23:34:24 +02:00
SteelT
d67ad1a08f
Fully fix replay hut crashing if addons isn't loaded.
2020-07-09 00:29:46 -04:00
toaster
0f1280025d
M_RATHON header text.
2020-07-07 17:30:20 +01:00
Jaime Passos
615c7121ed
gr_ -> gl_
2020-07-06 01:15:08 -03:00
LJ Sonic
79857ea9e8
Merge branch 'patch-1' into 'next'
...
Rename "Legacy" control scheme
See merge request STJr/SRB2!1029
2020-07-04 06:50:15 -04:00
LJ Sonic
e4b5d85f31
Merge branch 'shift-when-hiding-in-1p-menu' into 'next'
...
Tweak display of hidden items in "1 Player" menu
See merge request STJr/SRB2!1013
2020-07-03 17:04:42 -04:00
colette
da537d8695
"Legacy controls" was a mistake of a name
2020-07-02 23:17:33 -04:00
Steel Titanium
db559d73d0
Correct comment
2020-06-29 23:57:39 -04:00
Steel Titanium
e0b524d6a9
Address compat with old-style names
2020-06-29 23:54:45 -04:00
Steel Titanium
f891c6cde4
Add support for saving/loading per-skin NiGHTS replays
2020-06-28 16:59:36 -04:00
Zachary McAlpin
feb56fc3b6
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-24 19:47:52 -05:00
Zwip-Zwap Zapony
fa9a140a45
Fix re-opening 1 Player menu re-lowering options
...
If an add-on disabled an option, re-opening the 1 Player menu
multiple times would lower the above options multiple times
Also fix Marathon Run and Tutorial being "perma-(un)lock"-able
2020-06-21 16:16:12 +02:00
Zwip-Zwap Zapony
940689d3ae
Tweak display of hidden items in "1 Player" menu
...
If an option in the "1 Player" menu is unavailable in an add-on,
lower the above options to close the gap from the invisible option
Also make Marathon Run display as question marks if locked
And also change "sploadgame" to "spstartgame"
2020-06-21 09:30:55 +02:00
SteelT
dbd5198ac2
Merge branch 'marathonmode' into 'next'
...
MARATHON RUN
See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00