Sally Coolatta
a8908d22cf
K_SetHitlagForObjects, sets hitlag based on speed
2020-08-01 01:14:18 -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
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
Snu
b03a0ee735
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul
...
Updated to 2.2.5
2020-07-10 17:08:53 +01:00
Snu
5f7175204f
Changed Bubble Shield functionality
2020-07-10 05:59:10 +01: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
Lachlan
44dfcc7b3d
Merge remote-tracking branch 'origin/next' into more-platform-fixes
2020-07-04 05:25:38 +08:00
Lachlan
ab3f5e8aff
Fix compiler warning
2020-07-04 05:25:34 +08:00
Lachlan
ee7bc779ea
P_Earthquake: Use P_RadiusAttack in favor of thinker iteration
2020-07-04 04:00:28 +08: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
James R
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
kaysrishaq
248cd81ee9
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 17:09:29 -04:00
lachwright
92a43f2f2e
Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain
2020-06-17 01:46:36 +08:00
Sally Coolatta
59add5abd4
Merge branch 'master' into trick-panels
2020-06-14 20:46:01 -04:00
lachwright
b2b0fc435b
Platform fixes
2020-06-14 12:17:30 +08:00
Sally Coolatta
b7a8c1f128
Merge branch 'master' into trick-panels
2020-06-05 18:41:21 -04:00
Sally Coolatta
820d1f3ac6
Less obnoxious sound when using multiple boosters
2020-06-05 14:52:37 -04:00
Sally Coolatta
a9687144ec
Speed pads reflect your angle like horizontal springs do
2020-06-05 14:10:55 -04:00
Sally Coolatta
086ea73c2f
Merge branch 'master' into respawn-updates
2020-06-01 15:49:30 -04:00
LJ Sonic
aeeb6e1b02
Merge branch 'next' into 'fix-spawn-desynch'
...
# Conflicts:
# src/p_map.c
2020-06-01 08:15:02 -04:00
Sally Coolatta
ede66a6632
Trick panels
2020-05-31 21:23:22 -04:00
Sally Coolatta
0e79ec29be
p_map & p_maputl merge conflicts
2020-05-30 13:53:30 -04: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
Sally Coolatta
cf1c7f9f10
FULLY fix the respawn finish line exploit, by adding a "P_HitSpecialLines" function
2020-05-29 11:49:32 -04:00
Sally Coolatta
d062a35a3a
Huge respawn overhaul
...
- Moved respawn code to its own file
- Reorganized a lot of the code related to respawning
- As a result of the massive reorganization, I squashed several bugs. Most notably: mid-game joiners having weird spawns, being able to skip laps by respawning.
- Respawn lightsnake no longer takes you straight to your nextwaypoint -- it now has a minimum distance forward that it tries to put you at when you respawn.
2020-05-29 01:04:51 -04:00
Louis-Antoine
d886e35576
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
Sally Coolatta
9933687c6e
Merge branch 'master' into pet-robo
2020-05-24 17:18:02 -04:00
MascaraSnake
ccd2371d42
Merge branch 'next' into movement-refactor
...
# Conflicts:
# src/p_map.c
2020-05-19 09:50:23 +02:00
Sally Coolatta
6aa6521fb4
Allow spectators through Block Players lines
2020-05-18 14:52:26 -04:00
Louis-Antoine
74fa35221d
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
MascaraSnake
0f16d55384
Some minor PTR_GlideClimbTraverse cleanup
2020-05-02 15:25:19 +02:00
MascaraSnake
40459adbb5
Refactor PTR_SlideTraverse
2020-05-02 15:21:53 +02:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
Sally Cochenour
174a76f7e8
Merge branch 'master' into pet-robo
2020-04-28 21:10:16 -04:00
MascaraSnake
38a3be00d0
T_StartCrumble refactoring, part 1
2020-04-26 16:51:14 +02:00
MascaraSnake
62ab099b6f
Make T_StartCrumble use its own thinker data structure
2020-04-26 11:55:10 +02:00
James R
89a2f8ec8d
Thing type 2002, MT_WAYPOINT_RISER - Raise tagged waypoints in sector to FOF sorted by height
...
Thing height refers to the index of FOF. FOF are sorted by top height, lowest
to highest. Set Object Flip to sort highest to lowest.
If the waypoint thing set Object Flip, it will be placed on the bottom of the
FOF. The sorting remains the same though.
Set Ambush to raise the waypoint to the same z position.
2020-04-04 01:20:38 -07:00
Sally Cochenour
e5ae9d1513
Merge branch 'master' into pet-robo
2020-03-28 08:43:40 -04:00
Sally Cochenour
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -04:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
Sally Cochenour
4ddf1e4280
Don't allow k_flamedash to damage without flame shield
2020-03-26 01:14:57 -04:00
Sally Cochenour
88709aafaa
Fix eggman items having no collision
2020-03-24 12:55:48 -04:00
Sal
8d763afae6
Merge branch 'map-features' into 'master'
...
Minor but handy new mapping features
See merge request KartKrew/Kart!218
2020-03-23 00:44:18 -04:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
Sally Cochenour
25bc236bde
Merge branch 'master' into new-items
2020-03-22 20:50:28 -04:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
