Commit graph

14498 commits

Author SHA1 Message Date
Latapostrophe
4c367a9b5a What the fuck how did this get here 2020-03-11 15:03:12 -04:00
Latapostrophe
ba8b962f61 Fix tiny conflict because I forgot to merge 2020-03-11 19:55:56 +01:00
Latapostrophe
5f11f7b8df Remove debug prints 2020-03-11 19:53:52 +01:00
Latapostrophe
778ab0a2bb Attempt to fix replay loading crash 2020-03-11 19:33:22 +01:00
lachwright
49f9d830ed Attempt to make splitscreen's camtilt better 2020-03-12 01:23:09 +08:00
Latapostrophe
14a26c412a Merge branch 'too-many-files' into awful-mix 2020-03-11 12:34:54 +01:00
Latapostrophe
8ed53d1aaa don't set MAX_WADFILES to 256, worst mistake of my life 2020-03-11 12:34:35 +01:00
Latapostrophe
1f5bbb2c3d Merge branch 'push-more-lua' into awful-mix 2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
Latapostrophe
eca292dae0 Merge branch 'too-many-files' into awful-mix 2020-03-11 07:21:41 +01:00
Latapostrophe
4fcefbc48b Bump MAX_WADFILES to 256 2020-03-11 07:20:11 +01:00
Latapostrophe
b7702f5ff5 Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix 2020-03-10 21:46:12 +01:00
Latapostrophe
8ca1571c78 Merge branch 'damned-springpads' into v1.2-frankeinstein 2020-03-10 20:39:35 +01:00
Latapostrophe
e75f98b5e8 Merge branch 'push-more-lua' into v1.2-frankeinstein 2020-03-10 20:35:29 +01:00
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
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