Tatsuru
5301255032
Ignore spectators
2020-09-19 23:10:03 -03:00
SteelT
d8bcc13fec
Merge branch 'master' into trick-panels
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
# src/k_kart.c
# src/p_user.c
2020-09-18 00:54:45 -04:00
lachwright
e77ebf1234
Objectplace improvements:
...
- movement speeds are scaled with player scale
- spawned objects are scaled with player scale
- command accepts argument for thing num to set
2020-09-06 17:28:34 +09:30
Sally Coolatta
8e62efb79c
Merge branch 'master' into next
2020-08-23 04:44:27 -04: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
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
8ec67e1ff9
Fix mobjscale
2020-08-18 06:36:43 -04: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
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
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
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
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
c09e54d073
m_menu compiles
2020-08-14 06:28:35 -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
f8d1e75025
Merge remote-tracking branch 'public/next'
2020-08-12 18:50:41 -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
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
0c06da879e
Merge p_mobj.c
2020-08-10 14:37:15 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
7accb3f8d2
Merge p_mobj.c/h
2020-08-08 15:22:29 -04: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
88be417717
Merge branch 'master' into hitlag-retry
2020-08-01 01:14:33 -04:00
Sal
21dfe49bf8
Merge branch 'antigrav-respawn' into 'master'
...
Antigravity fixes, round 2
See merge request KartKrew/Kart!305
2020-07-31 21:55:38 -04:00
Nev3r
0bd31d8862
Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now.
2020-07-30 09:45:58 +02: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
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
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
Latapostrophe
b62ef5a51d
Kill flipcam again but nothing else associated with it.
2020-07-26 21:15:32 +02:00
Latapostrophe
90cde7379c
Revert "Push flipcam down the nearest staircase"
...
This reverts commit 06d70c1f8e
2020-07-26 20:27:22 +02:00
Sally Coolatta
f61f9a010c
Merge branch 'master' into spindash
2020-07-24 21:26:17 -04:00
Sally Coolatta
1a61810f16
Make ring respawn faster
2020-07-24 20:19:14 -04:00
Latapostrophe
06d70c1f8e
Push flipcam down the nearest staircase
2020-07-24 16:17:07 +02:00
Sally Coolatta
25e9c72bab
Merge branch 'master' into spindash
2020-07-23 19:12:00 -04:00
James R
34a7c2ee88
Hammer cocks on rainbow sparks; hella bullet clips on rainbow boost + new sfx
2020-07-22 19:09:14 -07: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
93e0872d9a
Merge remote-tracking branch 'origin/master' into driftboost
2020-07-19 22:19:59 -07:00
James R
37aedad288
Sounds for big blue boost and bullet clip bouncing
2020-07-19 21:49:23 -07:00
James R
b23581ac38
The drift boost clip is fatter
2020-07-19 21:05:29 -07:00
James R
280791a832
Drift Boost Plumes, play every other frame of Drift Boost Explosion (normally flicker frames)
2020-07-19 19:11:19 -07:00
