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
9933687c6e
Merge branch 'master' into pet-robo
2020-05-24 17:18:02 -04: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
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
Sally Cochenour
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
Sally Cochenour
7f1d55421a
Merge branch 'master' into new-items
2020-03-22 14:23:51 -04:00
Sally Cochenour
eddfc38d6e
Merge branch 'master' into map-features
2020-03-22 12:54:53 -04: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
James R
310a9cd09c
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 17:22:57 -07:00
Sryder
da2f1fc972
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/k_kart.c
2020-03-21 23:27:55 +00:00
Sally Cochenour
58df481cd3
Replace "Block Enemies" with "Block Players"
...
We don't need the ability to make invisible walls for enemies as often as we've needed invisible walls for players that don't block their thrown items.
2020-03-21 19:08:59 -04:00
Sal
9d35d0f5d8
Merge branch 'driftspark-update' into 'master'
...
Yellow drift sparks & new drift spark effects
See merge request KartKrew/Kart!211
2020-03-21 19:02:48 -04:00
Sal
cbfce16dcc
Merge branch 'done-with-spikeballs' into 'master'
...
Slow down backwards spikeballs (again)
See merge request KartKrew/Kart!212
2020-03-21 18:49:02 -04:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Sally Cochenour
40e01fb71c
Increase thrust of destroyed items
...
Roughly matches what it was supposed to look like before gravity was increased
2020-03-19 22:35:07 -04:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Sally Cochenour
040865b589
Merge branch 'master' into new-items
2020-03-17 19:31:47 -04:00
Sally Cochenour
1e10ec00d7
Merge branch 'waypoints' into sal-waypoints
2020-03-15 20:23:24 -04:00
Sally Cochenour
fa34e4eee4
Merge branch 'master' into sal-waypoints
2020-03-15 20:21:17 -04:00
Sryder
c268313f0a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/Makefile
# src/k_kart.c
# src/p_map.c
# src/p_setup.c
# src/p_spec.c
2020-03-16 00:13:42 +00:00
Sally Cochenour
9dfbd918a4
Don't forcefully remove drift when bumping walls
2020-03-14 18:14:21 -04:00
Sally Cochenour
b4933bacb3
Didn't work, let's try this
...
objectSpeed was getting scaled with the spring's size, when only the spring's base speed should be scaled
2020-03-08 01:37:48 -05:00
Sally Cochenour
8c1aec3713
Fix springs having weird launch speeds in mobjscale maps
...
Same issue as lobbing -- scale being double-applied
2020-03-08 01:12:53 -05:00
James R
18aa2972e5
Merge remote-tracking branch 'origin/master' into parties-only
2020-03-05 21:41:23 -08:00
Sally Cochenour
d459407866
Forgotten player check here
2020-03-03 17:22:13 -05:00
Sally Cochenour
3633dc341a
Merge branch 'master' into targets
2020-03-01 15:42:49 -05:00
Sally Cochenour
885d6fea1f
Merge branch 'master' into special-sector-tweak
2020-03-01 14:50:45 -05:00
Sally Cochenour
76e75d9756
Fix offroad collision
...
Adds an option to P_MobjTouchingSectorSpecial to only use non-FOF sectors' special if you're touching their floor/ceiling.
2020-03-01 14:36:13 -05:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08: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
