Commit graph

1525 commits

Author SHA1 Message Date
FlykeSpice
2424418390 Remove ESLOPE #ifdef(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
Sally Coolatta
3e446a167c Restructure how damage works in kart COMPLETELY
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
2020-08-19 00:55:36 -04:00
Sally Coolatta
5259e57553 Remove MF_BOUNCE from MOBJFLAG_LIST 2020-08-18 05:11:42 -04:00
Sally Coolatta
5f86025f05 Use curl to retrieve your own IP address properly 2020-08-17 00:29:52 -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
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
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
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
Jaime Passos
7bc4af41ab Merge branch 'pictureformats' into patch-stuff-again-2 2020-08-15 20:48:28 -03: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
fd5fe916bc Get past w_wad.o 2020-08-15 03:31:23 -04:00
Sally Coolatta
c665393bd0 actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V 2020-08-14 21:21:17 -04:00
Sally Coolatta
5a6263c36b Make it past p_mobj 2020-08-14 20:48:06 -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
135e9b9797 f_finale now compiles 2020-08-11 23:13:25 -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
SteelT
9446a397d6 Remove some stray endifs 2020-08-10 18:45:32 -04:00
Sally Coolatta
1a058cb0cd Fix extra V_MAGENTAMAP definition 2020-08-10 17:07:47 -04:00
Sally Coolatta
9e99b3e9d2 Last bits of dehacked.c 2020-08-10 12:08:51 -04:00
lachwright
bf884fc6c5 dehacked.c 2020-08-10 11:54:55 +08:00
James R
0a85046b22 Merge branch 'bt_spin' into 'next'
Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request STJr/SRB2!982
2020-08-09 21:03:17 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
4f47775d51 Merge y_inter.c/h 2020-08-09 15:47:37 -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
Sally Coolatta
7accb3f8d2 Merge p_mobj.c/h 2020-08-08 15:22:29 -04:00
Jaime Passos
a7f3dd7eff Refactor patch loading 2020-08-08 05:16:47 -03:00
James R
11a4ca28d7 Remove PF_SKIDDOWN, just use PF_FAULT 2020-08-06 17:59:09 -07:00
James R
97eac1c594 Lua 2020-08-05 16:28:47 -07:00
Sally Coolatta
7e9efd4e29 Merge lua_consolelib.c
Properly supports 3P/4P commands while we're at it too
2020-08-05 09:58:12 -04:00
James R
3332c22801 Fault again if you spectate then respawn during a fault 2020-08-05 05:07:42 -07:00
Sally Coolatta
cfb9c92ec9 Merge dehacked.c/h 2020-08-02 16:59:24 -04:00
Sal
02e98c4d31 Merge branch 'hud-slidein' into 'master'
HUD slide in, and better splitscreen HUD support

See merge request KartKrew/Kart!306
2020-07-31 11:23:01 -04:00
Sally Coolatta
2645e4dea8 Add magnets to the sides, make client-side, fix length 2020-07-30 07:33:01 -04:00
Sally Coolatta
4e4598d784 Fault line is here 2020-07-30 06:25:34 -04:00
Sally Coolatta
0ce492e103 Fix sliptiding being weakened after all of the boost stacking changes, by making handling bonuses stack using the same rules 2020-07-29 12:15:11 -04:00
Sally Coolatta
57822f6756 Merge master 2020-07-29 05:19:51 -04:00
Nev3r
3d90a6aebe Merge branch 'udmf-next' into 'next'
Merge udmf-next into next

See merge request STJr/SRB2!1075
2020-07-28 14:03:59 -04: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
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
f61f9a010c Merge branch 'master' into spindash 2020-07-24 21:26:17 -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
Sally Coolatta
db230e4d3d Add spindash launch, prevent charging while flashing
Used a timed buff instead of thrust due to friction issues, as a result I had to rebalance some values
2020-07-23 21:31:10 -04:00
Sally Coolatta
25e9c72bab Merge branch 'master' into spindash 2020-07-23 19:12:00 -04:00