Commit graph

14475 commits

Author SHA1 Message Date
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
Monster Iestyn
8d7d0c4dc5 Merge branch 'master' into next 2020-03-09 19:53:08 +00:00
Monster Iestyn
fb2b105159 Merge branch 'archive-sprite2-hotfix' into 'master'
Archive sprite2 Hotfix

See merge request STJr/SRB2!845
2020-03-09 15:50:55 -04:00
LJ Sonic
bdbcdfe595 Merge branch 'patch-1' into 'master'
Fix desyncs never recovering if node and player mismatch

See merge request STJr/SRB2!842
2020-03-09 12:56:41 -04:00
Monster Iestyn
5defb33266 One line fix: don't assume 0 (aka SPR2_STND) is the default value for sprite2, but rather what the state sets for it
This fixes some issues with a custom character tested during netplay, which did not have SPR2_WAIT sprites and therefore fell back to SPR2_STND sprites. Unfortunately, the fact they used SPR2_STND instead meant the sprite2 was not synced at all!
2020-03-09 15:04:22 +00:00
Monster Iestyn
f186def0bf Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00: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
Monster Iestyn
34c4da018a Reorganise r_things.h 2020-03-08 21:17:30 +00:00
Monster Iestyn
d35464204e Set the "spritename" variable within R_AddSingleSpriteDef rather than externally to it, since R_InstallSpriteLump is the only place it gets used anyway
This way we don't have to make it some extern in order for r_skins.c to use it
2020-03-08 19:51:18 +00:00
Monster Iestyn
12468abff5 update Makefile, CMakeLists.txt and MSVC project files 2020-03-08 19:48:23 +00:00
Monster Iestyn
a12833ccd2 remove r_skins.c include in r_things.c, on second thoughts 2020-03-08 19:36:56 +00:00
Monster Iestyn
9013398151 Create r_skins.c/.h, to contain skins code formerly in r_things.c/h 2020-03-08 19:32:07 +00:00
colette
e4a3fcea26 Fix resyncs never recovering if node and player mismatch 2020-03-08 13:09:39 -04:00
Tatsuru
7532a4879f I guess 2020-03-08 14:06:18 -03: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
Steel Titanium
b9c7eafdfe Fix guest data being deleted regardless of choice 2020-03-08 00:34:15 -05:00
Sally Cochenour
d8e0bf61f6 Scale item distances with map scale 2020-03-08 00:26:33 -05:00
Steel Titanium
0cd8a94a5b Fix guest deletion confirmation returning to Record Attack menu from Nights Mode menu 2020-03-08 00:02:43 -05:00
GoldenTails
69a9f44259 Fix spaces before someone yells at me for it 2020-03-07 21:48:40 -06:00
GoldenTails
e0f6559595 Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
Disclaimer: I'm not actually from Florida.
2020-03-07 21:41:52 -06: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
SteelT
3117d2782c Merge branch 'ss-damage-fix' into 'next'
Fix Special Stages crashing upon taking damage

See merge request STJr/SRB2!839
2020-03-06 17:59:57 -05: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
Zipper
5c9e689d04 Update p_inter.c 2020-03-05 18:48:20 -05:00
Zipper
cc26d9d2bf Update p_inter.c 2020-03-05 18:30:27 -05: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
ZipperQR
3ec5c0fa89 fix source player being nil 2020-03-05 12:26:27 +03:00
Zwip-Zwap Zapony
160b5b9b8e More gamepad deadzone tweakage 2020-03-04 21:44:57 +01:00