lachwright
0a7802c8e9
Allow JumpSpin abilities to be used with non-ability shields
2020-09-16 16:50:10 +09:30
Bartu İnce
3a84946e98
no message
2020-09-08 03:03:48 +03:00
FlykeSpice
2d9ec1687c
Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
FlykeSpice
2424418390
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
lachwright
49fa372b8d
Instantaneous lookback camera (v2 backport)
2020-08-20 13:41:03 +08: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
8fd64ca607
Fix ring usage & gravity
2020-08-16 02:12:17 -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
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
Nev3r
e80e0b6007
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
2020-08-15 13:44:59 +02:00
Sally Coolatta
19016db338
Got through OGL
2020-08-15 06:20:22 -04:00
Sally Coolatta
dfd733eb80
Up to screen.o
...
Lots of renderer files I didn't need to touch at all here :)
2020-08-15 00:55:30 -04:00
Sally Coolatta
9b9ab8a2d5
Get up to p_user
2020-08-14 23:23:14 -04:00
Sally Coolatta
5a98c00405
NOW we make it past p_mobj
2020-08-14 22:28:49 -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
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
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
ecec1e8a8f
OK the compiler still didn't like it, so just properly remove it entirely.
2020-08-10 17:22:55 -04:00
Sally Coolatta
8071ec92e8
InputDown -> PlayerInputDown, JoyAxis -> PlayerJoyAxis
2020-08-10 17:00:45 -04:00
Sally Coolatta
f1c37f350a
Merge p_user.c
2020-08-10 15:00:43 -04: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
f317b327b2
Merge p_user.c
2020-08-09 19:11:46 -04:00
James R
11a4ca28d7
Remove PF_SKIDDOWN, just use PF_FAULT
2020-08-06 17:59:09 -07:00
James R
66c7cd4844
k_spinouttype magic numbers begone
...
Fixes wipeout running out in the air. It was really
only intended for explosions.
2020-08-05 16:28:47 -07:00
Sally Coolatta
31b99de407
Use K_MomentumAngle for all instances of needing momentum angle for an object
...
This means we will never ever have any "standing still defaults to angle 0" issues again :)
2020-08-02 11:40:21 -04:00
Sally Coolatta
7e7e56f0c6
Add distance easing, so it doesn't jitter around too much when you're stuck.
2020-07-31 15:46:44 -04:00
Sally Coolatta
c9b17c456d
Re-attempt at hitlag
...
I remember when I tried to fix wolfs' branch I was having issues, but this ended up working pretty much fine? Don't remember why the old branch was messed up though (it was simply too old & not substantial enough to try and work off of imo)
2020-07-29 09:30:29 -04:00
Nev3r
3854b56228
Merge branch 'next' into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
2020-07-29 13:55:14 +02:00
Sally Coolatta
69b6ba2f18
I tore apart the entire code to try and fix braking friction and gave up, so now it's back to v1
...
My rewrites clean up a LOT of weird/misleading behavior anyway, so I'm gonna push this regardless. Someone else will have to figure out another way to reimplement braking friction though -- we can't use it as is because it prevents being able to bump people.
2020-07-28 03:34:39 -04:00
Sally Coolatta
fc89f2cc47
Remove start boosts, let you roam, kill you for crossing the line before the start
2020-07-24 02:59:47 -04:00
Sally Coolatta
25e9c72bab
Merge branch 'master' into spindash
2020-07-23 19:12:00 -04:00
James R
1f2697050b
Merge branch 'fix-nights-fullbright' into 'next'
...
NiGHTS fullbright fixes
See merge request STJr/SRB2!1080
2020-07-22 22:15:07 -04:00
lachwright
c6f752a394
Fix Super Sonic exploiting CA_FLOAT abilities
2020-07-21 03:50:26 +08:00
Sally Coolatta
643a63e1e6
Finish merge
2020-07-20 13:39:05 -04:00
Sally Coolatta
ef2579f2b3
Merge branch 'master' into draw-flags
2020-07-20 13:38:48 -04:00
lachwright
c9d8fcc1cb
Fix default NiGHTS skin brightness for non-super characters
2020-07-20 22:24:16 +08:00
James R
2182018930
Merge branch 'p-xymovement-lua-exposure' into 'next'
...
Expose several movement-related functions to Lua.
See merge request STJr/SRB2!884
2020-07-12 19:11:47 -04:00
James R
e09a430804
Merge remote-tracking branch 'origin/next' into remove-glide-2
2020-07-12 16:05:15 -07:00
GoldenTails
80b42ba46e
Expose P_MovePlayer to Lua.
2020-07-12 18:02:50 -05:00
GoldenTails
b3198ed063
Replace PF_USEDOWN with PF_SPINDOWN
2020-07-11 21:59:54 -05:00
GoldenTails
36e1c30e19
Replace all occurances of BT_USE with BT_SPIN (2.3?)
...
I'd use `next-major` but it doesn't exist lol
2020-07-11 21:59:54 -05:00
Nev3r
fe87d0391c
Merge branch 'udmf-next' into udmf-multitag
2020-07-11 08:47:58 +02:00
Nev3r
ebe16a66d9
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_ceilng.c
# src/p_floor.c
# src/p_mobj.c
# src/p_mobj.h
# src/p_polyobj.c
# src/p_saveg.c
# src/p_setup.c
# src/p_spec.c
# src/p_spec.h
# src/p_user.c
# src/r_bsp.c
# src/r_defs.h
2020-07-10 18:18:07 +02:00