stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-28 15:11:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
14377 commits 173 branches 41 tags 186 MiB
Commit graph

14377 commits

This branch
This branch
All branches
Author SHA1 Message Date
sphere
331c81f32d Merge branch 'interpolate-models' into 'next' 
Interpolate Models when Scaling Mobjs

See merge request STJr/SRB2!2021
 2023-06-15 23:26:50 +00:00
spherallic
056d3dcf31 Actually clear options field properly 2023-06-14 13:19:47 +02:00
spherallic
90d95d1305 Clean options field of binary-converted things 2023-06-14 13:19:47 +02:00
spherallic
f416c6a98d Add absolute Z flag to MAPTHINGFLAG_LIST 2023-06-14 13:19:47 +02:00
spherallic
bed7e434e7 Add absolute z height flag for mapthings in UDMF 2023-06-14 13:19:47 +02:00
Sally Coolatta
5c3f66dc36 Remove "singletics" code in F_WriteText 
This was added in 2.1 for whatever reason. All instances of F_WriteText are already capped to the framerate properly by other means; so this code being present just makes timing differences between different netgame clients / other inaccuracies cause the text speed to slow down more than intended.
 2023-06-13 21:26:40 -04:00
Zwip-Zwap Zapony
f921a9987d Interpolate models when scaling mobjs 2023-06-13 19:07:03 +02:00
Zwip-Zwap Zapony
4d4910c918 Use 99999999 instead of 86400, make "MIN" 0 
Nines might be more pleasing than an exact number for con_hudtime
It'd be bad to make "MIN" in an old config suddenly start displaying lines for con_hudlines
 2023-06-13 14:02:19 +02:00
spherallic
37223f13f1 Remove debug print on generic item circle spawn 2023-06-13 10:38:44 +02:00
sphere
8c08eb1676 Merge branch 'bbox-tweaks' into 'bbox' 
Add interpolation to hitbox viewer, tweak hitbox colors

See merge request STJr/SRB2!1927
 2023-06-13 00:05:58 +00:00
sphere
b8a25ae53c Add interpolation to hitbox viewer, tweak hitbox colors 2023-06-13 00:05:58 +00:00
spherallic
d8dd988451 Don't cancel P_LinedefExecute early 2023-06-13 02:01:11 +02:00
spherallic
d9937953ad Fix linedef type 319/320 again 2023-06-13 01:54:49 +02:00
spherallic
99f0933986 Change how SR_MainMenu is initialized. 2023-06-13 01:53:50 +02:00
spherallic
1cc870485d Increase unlockable limits: 
- MAXUNLOCKABLES from 32 to 80
- MAXEXTRAEMBLEMS from 16 to 48
- COMPAT_GAMEDATA_ID is used to account for the old values to prevent
losing records.
- Also fixes linedef actions 319/320.
 2023-06-13 01:53:50 +02:00
sphere
f1106236ad Merge branch 'sphere-fix' into 'next' 
Fix Flung Spheres not using the Blue Sphere collection effect

See merge request STJr/SRB2!1995
 2023-06-12 23:46:05 +00:00
sphere
9d0389811b Merge branch 'camrea-fiz' into 'next' 
Fix Camera Interpolation Never Being Reset (Resolves #1026 and #976)

Closes #976 and #1026

See merge request STJr/SRB2!2008
 2023-06-12 23:44:33 +00:00
sphere
c2c27bf356 Merge branch 'ipv6' into 'next' 
Fix IPv6

See merge request STJr/SRB2!1612
 2023-06-12 23:43:46 +00:00
sphere
5307c1635d Merge branch 'interpolate-maria' into 'next' 
Interpolate Shadows when Scaling Mobjs

See merge request STJr/SRB2!1986
 2023-06-12 23:39:23 +00:00
sphere
d5a3f10a4d Merge branch 'checksector-refactor' into 'next' 
Refactor P_CheckSector

Closes #870

See merge request STJr/SRB2!1946
 2023-06-12 23:36:48 +00:00
sphere
0dea372336 Merge branch 'the_elder_skyscroll' into 'next' 
Rewrite F_SkyScroll to fix overflows

Closes #1008

See merge request STJr/SRB2!1985
 2023-06-12 23:36:37 +00:00
sphere
62bdb7174b Merge branch 'lua-optimized-constants' into 'next' 
Hannu's "LUA_EnumLib optimizations for constant value access" with fixed merge conflict

See merge request STJr/SRB2!2017
 2023-06-12 23:03:51 +00:00
sphere
f7af77b932 Merge branch 'netgame-gamedata' into 'next' 
[SUGOI] Multiplayer emblems

See merge request STJr/SRB2!1756
 2023-06-12 22:48:25 +00:00
katsy
ca11180976 Merge remote-tracking branch 'stjr/next' into lua-optimized-constants 2023-06-11 12:36:08 -05:00
sphere
363faed8d7 Merge branch 'sucky-steps' into 'next' 
Port increment_move radius clamps from Ring Racers

See merge request STJr/SRB2!2013
 2023-06-09 13:07:07 +00:00
sphere
65e1f88c75 Merge branch 'nightspowerhud' into 'next' 
Add HUD icons for timed NiGHTS powerups

See merge request STJr/SRB2!1949
 2023-06-09 11:34:25 +00:00
sphere
cd1b57a901 Merge branch 'textcolortweaks' into 'next' 
Small text colormap tweaks

See merge request STJr/SRB2!1971
 2023-06-09 11:33:26 +00:00
Sally Coolatta
7fa7653494 Port increment_move radius clamps from Ring Racers 
Fixes inconsistencies with thin players, like with Liftoff Gantry's scale section, and with large characters colliding with steep slopes instead of going up them.
 2023-06-05 13:54:09 -04:00
SMS Alfredo
aa43aa7c8c Call P_ResetCamera Upon Switching To/From an Away View Camera 2023-06-03 15:43:58 -05:00
SMS Alfredo
35b676e313 Fix Camera Interpolation Not Being Reset 2023-06-02 19:52:03 -05:00
Sally Coolatta
e06956a53b Fix skin-only emblems on emblem radar 2023-06-02 16:06:51 -04:00
Sally Coolatta
cf228757a1 Emblems disappear on collection again, only for SP 2023-06-02 16:06:50 -04:00
Sally Coolatta
645dd7d662 Stop endlessly chasing NIGHTSPULL emblems 2023-06-02 16:06:50 -04:00
Sally Coolatta
c1e641be43 Improve emblem sharing conditions 2023-06-02 16:06:50 -04:00
Sally Coolatta
29f55471dd Fix instances reverted to old unlocked variable 2023-06-02 16:06:50 -04:00
Sally Coolatta
d751ad5cf2 Remove "Multiplayer games can't unlock extras!" 2023-06-02 16:06:49 -04:00
Sally Coolatta
9cce2195d4 Make ShareEmblems more Top Down style 2023-06-02 16:06:49 -04:00
Sally Coolatta
3b15d9b4fe Make the level select behave more identically to G_LoadGame 
Noticed some oddities with D_MapChange here with very rarely not changing player position when the map is loaded.
 2023-06-02 16:06:49 -04:00
Sally Coolatta
d8f6ad217c Don't give completion emblems when getting a game over in multiplayer (or any other kind of level reset) 2023-06-02 16:06:48 -04:00
Sally Coolatta
897b81b840 Don't load game from pause level select without save slot 2023-06-02 16:06:48 -04:00
Sally Coolatta
9b6a47783d Show the level select option used to start the level in the pause menu. 
Previously, level select only appeared in the SP pause menu if you load a complete save file.

Now, entering the game through an Extras menu level select shows that level select. Simply makes it more convenient, as you don't need to exit to the main menu again whenever you want to get to another level from an unlocked level select.

Tested all ways you can start a new map from the menu that I can think of (New Save File, Complete Save File, Mid-game Save File, several different Level Select types, custom Warp, Record Attack, Marathon, Tutorial), and could not smuggle wrong level selects into any.
 2023-06-02 16:06:47 -04:00
Sally Coolatta
903a47966d Swap hints & level select on multiplayer pause menu 
This makes it consistent with SP's pause menu order. (Although admittedly I prefer how the other order looks.)
 2023-06-02 16:06:47 -04:00
Sally Coolatta
bc00b13358 Fix Emblem Radar detecting already collected emblems 2023-06-02 16:06:47 -04:00
Sally Coolatta
cb54b1e5ce Fix check that does LevelEmblems but not CompletionEmblems on startup 2023-06-02 16:06:46 -04:00
Sally Coolatta
87e468f365 Allow emerald hunt radar to function if emblem radar is on but all emblems have been collected. 2023-06-02 16:06:46 -04:00
Sally Coolatta
fb5b8ce1be Show tab emblems in Coop 2023-06-02 16:06:46 -04:00
Sally Coolatta
122ddade61 Draw level stats on pause & emblem hints menus in multiplayer 2023-06-02 16:06:46 -04:00
Sally Coolatta
ffe591afee Tie emblem spawning to Coop gametypes 2023-06-02 16:06:45 -04:00
Sally Coolatta
ffb76334ff Don't check time attack emblems in multiplayer 
(Maybe some day...)
 2023-06-02 16:06:45 -04:00
Sally Coolatta
30f6ae6e56 Add read access to shareEmblems (as well as a few other MAINCFG variables that weren't) 2023-06-02 16:06:44 -04:00