Sally Coolatta
69fb03d87f
Use proper explosions
...
A_MineExplode was renamed to A_SSMineExplode to not conflict with the vanilla function, but the states were not updated
2020-08-18 21:00:55 -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
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
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Sally Coolatta
5a6263c36b
Make it past p_mobj
2020-08-14 20:48:06 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -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
f8ea416a97
Merge info.c
2020-08-10 12:18:22 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
cdb0310982
Merge info.c/h
2020-08-06 17:38:29 -04: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
James R
f8b19a239f
Drift Boost Clip, bounces on floor and sparks, then flickers until it dies
2020-07-19 18:04:11 -07:00
James R
1dae3d196b
Who said anything about a 5th frame?
2020-07-18 14:52:30 -07:00
James R
59c0f99865
5th frame + rainbow colors cycle on the drift explody
2020-07-17 23:44:00 -07:00
Nev3r
9210b2ba0b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-10 11:47:16 +02:00
lachwright
a8a112393f
Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3
2020-07-09 00:00:21 +08:00
Nev3r
6b38fe4b2c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-06 11:13:27 +02: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
325867ea59
Merge branch 'jetjawsound' into 'next'
...
Jet Jaw Sounds
See merge request STJr/SRB2!1018
2020-07-04 07:09:43 -04:00
LJ Sonic
ac070380c1
Merge branch 'cez3debris' into 'next'
...
New Debris for CEZ3
See merge request STJr/SRB2!1012
2020-07-04 07:00:20 -04:00
lachwright
6a7565686b
Merge remote-tracking branch 'origin/next' into knuxtweaks
2020-07-04 18:53:26 +08:00
LJ Sonic
85f5698c9b
Merge branch 'dragonbomber-height' into 'next'
...
Fix Dragonbomber z positioning
See merge request STJr/SRB2!1004
2020-07-03 17:05:10 -04:00
lachwright
0a3b728e81
Knuckles changes:
...
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
lachwright
5ec234e726
Merge branch 'next' into knuxtweaks
2020-07-02 13:08:04 +08:00
Nev3r
e301d268ec
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
Zippy_Zolton
74ece42ee2
Jet Jaw Sounds
2020-06-25 00:38:07 -05:00
James R
d5569c0924
Merge branch 'acz3-softlock-fix' into 'next'
...
ACZ3 softlock fix
See merge request STJr/SRB2!1015
2020-06-24 21:43:42 -04:00
sphere
97ebb50e12
Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking.
2020-06-21 16:01:24 +02:00
Zippy_Zolton
9c194f4186
Thanks for the feedback, I have fixed your issues.
2020-06-20 02:04:18 -05:00
Zippy_Zolton
50f51715a7
New Debris for CEZ3
2020-06-20 02:02:13 -05:00
lachwright
e1a8ea7663
Fix the Eggman signpost's background color
2020-06-19 15:49:24 +08:00
lachwright
575fafedaa
Fix Dragonbomber z positioning
2020-06-19 00:52:24 +08:00
MascaraSnake
3ce62d7780
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/p_polyobj.c
2020-06-09 09:38:01 +02:00
Latapostrophe
f33e4d62a0
Sort conflicts, fix misordered follower bubble states in dehacked
2020-06-05 02:33:39 +02:00
Sryder
d13d923a92
New water trail for skimming
...
Out with the old splish splish. Bring on the SKKKKSSSSSSS
2020-06-04 01:47:56 +01:00
Sryder
648fa66d82
Add function comment
2020-06-03 20:29:13 +01:00
Sryder
0f9872fc27
Draw radius for waypoint debug on "best" waypoint.
...
Fix scale of waypoint connections on mapmobjscale maps
2020-06-03 20:26:52 +01:00
Latapostrophe
6ac63cca7a
Merge branch 'v2-master' into followme-internal
2020-06-02 22:21:16 +02: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
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Sally Coolatta
0282615c38
Merge branch 'master' into pet-robo
2020-05-18 15:18:37 -04:00
MascaraSnake
b068a37d14
Merge branch 'udmf-next' into udmf-polyobjects
...
# Conflicts:
# src/p_polyobj.c
2020-05-16 11:18:47 +02:00
Sally Coolatta
249fff87ad
Merge branch 'new-cars-movie' into colorize-tweak
2020-05-12 22:46:46 -04:00
Sally Coolatta
0038241325
Merge branch 'master' into new-cars-movie
2020-05-12 22:41:37 -04:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
