James R
c609dffdab
Stupid P_MapStart crash because of flicky teleport before map load
2020-10-28 22:35:31 -07:00
Nev3r
df6a903592
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Sally Coolatta
2509d5a29c
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-24 21:39:32 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Sally Coolatta
fda698a290
Merge master
2020-10-24 18:34:07 -04:00
Sally Coolatta
0969ca1af9
Karma bombs rework
...
- Fixed the bugs with them in our last netgame
- Karma bombs are no longer slippery or have stat changes
- Karma bombs cannot pick up spheres. Their remaining spheres before they died are removed 1 per tic.
- Karma bombs are out of the game permanently when touching the overtime barrier
- When successfully hurting another player, instead of getting 0.5 bumpers, they steal ALL of the opponent's bumpers, effectively swapping places with them. One bumper is lost in the process, meaning bumpers are slowly flitered out the more people need to come back.
- Removed karma items/eggboxes... hopefully this is temporary and we can bring them back later, but currently we don't have a design for how they should work under the new rules :x. They are still in the code behind the `OTHERKARMAMODES` define
- Bumpers & comeback timer are now player_t variables instead of kartstuff shit
- eliminated boolean on player_t for checking when a player touched the barrier
2020-10-24 11:27:42 -04:00
Monster Iestyn
f13d938c57
A_Boss1Laser (pinch phase): Reset var1 to locvar1 each time so we don't accidentally spawn koopas (or something else) as a result of hitting enemies with the laser
2020-09-26 17:31:49 +01:00
Sally Coolatta
2f6962c103
Correct player angle when respawning from crushing
2020-09-26 03:12:22 -04:00
Sally Coolatta
285ec3e08c
Player death uses damage types
...
- Fixed last place elimination not working (again)
- Replaces squishing from level geometry with good old fashioned crush death
2020-09-25 16:31:10 -04:00
Sally Coolatta
861cb8e144
Fix springs giving you way too many
...
(Also removed a bunch of instances of PF_SPINNING since we haven't used it)
2020-09-25 02:24:19 -04:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07: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
Tatsuru
57b1becfe0
Decolorize players as intended
2020-08-24 23:53:21 -03:00
Sally Coolatta
8e62efb79c
Merge branch 'master' into next
2020-08-23 04:44:27 -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
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
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
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
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
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
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
lachwright
51754b01ad
Merge p_enemy.c
2020-08-10 12:25:12 +08:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
c14e9a23f7
Merge p_enemy.c
2020-08-06 11:00:49 -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
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
ef2579f2b3
Merge branch 'master' into draw-flags
2020-07-20 13:38:48 -04: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
lachwright
c5d74a1859
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades
2020-07-09 05:56:11 +08:00
LJ Sonic
83f53943a6
Merge branch 'knuxtweaks' into 'next'
...
Knuckles tweaks
See merge request STJr/SRB2!1030
2020-07-04 16:37:35 -04:00
LJ Sonic
b558c523a2
Merge branch 'fix-oldbrak-missiles2' into 'next'
...
Take 2: Fix Old Brak missiles + add pw_ignorelatch
See merge request STJr/SRB2!1006
2020-07-04 16:28:48 -04:00
lachwright
10b09f49c3
Add sightcheck boolean to P_RadiusAttack
...
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
James R
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
lachwright
c54cb042ba
lol should have tested before pushing
2020-06-19 15:59:09 +08:00
lachwright
e1a8ea7663
Fix the Eggman signpost's background color
2020-06-19 15:49:24 +08:00
kaysrishaq
248cd81ee9
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 17:09:29 -04:00
Steel Titanium
e247ef0251
Fix facecolor may be used uninitialized.
2020-06-17 14:09:49 -04:00
SteelT
9e85267b36
Merge branch 'next-lc-uint16' into 'next'
...
Custom skincolor bugfixes
See merge request STJr/SRB2!971
2020-06-11 20:08:50 -04:00
Sally Coolatta
b7a8c1f128
Merge branch 'master' into trick-panels
2020-06-05 18:41:21 -04:00
Sally Coolatta
086ea73c2f
Merge branch 'master' into respawn-updates
2020-06-01 15:49:30 -04:00
Sally Coolatta
ede66a6632
Trick panels
2020-05-31 21:23:22 -04:00
SwitchKaze
50a225f8cd
Fix signpost shade.
2020-05-29 21:41:20 -05:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sally Coolatta
285de3357d
Add back to resynch & savegame, shorten names of a few variables
2020-05-29 13:12:07 -04:00
