incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16227 commits 1 branch 0 tags 204 MiB
Commit graph

1382 commits

Author SHA1 Message Date
Sally Coolatta
2d4818a9fc Fix mid-game render switch 2020-09-25 12:20:08 -04:00
Sally Coolatta
b5fcd74ef9 Merge master 
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
 2020-09-25 12:00:50 -04:00
James R
997d142cb5 SPLITSCREEN FOV 
Object tracking is off, but it was off before so I don't know if I actually
broke it. Minor refactoring in HWR_RenderPlayerView and HWR_RenderSkyboxView.
 2020-09-23 17:50:47 -07:00
toaster
23faef24d7 * Introduce SPR2_XTRA for face graphics, since the current system is prone to plenty of conflicts with modders if you're not careful. 
* Fixed a bug where you'd see :nick: on the current character selection screen if you didn't have many skins loaded.
* Fixed a bug where character skins loaded in PK3s would attempt to load every single lump of the PK3, even if it wasn't in the same subfolder as the original S_SKIN, as a sprite into the player struct. Could stand to be ported to vanilla.

Requires new chars.kart, which was created using the help of the indev 2.2-based Kartmaker update which will be available shortly.
 2020-09-23 23:46:54 +01:00
SteelT
50fe3a728c Fix M_DrawSetupMultiPlayerMenu crashing trying to draw null face graphics. 2020-09-22 23:03:00 -04:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
Sally Coolatta
9f775a169d Rename the "small" variable to "isSmall" 
Reported by MK, apparently "small" is considered a data type for some systems. After a little bit of research, apparently it can happen when including <windows.h>... whatever, just rename the variable :p
 2020-09-14 12:47:55 -04:00
James R
7b1f974397 Basically, update master server code to v2 
Removes rooms, replaced with cv_advertise and "Advertise" on the host menu.

According to the new API, SRB2APPLICATION is sent instead of MODID. A contact
field was added, but there is no means of accessing it or setting it.

As a slight change, the server list will be populated even on an outdated
version of the game. (The new API was designed with this in mind.) The update
alert is still presented first of course.
 2020-09-11 06:11:41 -07:00
Sally Coolatta
b8f1842855 Use ENTER and ESC 
A and B are v2 terminology
 2020-08-30 21:42:04 -04:00
Sally Coolatta
d755a7ae6c Fix skincolor selection 2020-08-23 14:51:02 -04:00
James R
688adb2055 Make join requests options on pause menu selectable even if you're already in the menu 2020-08-22 17:16:49 -07:00
Sally Coolatta
8c79d62b22 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-22 07:28:21 -04:00
Sally Coolatta
26295bb793 Ask to join is a menu option, rather than trying to replace your menu temporarily. 2020-08-22 07:16:52 -04:00
lachwright
0a32babc25 Compile m_menu.c without HAVE_DISCORDRPC 2020-08-22 16:58:59 +08:00
Sally Coolatta
1899b31fa7 Add envelope icon, add sounds 2020-08-22 04:54:08 -04:00
Sally Coolatta
5cab1b7b23 Menu is pretty now 2020-08-22 03:52:07 -04:00
Sally Coolatta
b761349076 Add some options, maxplayer/allownewplayer dont need to be netvars anymore 2020-08-22 01:53:27 -04:00
Sally Coolatta
42ac955584 Don't reset menu in drawing function 2020-08-21 04:17:36 -04:00
Sally Coolatta
734b099202 Invite menu started 
Functions! Is not pretty yet!
 2020-08-21 04:14:33 -04:00
SteelT
27945cfad0 Fix being unable to add Lua scripts from the addons menu 2020-08-18 17:55:49 -04:00
Sally Coolatta
1d5251e1f1 Fix ZONE being all caps, standardize the function comments 2020-08-17 06:13:32 -04:00
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