stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 10:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
14194 commits 172 branches 41 tags 280 MiB
Commit graph

14194 commits

This branch
This branch
All branches
Author SHA1 Message Date
MascaraSnake
a78e4e553c Merge branch 'next' into udmf-fofs-mkii 2022-03-18 07:29:02 +01:00
spherallic
9769ad48e0 Prevent Hangsters from sliding across the ceiling. 2022-03-15 13:12:56 +01:00
spherallic
9ef2e7fc11 Change "ding" sound's singularity. 2022-03-13 22:05:17 +01:00
spherallic
113a3bdbb9 Replace magic numbers in sound info by actual SF_ flags 2022-03-13 18:58:34 +01:00
spherallic
29892a5f0c Update README.txt again 2022-03-13 14:22:22 +01:00
spherallic
72870eea72 Merge branch 'next' into fullscreen-toggle 2022-03-13 13:43:11 +01:00
sphere
fd8deac385 Merge branch 'larg' into 'master' 
Fix typo in linux-only compilation flag

See merge request STJr/SRB2!1759
 2022-03-13 12:37:58 +00:00
sphere
5b650bc99d Merge branch 'diddy-kong' into 'master' 
Remove MODID check from hooklib to fix compile issue (resolves #809)

See merge request STJr/SRB2!1758
 2022-03-13 12:37:52 +00:00
spherallic
65d47ba355 Update README.txt 2022-03-13 13:33:46 +01:00
spherallic
bd2d763bd0 Fix Minus & debris behavior in reverse gravity. 2022-03-13 12:34:17 +01:00
spherallic
c782e81700 Give MT_METALSONIC_RACE a drop shadow & removed unused vars. 2022-03-12 17:44:37 +01:00
SteelT
3eaae066ef Show overall grade emblem requirement of a multi-mare NiGHTS stage in SP pause menu 
Fixes #71
 2022-03-08 21:06:01 -05:00
spherallic
6ef7221e38 A few drop shadow-related additions: 
- Added A_SetShadowScale
- Added A_ShadowScream which combines the above with A_Scream, used for 
badnik explosions
- Gave flickies drop shadows
 2022-03-09 00:49:24 +01:00
spherallic
0c7abd88fe Merge branch 'next' into fullscreen-toggle 2022-03-08 23:50:40 +01:00
spherallic
50330c746b Merge branch 'next' into fast-r-load-textures 2022-03-08 22:11:16 +01:00
katsy
b161cb4588 e 2022-03-08 01:06:01 +00:00
katsy
86336d6bed remove MODID check from hooklib to fix compile issue 2022-03-07 18:33:15 -06:00
Sally Coolatta
c0a2d31a22 Merge remote-tracking branch 'upstream/2210-release' into refresh-spr2 2022-03-07 13:09:06 -05:00
spherallic
82fb731cab :dramahog: 2022-03-06 22:52:43 +01:00
spherallic
098fcaa4b0 2.2.10 2022-03-06 20:22:22 +01:00
sphere
7e26377264 Merge branch 'state-changes' into 'next' 
Update Nightopians & other state changes

See merge request STJr/SRB2!1744
 2022-03-06 15:45:59 +00:00
sphere
ab711128c7 Merge branch 'tutorial-scenery' into 'next' 
Tutorial scenery

See merge request STJr/SRB2!1722
 2022-03-06 15:45:53 +00:00
sphere
8e6174ab2d Merge branch 'emblemhealth' into 'next' 
Fix #805

Closes #805

See merge request STJr/SRB2!1757
 2022-03-06 15:44:50 +00:00
sphere
00117476e1 Merge branch 'mobj-spawn-null-fix' into 'next' 
Spawn MT_RAY when attempting to spawn MT_NULL

Closes #801 and #800

See merge request STJr/SRB2!1751
 2022-03-06 11:52:44 +00:00
sphere
f7eafeb665 Merge branch '2022' into 'next' 
2022

See merge request STJr/SRB2!1754
 2022-03-06 11:52:31 +00:00
spherallic
77d4f873b0 Add upper bound to emblemlocations[] access. 2022-03-06 12:20:41 +01:00
aiire
6040f97dd5 added FF_FULLBRIGHT to S_THUNDERCOIN_SPARK 2022-03-04 23:25:25 +00:00
sphere
1abe2689f3 Merge branch 'fix-nonet-2210' into 'next' 
Fix warning when compiling with NONET=1

See merge request STJr/SRB2!1753
 2022-03-04 09:49:36 +00:00
sphere
980bcb4775 Merge branch 'fix-nohw-perfstats-next' into 'next' 
Fix perfstats failing to compile with NOHW=1

See merge request STJr/SRB2!1728
 2022-03-04 09:49:15 +00:00
aiire
8c1991d674 added FF_FULLBRIGHT to S_IVSP 2022-03-04 02:57:45 +00:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
spherallic
3b75ef7e76 Fix warning when compiling with NONET=1 2022-03-03 12:08:15 +01:00
SteelT
893ea10a67 Turn the console warning into a devmode print because turns out it happens more often than I thought 2022-03-02 12:46:24 -05:00
SteelT
34f8464cbf Spawn MT_RAY when attempting to spawn MT_NULL 
Some code assumes that P_SpawnMobj can never return NULL
So spawn MT_RAY in it's place when attempting to spawn MT_NULL and show a console warning
 2022-03-02 12:35:03 -05:00
sphere
a57a0985ee Merge branch 'mt_ray' into 'next' 
Move MT_RAY to the very end of the mobj list

See merge request STJr/SRB2!1747
 2022-02-28 15:13:09 +00:00
sphere
0ad2ac68f7 Merge branch 'demo-frameflags' into 'next' 
Convert old frame flags in Metal recordings to their 2.2.10 equivalents

Closes #775

See merge request STJr/SRB2!1742
 2022-02-28 15:12:28 +00:00
spherallic
d624ee2541 Revert "minor spike optimisations" 
This reverts commit b2d693a547.
 2022-02-28 14:30:01 +01:00
Sally Coolatta
f7b166da07 Refresh sprite2s 
Allows for custom characters to be loaded first, then a wad that adds a custom sprite2, and the custom character's sprite2s won't be discarded.
 2022-02-27 07:56:45 -05:00
spherallic
a6c52f5bad Move MT_RAY to the very end of the mobj list. 2022-02-22 15:49:16 +01:00
sphere
d6f3522333 Merge branch 'fix-vflag-blendmodes' into 'next' 
Fix blendmode V_ flags not working at full opacity in Software

See merge request STJr/SRB2!1717
 2022-02-21 19:58:24 +00:00
spherallic
fcc28d0714 Update seaweed state to utilize new features & sprites. 2022-02-21 16:00:21 +01:00
spherallic
946100939a Update editor configurations & increase Nightopians' hitbox height. 2022-02-19 22:19:39 +01:00
sphere
d532546e46 Merge branch 'mt-null-spawning' into 'next' 
Remove MT_NULL hacks

Closes #721

See merge request STJr/SRB2!1729
 2022-02-19 20:24:34 +00:00
sphere
249a3dfa25 Merge branch 'eggman-hitboxes' into 'next' 
Increase Eggman's hitboxes

See merge request STJr/SRB2!1706
 2022-02-19 20:24:20 +00:00
sphere
c79c6531e6 Merge branch 'server-bots' into 'next' 
Improve bots (resolves #710)

Closes #710

See merge request STJr/SRB2!1679
 2022-02-19 20:24:12 +00:00
spherallic
f077021591 Clean up renderer toggle at SteelT's suggestion. 2022-02-19 15:15:06 +01:00
spherallic
7d1faf7e2c Handle invalid resolutions, make Backspace work in resolution menu. 2022-02-19 12:12:04 +01:00
sphere
7218060a7a :lachyes: 2022-02-19 01:49:19 +00:00
sphere
14cb5415c9 Merge branch 'fix-portals' into 'next' 
Fix portals

See merge request STJr/SRB2!1724
 2022-02-17 12:26:27 +00:00
sphere
a8c2c4ebe6 Merge branch 'checkbotname' into 'next' 
Fix #732

Closes #732

See merge request STJr/SRB2!1739
 2022-02-17 12:26:22 +00:00