Commit graph

7623 commits

Author SHA1 Message Date
Latapostrophe
3d74bc2ebc Merge branch 'fix-orbit-shield' into v1.2-frankeinstein 2020-03-10 20:35:19 +01:00
Latapostrophe
f776de7a90 Merge branch 'fix-double-bombs' into v1.2-frankeinstein 2020-03-10 20:34:47 +01:00
Latapostrophe
403d30dc15 Merge branch 'no-cheese' into v1.2-frankeinstein 2020-03-10 20:34:38 +01:00
Latapostrophe
207e68e55d Merge branch 'gl-qol' into v1.2-frankeinstein 2020-03-10 20:34:20 +01:00
Latapostrophe
a75eb7bff4 Merge branch 'stack-draw-flags' into v1.2-frankeinstein 2020-03-10 20:27:52 +01:00
Latapostrophe
4dfb47dff6 Merge branch 'record-attack-changes' into v1.2-frankeinstein 2020-03-10 20:27:00 +01:00
Latapostrophe
af4922b53e VoteThinker Hook for Lua 2020-03-10 18:58:44 +01:00
Latapostrophe
e801057559 Expose CV_FindVar to Lua 2020-03-10 18:12:20 +01:00
Latapostrophe
1abe899060 Push race countdowns and functions to set them 2020-03-10 12:57:30 +01:00
lachwright
e2c95a0060 Visibility improvement 2020-03-10 19:30:02 +08:00
Latapostrophe
d7146021c1 Push consoleplayer and displayplayers to Lua 2020-03-10 11:53:28 +01:00
Latapostrophe
5147cabff2 Remove debug print 2020-03-10 10:21:47 +01:00
lachwright
f0c98697dc Add camera pitching when driving on downhill slopes 2020-03-10 05:18:05 +08:00
Sally Cochenour
5d2f380a13 Lightsnake scales
(The comment about scale not working was actually just paper sprite projection mucking it up)
2020-03-08 17:33:07 -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
Sally Cochenour
fecb2cdebd Fix item lobbing in mobjscale maps
This happened when I was trying to fix several mobjscale issues at once for v1 -- I either didn't notice the P_SetObjectMomZ, or didn't realize that this function already handles scale changes for you.
2020-03-08 00:48:56 -05:00
Sally Cochenour
7174b707a1 Draw distance uses object scale 2020-03-08 00:39:21 -05:00
Sally Cochenour
d8e0bf61f6 Scale item distances with map scale 2020-03-08 00:26:33 -05:00
Sal
b3a1bb6064 Merge branch 'fullbright-boosters' into 'master'
Fullbright boosters

See merge request KartKrew/Kart!205
2020-03-07 14:37:36 -05:00
fickleheart
88198bce13 I'M GONNA PISS MYSELF OF LAUGHER anyway fixed syncbombs 2020-03-07 12:40:45 -06:00
Sally Cochenour
558f8607c9 Merge branch 'master' into fullbright-boosters 2020-03-06 12:56:36 -05:00
Sally Cochenour
83c74af696 Fix bad master merge 2020-03-06 12:56:12 -05:00
Sally Cochenour
76188e89fb Fullbright boosters
We no longer have to maintain this standard manually. I actually suggest making booster sectors use the lightlevel of their surrounding sectors so that only the booster itself glows.

(OGL support is commented out, since it conflicts with sal-lighting and should probably be done there)
2020-03-06 12:54:54 -05:00
James R
5847d519d7 Merge branch 'parties-only' into parties 2020-03-05 21:41:28 -08:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
Sal
5852b40482 Merge branch '22shadows' into 'master'
2.2 shadows port

See merge request KartKrew/Kart!203
2020-03-06 00:37:41 -05:00
James R
253ab49c07 Merge remote-tracking branch 'origin/master' into 22shadows 2020-03-05 21:36:58 -08:00
Sal
b13ebd6d15 Merge branch 'special-sector-tweak' into 'master'
Fix step-up on stairs for other objects (Orbinaut VS Toxic Palace Stairs)

See merge request KartKrew/Kart!201
2020-03-06 00:10:35 -05:00
Sal
9392282b23 Merge branch 'exists-fix' into 'master'
Prevent LF2_EXISTSHACK from ever getting removed

See merge request KartKrew/Kart!196
2020-03-06 00:10:20 -05:00
Sal
4b5b2462b5 Merge branch 'gentlemen' into 'master'
Gentlemen's ping agreement

See merge request KartKrew/Kart!197
2020-03-06 00:10:06 -05:00
Sal
10fe9434f6 Merge branch 'blizzard' into 'master'
Weather system refactor, Blizzard weather type

See merge request KartKrew/Kart!200
2020-03-06 00:09:43 -05:00
Sal
2448ab34e9 Merge branch 'no-charge' into 'master'
Disable charging drift sparks in bounce pad state

See merge request KartKrew/Kart!190
2020-03-06 00:09:27 -05:00
Sal
a0c1c68f5c Merge branch 'paper-signs' into 'master'
3D level end signposts

See merge request KartKrew/Kart!199
2020-03-06 00:08:35 -05:00
fickleheart
cf11f1ef6e SUPER EXPERIMENTAL FREEZE-B-GONE 2020-03-05 22:19:39 -06:00
Latapostrophe
3a8e984e44 Merge branch 'fickle-replay-v1' into replay-freecam-rewind 2020-03-05 21:08:20 +01:00
TehRealSalt
7d32f9b6c3 Replay playback changes:
- Store level state periodically
- Load the closest usable level state when done rewinding for
  quicker resumes
- Make playback menu fade out after 5 seconds of no activity
  (but not while paused)
- Remove wrapping from replay hut (original wrapping was broken
  at some point before 1.1 and it's not necessary anyway)
- Allow holding enter on frame advance for noisy slow-mo

from fickleheart
2020-03-05 21:04:56 +01:00
Latapostrophe
ee7ae2e5ca Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master 2020-03-05 21:03:29 +01:00
James R
11930b41bf Use tic_t 2020-03-03 20:11:03 -08:00
James R
70d46ebb0a Merge branch 'parties-only' into parties 2020-03-03 20:05:30 -08:00
James R
74f47f83f2 Party yourself with ALL party members when being added to a party 2020-03-03 19:22:32 -08:00
James R
dd29a44ecc cancelinvite command to rescind a party invitation 2020-03-03 19:17:27 -08:00
James R
b3ef79953a Merge branch 'parties-only' into parties 2020-03-03 18:52:14 -08:00
James R
9b239e8252 Set extra displayplayers to displayplayers[0] instead of splitscreen for parties
This fixes P2's HUD drawing in P4's area in a 3P party, when the first local
player was P2.
2020-03-03 18:49:26 -08:00
James R
ac75b30400 r_splitscreen for opengl 2020-03-03 18:48:47 -08:00
Sally Cochenour
2b6ca4a384 Increase SPB speed & turn 2020-03-03 20:56:57 -05:00
Sally Cochenour
721fb369fd Move changes to K_GetBestWaypointForMobj so that K_GetClosestWaypointToMobj can stay the same 2020-03-03 18:34:17 -05:00
Sally Cochenour
d459407866 Forgotten player check here 2020-03-03 17:22:13 -05:00
Sally Cochenour
ff190b7a88 Fix unsigned/signed comparison 2020-03-03 17:05:04 -05:00
Sally Cochenour
7fff21acd4 Instead of vertical cap, quadruple z axis distance
Far more natural results!
2020-03-03 16:58:09 -05:00