lachwright
e1a8ea7663
Fix the Eggman signpost's background color
2020-06-19 15:49:24 +08:00
kaysrishaq
248cd81ee9
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 17:09:29 -04:00
Steel Titanium
e247ef0251
Fix facecolor may be used uninitialized.
2020-06-17 14:09:49 -04:00
SteelT
9e85267b36
Merge branch 'next-lc-uint16' into 'next'
...
Custom skincolor bugfixes
See merge request STJr/SRB2!971
2020-06-11 20:08:50 -04:00
Sally Coolatta
b7a8c1f128
Merge branch 'master' into trick-panels
2020-06-05 18:41:21 -04:00
Sally Coolatta
086ea73c2f
Merge branch 'master' into respawn-updates
2020-06-01 15:49:30 -04:00
Sally Coolatta
ede66a6632
Trick panels
2020-05-31 21:23:22 -04:00
SwitchKaze
50a225f8cd
Fix signpost shade.
2020-05-29 21:41:20 -05: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
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
SteelT
4b77741f37
Merge branch 'next-lc-uint16' into 'next'
...
Custom skincolors
See merge request STJr/SRB2!960
2020-05-28 11:23:05 -04:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Monster Iestyn
55dd8739ab
A_SplitShot fix: don't even attempt to A_FaceTarget (or anything beyond) if there is no target to face to begin with
2020-05-21 19:42:48 +01:00
MascaraSnake
f1744efbd5
Merge branch 'waypoints' into 'next'
...
Store waypoints at map load instead of iterating through the thinker list to find them
See merge request STJr/SRB2!938
2020-05-18 16:00:46 -04:00
Sally Coolatta
0282615c38
Merge branch 'master' into pet-robo
2020-05-18 15:18:37 -04:00
Sally Coolatta
bdb871325f
Merge remote-tracking branch 'public/next'
2020-05-16 00:05:55 -04:00
MascaraSnake
bb03937054
Merge branch 'carry-dust-devil' into 'next'
...
Add carry types to Dust devils
See merge request STJr/SRB2!886
2020-05-15 02:50:29 -04:00
Snu
9dda3a2edf
Use P_SetTarget instead of fast->target
2020-05-14 04:17:24 +01:00
Snu
e502397a98
add targets to MT_FASTLINEs spawned to tell what they're spawned from
2020-05-14 03:13:00 +01:00
ZipperQR
88c32f7790
no message
2020-05-14 03:35:46 +03:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
MascaraSnake
7004d8ca75
Merge branch 'next' into waypoints
2020-05-12 23:51:32 +02:00
MascaraSnake
999ebe2fd1
Rename variables for Fang waypoints, in preparation for new global waypoint data structure
2020-05-12 14:53:10 +02:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
James R
1065ded275
Remove instances of HAVE_BLUA that actually disable Lua now
2020-05-10 19:59:56 -07:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
lachwright
fa8e58bec9
Prevent laser sprites clipping into walls/off ledges
2020-05-08 02:58:56 +08:00
lachwright
bfd1d3d49f
Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it
2020-05-07 23:24:33 +08:00
lachwright
cd9774b649
Fix knockback scaling
2020-05-07 22:47:34 +08:00
lachwright
645c324d51
Update new GFZ3 laser
2020-05-06 09:03:03 +08:00
lachwright
b4648e4c78
New GFZ3 laser
2020-05-06 09:01:02 +08:00
ZipperQR
d229445d43
no message
2020-05-03 14:02:23 +03:00
ZipperQR
d62d43a76b
Dust devil support
2020-04-22 00:59:12 +03:00
James R
71f4433b98
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
Latapostrophe
297104f12d
Merge branch 'fix-double-bombs' into awful-mix
2020-04-05 22:30:43 +02:00
Sally Cochenour
4380caf7dd
All around polishing
...
- Make ring usage smarter
- Ring usage threshold varies between characters (Tails will be more willing to dump rings, Metal will hold onto them)
- Decrease ring use threshold when they have a speed boost (tethering)
- Decrease ring use threshold when slowed down more than usual
- Properly implement Triple Sneaker & Rocket Sneaker usage
- Use smallest radius of all waypoints being predicted, to improve precision
- Bots never use prev waypoints
2020-04-01 21:16:26 -04:00
Latapostrophe
8960152a7c
Merge branch 'v2-master' into spb-waypoints
2020-03-28 15:12:38 +01:00
Sally Cochenour
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -04:00
Sally Cochenour
7ec398e579
Slow down animation speed, fix meter bugs
2020-03-26 03:13:10 -04:00
Sally Cochenour
81fa5d7f51
Start on new flame shield dash visuals
2020-03-25 23:49:39 -04:00
Latapostrophe
6d0513aa9a
Fix conflict
2020-03-25 23:31:53 +01:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
Sally Cochenour
ec7528a333
Merge branch 'master' into new-items
2020-03-22 21:17:43 -04:00
Sally Cochenour
464e3273a9
Missing include
2020-03-22 21:16:55 -04:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
7f1d55421a
Merge branch 'master' into new-items
2020-03-22 14:23:51 -04:00
Latapostrophe
2cd0e1d615
I'm dumb, don't check for flashtics here...
2020-03-22 13:08:46 +01:00
Sryder
4975cce3ac
Just use an I_Assert on SpawnSPBRingTrail
2020-03-22 00:47:17 +00:00
