Commit graph

907 commits

Author SHA1 Message Date
James R
364651ac39 Remove Brak Eggman 2022-05-11 12:25:58 -07:00
James R
5293b151be Merge branch 'rewrite-mines' into 'master'
Rewrite mines

See merge request KartKrew/Kart!581
2022-05-09 05:15:31 +00:00
Sally Coolatta
72d77f7fb5 Invincibility updates
- You flash white while in invincibility
- Invincibility is not rainbow UNTIL you go above the initial timer.
- Increased visibility of the shield effect around invincible players.
- Invincibility sparkles have trailing afterimages.
- Disabled invincibility speed lines; they now use the normal speedlines but grey/rainbow. (The code/sprites will be used for something later.)
- Using invincibility adds time, instead of setting it.
- Player hitbox is finally bigger, to actually match the shadow size.
2022-05-08 03:43:53 -04:00
Sally Coolatta
1381a56077 Rewrite mines
Get rid of the tons of extra objects it uses for sounds & collision, do it all from the actual object PLEASE...
2022-05-07 22:59:38 -04:00
toaster
09a99fa06d * Make RunOverlays and A_OverlayThink more consistent.
* Incorporate drawangle support for both (flattened merge of STJr/SRB2!1599)
2022-03-18 20:59:18 +00:00
spherallic
07901a6364 oops 2022-03-18 20:50:24 +00:00
toaster
ed00874f5f wip: staterange actions
# Conflicts:
#	src/doomdef.h
2022-03-18 20:50:03 +00:00
toaster
1a8f07d53c Add a missing scale assignment to A_Boss3ShockThink
(flattened version of SRB2 repository SMS_Alfredo:oneline/merge request 1588)
2022-03-18 18:50:31 +00:00
lachablock
d92f4d6d50 Split up x/y/z averages in A_Boss3ShockThink 2022-03-18 18:48:36 +00:00
Monster Iestyn
2d50b76323 A_Custom3DRotate: don't scale hspeed and vspeed - they are angular speeds, not linear!
(I added the scaling to this action somewhere between 7-9 years ago, and somehow never knew I made this mistake until now, welp.)
2022-03-18 16:58:28 +00:00
toaster
f073218532 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into boss
# Conflicts:
#	src/m_menu.c
2022-03-18 09:07:13 +00:00
James R
821fd41d70 Merge branch 'c99-pedantic' into 'master'
Switch compiler mode C90 to C99; enforce stricter standard conformance

See merge request KartKrew/Kart!554
2022-03-18 02:41:57 +00:00
toaster
8de92e8dca Merge branch 'master' into boss
# Conflicts:
#	src/k_bot.c
2022-03-17 16:58:42 +00:00
toaster
fcb6a4e1ab Disable the vanilla-sourced "keepbody" (rejointimeout) feature. 2022-03-14 16:33:03 +00:00
toaster
329c2a60a2 Fix item boxes not spawning in Break the Capsules.
Specifically, they turn invisible on tic 0, then make a decision about whether to replace themselves with MT_PAPERITEMSPOT or simply become visible (with an explosion puff, same as how they respawn) when starttime is reached.

This delay also applies to Race, which I think is a good thing, considering Item Capsules already are not collectable during POSITION, but I can change it if others disagree.
2022-02-27 17:11:18 +00:00
toaster
c1f3237157 Boss API + assorted relevant bugfixes, will go over the featureset of this branch with a fine toothed comb when it's time to write the merge request description so this is all you're getting right now 2022-02-24 21:19:03 +00:00
James R
bef9f502ca pedantic: cast to (void*) for printf %p 2022-02-20 03:15:51 -08:00
Sally Coolatta
7e76366fe8 Keep your large items 2022-01-09 01:16:36 -05:00
Sally Coolatta
d63ce0c803 Fix jawz reticule in uncapped 2021-12-24 22:52:38 -05:00
Sally Coolatta
cc250afd45 P_InitAngle, to fix angle interpolation on spawning objects 2021-12-24 12:45:51 -05:00
Sal
4f6121cef2 Merge branch 'landmine-explosion' into 'master'
Remove Landmine dust ring on explosion

See merge request KartKrew/Kart!495
2021-12-16 16:16:36 +00:00
James R
ccdbd9ccc9 A_ItemPop: var1 determines roulette or sphere award 2021-12-15 22:34:43 -08:00
James R
1140410e2c Spawn SPHERE BOXES randomly in Battle
They look like random item boxes (the ones in Race) but
have a blue sphere inside of them. One box is worth 10
blue spheres. More boxes spawn during Overtime.

New sprite: SBOX
2021-12-14 01:05:42 -08:00
SinnamonLat
1adbfcff03 Remove Landmine dust ring on explosion 2021-12-10 14:16:20 +01:00
SteelT
dfadd430b7 Merge branch 'landmine-explosion' into 'master'
New Landmine Explosion VFX

See merge request KartKrew/Kart!479
2021-12-08 01:53:35 +00:00
SteelT
d0caa79414 Merge branch 'snapify-hitlag' into 'master'
Snapify Hitlag 2

See merge request KartKrew/Kart!461
2021-12-08 01:53:28 +00:00
SinnamonLat
2b3da168cb New landmine explosion 2021-12-07 09:54:00 +01:00
toaster
e29f113047 Merge branch 'master' into capsules 2021-11-30 13:50:46 +00:00
Sally Coolatta
c43f8da5e6 P_SetOrigin & P_MoveOrigin to replace P_TeleportMove 2021-11-29 08:20:27 -05:00
Sally Coolatta
c1b34d4d4f A few more instances 2021-11-28 00:32:07 -05:00
Sally Coolatta
15556dce0b Quakes are scaled with map scale
Finally
2021-11-28 00:25:40 -05:00
lachablock
e2c0f6638f Fix item capsules in reverse gravity 2021-08-02 13:57:27 +10:00
lachablock
05749b9773 Add special behavior for SPB item capsules 2021-06-21 22:39:21 +10:00
lachablock
b1e412ee33 Address item capsule suggestoastions 2021-06-21 12:03:01 +10:00
lachablock
04ed130d24 Make capsule bubbles semibright, & fix ring capsule caps not being semibright 2021-06-15 15:16:59 +10:00
lachablock
e981de3c33 - Color Record Attack-persistent capsules sapphire
- Make invincibility capsules glow rainbow
- Fix aerial capsules not scaling to full size
2021-06-15 13:41:53 +10:00
lachablock
da37ba8238 Allow scripts (or other outside sources) to easily change the properties of an item capsule 2021-06-14 23:04:28 +10:00
lachablock
459c5615af - Added respawn functionality to item capsules
- Restructured some item capsule code to reduce thinker density and allow the item capsule parts to think after the capsule
- Super Ring capsules are now semibright
2021-06-14 19:04:55 +10:00
toaster
53806d41e0 Orbfterimages.
Fixes mistakes made in !408 and !418, resolving #173.
2021-04-27 20:29:30 +01:00
Sally Coolatta
48c8843feb Merge branch 'master' into stair-janking 2021-04-21 21:44:23 -04:00
toaster
00972a83d2 remove the prefix since everything seems to function 2021-04-17 11:30:08 +01:00
toaster
b3d006b093 structs gunched 2021-04-17 00:27:13 +01:00
James R
3f09cd4f2b Stair janking VFX
Little sparks spawn on one side of your jart while
stepping, plays for 4 frames on each side.
Loops if 10 tics of the janking animation remain.
2021-04-11 18:57:31 -07:00
SteelT
3545836ea1 Merge branch 'master' into invinc-changes 2021-04-07 01:20:12 -04:00
SteelT
fc8bd429f3 Merge branch 'master' into invinc-changes
Also made changes to sparkles, invincibility speedlines now replaces the sparkles if boosting.
2021-04-06 22:40:02 -04:00
James R
08348fcd43 Merge remote-tracking branch 'srb2/next' 2021-04-05 01:26:17 -07:00
Sally Coolatta
8bb1fa57d4 Merge branch 'master' into 22-merge-again 2021-04-05 01:11:26 -04:00
SteelT
32b1acb810 Disable the debug prints for now
Just incase they are needed again in the future, for whatever reason.
2021-03-31 23:38:05 -04:00
toaster
40cbc30bff Mammoth commit, sorry.
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.

Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.

If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
Latapostrophe
3b617337ee Fancy rotating sparkles 2021-03-29 00:27:56 +02:00