Commit graph

1682 commits

Author SHA1 Message Date
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
Sally Coolatta
1fcfdd5bae Bot hints
Thing type 2004, adds a map-defined point for bots to gravitate towards or away from.
Angle: Changes radius, defaults to a 32 radius (or 64x64 area) without.
Ambush: When off, makes bots steer towards. When on, makes bots steer away.
Parameter: Changes how much the bot steers away/towards this point. If 0, defaults to 2.

(also, made bots ignore strong offroad if they could take a shortcut)
2020-04-30 14:15:10 -04:00
MascaraSnake
d2e21afaf1 Merge branch 'next' into udmf-next
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
2020-04-24 21:15:53 +02:00
Monster Iestyn
f26e8f3df7 Merge branch 'thinker-cleanup' into 'next'
Plane movement thinker cleanup

See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Sally Cochenour
372544d28f Merge branch 'master' into pet-robo 2020-04-22 21:54:40 -04:00
sphere
7955c96fa1 Restore carelessly removed const keywords. 2020-04-22 23:38:10 +02:00
sphere
0868930d3b Make emerald hunt shards spawn at correct heights, and add Float option. 2020-04-22 18:58:40 +02:00
Nev3r
3358413479 Merge branch 'udmf-pitch-and-roll' into 'udmf-next'
Add textmap pitch and roll parsing, and mobj pitch and roll variables.

See merge request STJr/SRB2!882
2020-04-21 12:27:26 -04:00
Nev3r
c00f995b7f Move the scale setting code behind the MapthingSpawn hook. 2020-04-19 16:00:57 +02:00
Nev3r
5632120a74 Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike. 2020-04-19 15:18:36 +02:00
Nev3r
da165d2d22 Add textmap pitch and roll parsing, and mobj pitch and roll variables. 2020-04-19 14:51:55 +02:00
MascaraSnake
93eb0ee1c8 Add an enum for crumblestate 2020-04-17 23:54:37 +02:00