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

14142 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sally Coolatta
d7c5e16f6c Play sound globally if emblems are shared 2023-06-02 16:06:44 -04:00
Sally Coolatta
29c61fac88 Allow completion emblems in multiplayer 2023-06-02 16:06:44 -04:00
Sally Coolatta
303d636f8e Individual emblems mode 2023-06-02 16:06:43 -04:00
Sally Coolatta
49fa46d80e Online emblems 
Currently, emblems share with everyone. Will add an option to toggle this.
 2023-06-02 16:06:43 -04:00
SteelT
1d9bcad797 Merge branch 'next' into ipv6 2023-06-02 14:09:13 -04:00
SMS Alfredo
58b3b8e075 Fix Flung Spheres not using the Blue Sphere collection effect 2023-05-31 22:33:16 -05:00
Zwip-Zwap Zapony
05f1a9a2c8 Suppress libdivide warnings in GCC/Clang 2023-05-29 14:38:22 +02:00
sphere
d6d424f102 Merge branch 'fix-remove-facetarget-action' into 'next' 
Fix segfault when P_RemoveMobj is called within A_FaceTarget action

See merge request STJr/SRB2!1974
 2023-05-26 01:15:40 +00:00
spherallic
264ec02223 Merge branch 'next' into bbox 2023-05-26 03:06:30 +02:00
sphere
369d39a859 Merge branch 'stuckonyou' into 'next' 
Allow targeting invulnerable bosses & don't break targeting when they take damage

See merge request STJr/SRB2!1917
 2023-05-25 23:48:56 +00:00
sphere
38575f52e6 Merge branch 'scoreattacked' into 'next' 
Reallow score chains from rolling

See merge request STJr/SRB2!1833
 2023-05-25 22:48:31 +00:00
sphere
c37af2bf78 Merge branch 'uncap-console' into 'next' 
Interpolate console animation, Make con_height update on the fly

Closes #905

See merge request STJr/SRB2!1878
 2023-05-25 22:36:24 +00:00
sphere
796c06e2f7 Merge branch 'issue834' into 'next' 
When attaching to a wall to do a climb, the second sidedef wasn't be handled properly.

Closes #834

See merge request STJr/SRB2!1908
 2023-05-25 21:11:25 +00:00
sphere
1043a523d8 Merge branch 'fix-crushclaw-armageddon-hit' into 'next' 
Fix segfault when Crushstaceans hit a player with Armageddon shield

See merge request STJr/SRB2!1980
 2023-05-25 21:10:45 +00:00
sphere
19de187b02 Merge branch 'fix-getfreemem' into 'next' 
Fix I_GetFreeMem for 64-bit platforms

See merge request STJr/SRB2!1982
 2023-05-25 21:10:02 +00:00
sphere
5fe6138f7f Merge branch 'fix-removed-shield-segfault' into 'next' 
Fix segfault when shields are removed after thinking

See merge request STJr/SRB2!1975
 2023-05-25 21:06:40 +00:00
sphere
89ce385fb9 Merge branch 'fix-null-standingslope' into 'next' 
Fix segfault when going up steep slopes in rare cases

See merge request STJr/SRB2!1978
 2023-05-25 21:06:00 +00:00
sphere
cb3acbc701 Merge branch 'fixlightleveldecrease' into 'next' 
Fix linedef action 420 being unable to lower light levels properly by default

See merge request STJr/SRB2!1977
 2023-05-25 21:03:40 +00:00
sphere
1a0c931053 Merge branch 'nobombsphereattract' into 'next' 
Don't attract bomb spheres with Attraction shield

See merge request STJr/SRB2!1953
 2023-05-25 21:02:48 +00:00
sphere
cf0c5f9084 Merge branch 'midsave-addons' into 'next' 
Allow Cosmetic Add-Ons Mid-Save

Closes #911

See merge request STJr/SRB2!1877
 2023-05-25 21:01:30 +00:00
sphere
777a1c6b83 Merge branch 'plane-scroller-tweaks-again' into 'next' 
Plane scroller & wind/current/pusher improvements (again)

See merge request STJr/SRB2!1811
 2023-05-25 21:00:30 +00:00
sphere
ce504d4e8e Merge branch 'mobj-dispoffset' into 'next' 
Turn dispoffset into a mobj field

See merge request STJr/SRB2!1708
 2023-05-25 20:59:43 +00:00
Zwip-Zwap Zapony
3f5e7ff0d0 Interpolate shadows when scaling mobjs 2023-05-25 15:09:53 +02:00
Zwip-Zwap Zapony
b2313aa4bd Rewrite F_SkyScroll to fix overflows 2023-05-25 14:55:21 +02:00
MascaraSnake
55d96daa28 Merge branch 'refresh-spr2' into 'next' 
[SUGOI] Refresh Sprite2s

See merge request STJr/SRB2!1750
 2023-05-24 05:04:31 +00:00
MascaraSnake
e4933b3e94 Merge branch 'allow-modified-saving' into 'next' 
[SUGOI] Allow saving in modified games.

See merge request STJr/SRB2!1749
 2023-05-24 05:04:26 +00:00
spherallic
b9c86a0f7f Zone Builder config updates 2023-05-23 17:54:32 +02:00
spherallic
eb1492fe6e Zone Builder config updates 2023-05-23 17:51:56 +02:00
Jaime Ita Passos
7dc74fc364 Fix declaration of I_GetFreeMem in src/dummy/i_system.c 2023-05-19 15:12:20 -03:00
Jaime Ita Passos
2f98cd3b97 Fix I_GetFreeMem 2023-05-19 14:26:30 -03:00
Gustaf Alhäll
d4951f7cdd
Fix segfault when Crushstaceans hit a player with Armageddon shield 2023-05-16 22:18:11 +02:00
Gustaf Alhäll
6bb3ee226f
Fix segfault when going up steep slopes in rare cases 2023-05-16 19:34:22 +02:00
spherallic
2c689bae52 2.2.11 2023-05-16 18:20:15 +02:00