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
Sal
843721cc8f
Merge branch 'sprite-offsets' into 'master'
...
Sprite offsets for horizontal springs
See merge request KartKrew/Kart!265
2020-05-18 14:39:09 -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
MascaraSnake
b068a37d14
Merge branch 'udmf-next' into udmf-polyobjects
...
# Conflicts:
# src/p_polyobj.c
2020-05-16 11:18:47 +02:00
Sally Coolatta
719d4702c1
Merge branch 'master' into sprite-offsets
2020-05-15 23:00:30 -04:00
Sally Coolatta
0706ec3b16
Merge branch 'master' into colorize-tweak
2020-05-15 22:57:06 -04:00
Sally Coolatta
4555b20e6c
Merge branch 'master' into new-cars-movie
2020-05-14 22:42:29 -04:00
Sally Coolatta
8744df641f
Merge branch 'master' into grand-pricks
2020-05-14 18:48:34 -04:00
Sal
9921dfbb05
Merge branch 'water-physics' into 'master'
...
Altered water physics
See merge request KartKrew/Kart!261
2020-05-14 18:47:08 -04:00
Sally Coolatta
b51f206c1c
Support antigrav
2020-05-14 18:45:54 -04:00
MascaraSnake
c2037391d2
Merge branch 'next' into udmf-next
2020-05-13 10:01:12 +02:00
Sally Coolatta
e51bceb567
Items respawn in GP
2020-05-13 03:04:33 -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
b4f5d931cc
Skincolor code cleanup
...
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
2020-05-11 02:28:25 -04:00
James R
5ad69621f2
Use camera angle, not mobj angle, when comparing Angle Anchor
2020-05-10 19:40:28 -07:00
Latapostrophe
2bee969c6a
Add follower bubbles with the BUBBLESCALE field
2020-05-11 00:16:13 +02:00
Sally Coolatta
393c637954
Gravity is higher underwater when going down
2020-05-10 03:19:21 -04:00
Sally Coolatta
347b9bfc5c
Low water gravity only applies going up
2020-05-10 02:41:35 -04:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Latapostrophe
333805e5c2
Merge branch 'v2-master' into followme-internal
2020-05-09 11:33:57 +02:00
Sally Coolatta
b97f3cdcce
Horizontal springs offset the sprite
2020-05-09 02:17:35 -04:00
lachwright
9b1ec81622
Start hill-parking
2020-05-09 06:24:53 +08:00
Sally Coolatta
9ea37836e2
New kart animations!
...
- Add unique frames for inward and outward drifting.
- Increase the speed threshold required to reach your "fast driving" frames.
- Use slow driving frames when you're slowing down, even if you're techincally above the fast speed threshold.
- Use frameangle to smooth out the transition into drifting, instead of having "pre-turned" drift frames.
2020-05-08 17:26:27 -04:00
Sally Coolatta
d2172fc54b
Bot amount & difficulty is now controlled by cvars
2020-05-07 02:37:06 -04:00
lachwright
645c324d51
Update new GFZ3 laser
2020-05-06 09:03:03 +08:00
Sally Coolatta
d62cb8e9d1
Merge branch 'master' into pet-robo
2020-05-05 20:29:14 -04:00
James R
7c9824dc56
Multiply the default radius of 384 by mobjscale, but not user set radiuses
2020-05-04 17:54:43 -07:00
James R
e2d4ddcec2
SOC: DefaultWaypointRadius in the level header picardy
2020-05-04 17:39:11 -07:00
MascaraSnake
af8bd89558
Adapt basic PolyObject setup to UDMF
2020-05-04 22:40:49 +02:00
MascaraSnake
8c22834b46
Merge branch 'next' into udmf-next
2020-05-04 20:32:56 +02:00
lachwright
f796379198
Reset pmomz after transfer to momz
2020-05-05 00:27:53 +08:00
Latapostrophe
59452ae026
Merge branch 'v2-master' into followme-internal
2020-05-04 12:52:47 +02:00
Sally Coolatta
2dfa20f758
Merge branch 'master' into pet-robo
2020-05-03 23:08:00 -04:00
Sally Coolatta
48ba151d98
Rather than showing random added skins, show random other players in the server on the signpost!
2020-05-03 20:58:12 -04:00
Latapostrophe
63485c3dbe
Merge branch 'v2-master' into followme-internal
2020-05-03 22:37:26 +02:00
MascaraSnake
4e6a0c0ae9
Revert some very incorrect refactoring
2020-05-02 15:33:15 +02:00
MascaraSnake
5a6d3753c0
Refactor P_PushableCheckBustables
2020-05-02 15:30:56 +02:00
MascaraSnake
cd9f6a2b7e
P_PlayerZMovement: Move PolyObject handling code into its own function
2020-05-02 13:49:16 +02:00
MascaraSnake
1cee43f945
Merge branch 'remove-polyobjects' into movement-refactor
2020-05-02 13:37:13 +02:00
MascaraSnake
147a1a8a0a
P_PlayerZMovement: Move checks for Mario blocks into their own function
2020-05-02 13:34:24 +02:00
MascaraSnake
1929b62133
P_PlayerMobjThinker: Move check for floatbob platforms into its own function
2020-05-02 13:08:13 +02:00
MascaraSnake
d037a12e54
P_PlayerMobjThinker: Move crumbling platforms check into its own function
2020-05-02 12:50:09 +02:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
lachwright
1568114d13
Dashmode fixes:
...
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 08:26:23 +08:00
