Commit graph

375 commits

Author SHA1 Message Date
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
lachwright
b2b0fc435b Platform fixes 2020-06-14 12:17:30 +08:00
LJ Sonic
aeeb6e1b02 Merge branch 'next' into 'fix-spawn-desynch'
# Conflicts:
#   src/p_map.c
2020-06-01 08:15:02 -04:00
Louis-Antoine
d886e35576 Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
MascaraSnake
ccd2371d42 Merge branch 'next' into movement-refactor
# Conflicts:
#	src/p_map.c
2020-05-19 09:50:23 +02: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
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
Louis-Antoine
39fae7fc06 Remove redundant conditional in P_IsClimbingValid 2020-03-22 17:45:07 +01:00
Louis-Antoine
2f5d3311f5 Cleanup P_IsClimbingValid 2020-03-22 17:39:51 +01:00
Louis-Antoine
29294a53cc Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Jaime Passos
d831163487 Consider hide-and-seek as GTR_HIDEFROZEN 2020-02-28 23:52:33 -03:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru
0740af6914 Die 2020-01-20 10:04:44 -03:00
Tatsuru
a11d4f48c5 Remove Tails pick-up lock 2020-01-19 23:18:49 -03:00
Alam Ed Arias
f267f7bb3e whitespace cleanup 2020-01-09 16:19:12 -05:00
James R
0035964251 Merge branch 'next-newcontrols' into 'next'
fcam simple controls but slightly less hacky

See merge request STJr/SRB2!647
2020-01-08 16:15:47 -05:00
fickleheart
084a8db5a9 Merge remote-tracking branch 'upstream/next' into next-newcontrols 2020-01-07 23:43:43 -06:00
lachwright
1811a2a34d Dashmode tweaks:
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
2020-01-07 15:38:48 +08:00
James R
2a6cf10f79 Merge branch 'lua-neatstuff' into 'next'
Extra functionality for lua

See merge request STJr/SRB2!601
2020-01-05 20:54:17 -05:00
fickleheart
067b132eb1 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
Nami
f09ff4ca8d Move MobjLineCollide up a bit to where we first know for sure that we hit a line 2020-01-01 19:38:48 -08:00
James R
75514def83 Merge branch 'respawndelaygametyperule' into 'next'
Gametype ruleset changes

See merge request STJr/SRB2!585
2020-01-01 17:49:53 -05:00
Nami
9219699b42 Add MobjLineCollide hook 2019-12-31 15:17:02 -08:00
fickleheart
77ba835f4f Merge branch 'next' into next-newcontrols
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2019-12-31 12:58:36 -06:00
Jaime Passos
a811021112 **NEW!** hook_SeenPlayer 2019-12-31 14:37:45 -03:00
James R
0fdf838c86 Merge branch 'dashmode-ctf-monitors' into 'next'
Don't let Metal pop the enemy team's monitors (closes #94)

See merge request STJr/SRB2!584
2019-12-31 01:31:55 -05:00
fickleheart
e0d09a457e Convert simple movement to directionchar+analog
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
2019-12-30 15:05:24 -06:00
fickleheart
61a8f715ac Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
James R
529ccf9271 Merge branch 'saloondoor-fix' into 'next'
Fix saloon doors not letting players through when marked with the Ambush flag

See merge request STJr/SRB2!600
2019-12-30 00:25:37 -05:00
Tatsuru
d01fb277dc Fix saloon doors not letting players through when marked with the Ambush flag 2019-12-30 01:16:50 -03:00