Sally Coolatta
bd29d0c6bb
Check supported skins by name instead of number, so we can have bonuschars images
2020-08-17 04:42:05 -04:00
Ashnal
98ad0248f9
Move code down so declarations are above to appease C90
2020-08-17 04:03:02 -04:00
Ashnal
42f677447d
Move declaration to appease C90
...
also remove some extra tab characters
2020-08-17 03:56:13 -04:00
Ashnal
30f687d0df
Fixes for file accounting
...
mainwads+1 to not use the first mainwad
2020-08-17 03:51:19 -04:00
Ashnal
196514ff21
New message boxes for downloads and full server waiting
...
Downloads must be confirmed before proceeding
Allows downloading mods for full servers
Client will wait for a slot to open on a full server to join
This has a 5 minute timeout
2020-08-17 03:47:23 -04:00
Sally Coolatta
9bf325eec6
Put the cvar in the menu
2020-08-17 02:31:30 -04:00
Sally Coolatta
59ebf07dd5
Guard discord.h, add cvar to disable rich presence
2020-08-17 02:25:05 -04:00
Sally Coolatta
0c412459bf
Merge branch 'master' into next
2020-08-17 02:05:31 -04:00
Sally Coolatta
352449010e
Display time elasped/time limit
2020-08-17 02:05:16 -04:00
James R
b681b6e9e6
Do not do master server things when NOCURL
2020-08-16 21:42:58 -07:00
Sally Coolatta
5f86025f05
Use curl to retrieve your own IP address properly
2020-08-17 00:29:52 -04:00
James R
5d739bec6d
Remove HAVE_CURL guards on sending httpsource
2020-08-16 20:39:46 -07:00
James R
57019ae532
Merge branch 'IS-IT-1094' into 'next'
...
REMOVE THE LAST OF CV_ALLCAPS
See merge request STJr/SRB2!1116
2020-08-16 22:45:15 -04:00
Sally Coolatta
c70f706c2a
Allow lowercase level name / zone title
...
Might have some other side-effects, we'll need to see
2020-08-16 22:13:21 -04:00
Sally Coolatta
b5a378f850
Merge remote-tracking branch 'public/master' into discord-rpc-support
2020-08-16 22:12:36 -04:00
Sally Coolatta
7a9e781bea
Little fixes
2020-08-16 21:31:03 -04:00
Sally Coolatta
d31c33e035
No previous prototype for K_DropKitchenSink
2020-08-16 21:18:33 -04:00
Sally Coolatta
632df264a3
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-16 20:57:31 -04:00
Sally Coolatta
ac29aa86b0
Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge
2020-08-16 03:45:51 -04:00
Sally Coolatta
3a94a2db44
enum for the different face icon types
2020-08-16 03:45:09 -04:00
James R
a566a8e245
Revert "Disable animated textures"
...
This reverts commit 5e13555727
2020-08-16 00:10:49 -07:00
Sally Coolatta
9863171879
Remove MF_BOUNCE, use MF_SLIDEME to enable P_SlideMove for an object
2020-08-16 03:03:04 -04:00
Sally Coolatta
8fd64ca607
Fix ring usage & gravity
2020-08-16 02:12:17 -04:00
Sally Coolatta
51aef1ce75
Fix some of the dehacked tables, change doomednums of haunted heights stuff to not conflict with items/waypoints, use "rings" variable instead of "kartstuff[k_rings]"
2020-08-16 01:46:54 -04:00
James R
36885c1343
Merge remote-tracking branch 'origin/the-scary-22-merge' into the-scary-22-merge
2020-08-15 21:35:17 -07:00
James R
6cd395f1ff
Even the warning can die, give the programmer some credit
...
(cherry picked from commit 6d67b7c3269d2530cfcd7a93cfde401e09d04138)
(cherry picked from commit 390042ffc5
2020-08-15 21:34:05 -07:00
James R
b1fb9ed737
Fix more compiler errors
2020-08-15 21:32:02 -07:00
Sally Coolatta
a251c3909b
Lots of little fixes
...
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
2020-08-16 00:29:04 -04:00
James R
246e71a463
Is it GCC is it gcc, is it????
2020-08-15 21:29:02 -07:00
Sally Coolatta
5e13555727
Disable animated textures
2020-08-16 00:16:17 -04:00
Sally Coolatta
49e2f98beb
TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig
...
Bare minimum for levels to load again, need to figure out why the 2.2 merged version isn't working
2020-08-16 00:15:05 -04:00
Sally Coolatta
a2caa2dc16
Character select can open without crashing
2020-08-15 22:40:49 -04:00
Sally Coolatta
ae4ea9eda2
Fix sound effects
2020-08-15 22:29:55 -04:00
Sally Coolatta
30144d5d06
Things to get it to run
...
Build is still MASSIVELY broken, you can't even get into a level, still investigating
2020-08-15 20:09:36 -04:00
Kimberly Wilber
4548662536
[OSX] Fix "SIGILL: illegal instruction" on macOS Catalina
...
on OSX, strncpy may copy to overlapping (protected) memory. this
sometimes happens when loading WAD files.
This patch eliminates these problems for me
2020-08-15 12:16:05 -04:00
Sally Coolatta
172ffea590
update srb2win.rc, D_ConvertVersionNumbers uses kart's 2 number style instead of vanilla's 3 number style
2020-08-15 11:54:50 -04:00
Sally Coolatta
c321ae77fb
Fix deployer defaults
2020-08-15 11:29:53 -04:00
Sally Coolatta
22b6181244
Update version.h
2020-08-15 10:17:21 -04:00
Sryder
91a81cd6ee
Merge branch 'the-scary-22-merge' of git@git.magicalgirl.moe:KartKrew/Kart.git into the-scary-22-merge
2020-08-15 14:51:55 +01:00
Sryder
b84fe5212e
Makefile was linking i_thread.o twice
2020-08-15 14:51:40 +01: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
631f698432
Cleanup
...
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.
I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
2020-08-15 08:32:56 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Sally Coolatta
19016db338
Got through OGL
2020-08-15 06:20:22 -04:00
Sally Coolatta
f12501dfb6
SDL files
2020-08-15 06:02:39 -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
fd5fe916bc
Get past w_wad.o
2020-08-15 03:31:23 -04:00
Sally Coolatta
7d095060cf
Makes it past s_sound.o and sounds.o
2020-08-15 02:15:08 -04:00
Sally Coolatta
873474ac87
Make it to s_sound
2020-08-15 01:54:45 -04:00
James R
fe4f311da5
.
2020-08-14 22:38:15 -07:00
