Latapostrophe
f33e4d62a0
Sort conflicts, fix misordered follower bubble states in dehacked
2020-06-05 02:33:39 +02:00
Sally Coolatta
889cf581d1
Fix bot air speed cap adjustments being reversed
2020-06-04 15:17:59 -04:00
Sally Coolatta
f4c0011a76
Merge branch 'master' into grand-pricks
2020-06-04 14:41:56 -04:00
Sally Coolatta
2a37bca626
Merge branch 'master' into respawn-updates
2020-06-04 00:16:37 -04:00
Sryder
d13d923a92
New water trail for skimming
...
Out with the old splish splish. Bring on the SKKKKSSSSSSS
2020-06-04 01:47:56 +01:00
Sally Coolatta
fac8f7f538
You get 1ups for carrying rings to the goal
2020-06-03 16:34:23 -04:00
Latapostrophe
aba1ff72bc
k_color.h is a thing now
2020-06-03 01:02:06 +02:00
Latapostrophe
6ac63cca7a
Merge branch 'v2-master' into followme-internal
2020-06-02 22:21:16 +02:00
Louis-Antoine
764f966ffe
Minor edit
2020-06-02 10:31:56 +02: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
MascaraSnake
69a7ac6b4e
Merge branch 'movement-refactor' into 'next'
...
Clean up some movement code
See merge request STJr/SRB2!912
2020-06-01 07:21:41 -04:00
Sally Coolatta
ede66a6632
Trick panels
2020-05-31 21:23:22 -04:00
Sally Coolatta
91b0246d99
Merge branch 'master' into grand-pricks
2020-05-31 15:53:31 -04:00
lachwright
984b996c7a
Ensure followmobj ghost exists before applying fuse
2020-05-30 18:26:11 +08:00
lachwright
70edaa9afa
Feedback so far indicates the old booster effect is preferred
2020-05-30 18:21:39 +08:00
lachwright
48f167d75c
Merge branch 'next' into dashmode-fixes
2020-05-30 18:13:21 +08: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
0879459142
Add distance based on air time
...
Using the respawn command gives you barely any distance, while flying off huge MGZ pits gives you a bunch.
2020-05-29 10:37:34 -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
Sally Coolatta
fdb13b76d1
Make K_BotTopSpeedRubberband a function
2020-05-28 16:46:21 -04:00
Louis-Antoine
d886e35576
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
Sally Coolatta
20b2dabae9
Merge branch 'pet-robo' into grand-pricks
2020-05-25 12:44:59 -04:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
Sally Coolatta
ca7154f521
Make rubberband air speed cap even harsher
2020-05-22 21:19:50 -04:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
MascaraSnake
ccd2371d42
Merge branch 'next' into movement-refactor
...
# Conflicts:
# src/p_map.c
2020-05-19 09:50:23 +02: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
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
Louis-Antoine
6af2871fa5
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
Sally Coolatta
e425eabf04
Merge branch 'master' into grand-pricks
2020-05-17 11:39:39 -04:00
Sally Coolatta
719d4702c1
Merge branch 'master' into sprite-offsets
2020-05-15 23:00:30 -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
Sally Coolatta
47c2c875d5
Increase bot difficulty every match based on placement, implement rival tag
...
Rival tag does not have an in-game indicator, but it is there & it gives the bot better odds
2020-05-14 02:18:32 -04:00
ZipperQR
88c32f7790
no message
2020-05-14 03:35:46 +03:00
Sally Coolatta
fa5fccffc5
Implement lives system
...
Lose a life & restart the current race if you place below the top half. Lose all of your lives, and you get kicked to the title screen.
2020-05-13 02:14:39 -04:00
Sally Coolatta
0038241325
Merge branch 'master' into new-cars-movie
2020-05-12 22:41:37 -04:00
Sally Coolatta
63797b35f7
Merge branch 'pet-robo' into grand-pricks
2020-05-12 22:40:02 -04: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
4c526f6e50
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Louis-Antoine
be67ca3203
Fix crash with rollout rock
2020-05-11 23:48:35 +02:00
James R
1065ded275
Remove instances of HAVE_BLUA that actually disable Lua now
2020-05-10 19:59:56 -07:00
Latapostrophe
2bee969c6a
Add follower bubbles with the BUBBLESCALE field
2020-05-11 00:16:13 +02:00
lachwright
a4cba6a5f9
Merge branch 'master' into next
2020-05-11 01:29:10 +08:00
Sally Coolatta
e2d95ae9c1
Fake results for bots that didn't get to finish in time
2020-05-09 23:08:11 -04:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
