sphere
|
61dfee7e13
|
Don't show the FPS counter during startup.
|
2020-05-11 01:33:34 +02:00 |
|
|
Steel Titanium
|
fabd76a5fe
|
Merge branch 'next' into 2.2.3-prep
|
2020-05-10 17:05:56 -04:00 |
|
|
Monster Iestyn
|
49864f646e
|
Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep
|
2020-05-10 20:10:11 +01:00 |
|
|
Monster Iestyn
|
197da95a23
|
Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj!
precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct
|
2020-05-10 20:09:08 +01:00 |
|
|
lachwright
|
215ff828f8
|
Merge branch 'master' into next
|
2020-05-11 01:29:10 +08:00 |
|
|
Lachlan Wright
|
357ad68599
|
Merge branch 'patch_music' into 'next'
patch_music.pk3
See merge request STJr/SRB2!812
|
2020-05-10 12:51:49 -04:00 |
|
|
lachwright
|
b7af502ed4
|
Update MD5 hashes for player.dta and patch.pk3
|
2020-05-11 00:23:32 +08:00 |
|
|
Monster Iestyn
|
3ce4c1b789
|
Fix logging on Mac
These fixes were suggested by Sveciaost on #mac-users on Discord
|
2020-05-10 16:47:01 +01:00 |
|
|
Monster Iestyn
|
baee6a1d57
|
Update version number to 2.2.3 in all the usual files, also updated MODVERSION
|
2020-05-10 16:02:23 +01:00 |
|
|
LJ Sonic
|
280633019a
|
Merge branch 'gfz3laser-mkii' into 'next'
New Greenflower Zone 3 laser
See merge request STJr/SRB2!924
|
2020-05-09 16:40:40 -04:00 |
|
|
LJ Sonic
|
62d5d16f5c
|
Merge branch 'optimise-archiving' into 'next'
Optimise net-archiving of Lua strings, numbers and booleans
See merge request STJr/SRB2!904
|
2020-05-09 16:40:28 -04:00 |
|
|
Jaime Passos
|
ab7987d1cf
|
Fix OpenGL only recording the first frame of unoptimized GIFs
|
2020-05-09 16:59:09 -03:00 |
|
|
sphere
|
c55d6dbc9f
|
Make showfps save to config, and add a compact option.
|
2020-05-08 15:40:50 +02:00 |
|
|
Lachlan
|
426925c5fc
|
Play the 1-up sound when 1upsound is set to sound
|
2020-05-08 04:07:00 +08:00 |
|
|
MascaraSnake
|
60aa0f82f3
|
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
|
2020-05-07 22:00:02 +02:00 |
|
|
MascaraSnake
|
650f44566f
|
Fixed a typo
|
2020-05-07 21:59:39 +02:00 |
|
|
lachwright
|
9d21d790a4
|
Prevent laser sprites clipping into walls/off ledges
|
2020-05-08 02:58:56 +08:00 |
|
|
lachwright
|
36b400387e
|
Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it
|
2020-05-07 23:24:33 +08:00 |
|
|
lachwright
|
3a1988fc01
|
Fix knockback scaling
|
2020-05-07 22:47:34 +08:00 |
|
|
lachwright
|
51a5ece294
|
Merge remote-tracking branch 'origin/next' into gfz3laser-mkii
|
2020-05-07 22:34:44 +08:00 |
|
|
Alam Ed Arias
|
24df9f032f
|
Merge branch 'master' into next
|
2020-05-06 18:36:20 -04:00 |
|
|
Alam Ed Arias
|
38232ce07e
|
fix build errors in public master
|
2020-05-06 18:35:54 -04:00 |
|
|
Monster Iestyn
|
30105621d4
|
Merge branch 'master' into next
|
2020-05-06 21:51:36 +01:00 |
|
|
Lachlan
|
05ea95d0eb
|
Merge branch 'next' into gfz3laser-mkii
|
2020-05-06 09:10:27 +08:00 |
|
|
lachwright
|
63cb58a10a
|
Update new GFZ3 laser
|
2020-05-06 09:03:03 +08:00 |
|
|
lachwright
|
92c900f284
|
New GFZ3 laser
|
2020-05-06 09:01:02 +08:00 |
|
|
Louis-Antoine
|
2d6c9a94f4
|
Fix compiler warning
|
2020-05-05 14:05:19 +02:00 |
|
|
MascaraSnake
|
5282f01a53
|
Fix PolyObject flags not being applied when there is no parameter line
|
2020-05-05 08:40:59 +02:00 |
|
|
MascaraSnake
|
023c095d55
|
Merge branch 'polyobject-cleanup' into 'next'
PolyObject cleanup
See merge request STJr/SRB2!919
|
2020-05-04 14:18:08 -04:00 |
|
|
MascaraSnake
|
de100b076a
|
PolyObject: Allow translucency to be set via X offset
|
2020-05-04 19:47:39 +02:00 |
|
|
MascaraSnake
|
d03742b15b
|
Merge branch 'level-header-sector-typeskd' into 'next'
Allow some map-wide settings to be set via level header instead of sector types
See merge request STJr/SRB2!917
|
2020-05-04 05:21:49 -04:00 |
|
|
MascaraSnake
|
248df41a2f
|
Simplify set/fade polyobject translucency code
|
2020-05-04 10:29:35 +02:00 |
|
|
MascaraSnake
|
e3ddb413aa
|
Make PolyObject special functions return boolean instead of INT32
|
2020-05-04 10:07:38 +02:00 |
|
|
MascaraSnake
|
78a700f5fa
|
Remove non-descriptive comments
|
2020-05-04 10:01:44 +02:00 |
|
|
MascaraSnake
|
2be775e74c
|
Move parameter parsing for EV_DoPolyObjFlag into its own function
|
2020-05-04 09:58:27 +02:00 |
|
|
MascaraSnake
|
482adc6124
|
Pass parameters to EV_DoPolyObjFlag in a struct and not via the line
|
2020-05-04 09:54:32 +02:00 |
|
|
MascaraSnake
|
02c347ada2
|
Refactor Polyobj_findSegs
|
2020-05-04 01:28:21 +02:00 |
|
|
MascaraSnake
|
8ae635c7ba
|
Purge uninformative comments
|
2020-05-04 00:17:05 +02:00 |
|
|
MascaraSnake
|
b82c3c2089
|
Clean up Polyobj_GetInfo
|
2020-05-03 23:55:23 +02:00 |
|
|
MascaraSnake
|
5de11441a1
|
Remove "explicitly include line in polyobject" code which has never worked
|
2020-05-03 23:47:26 +02:00 |
|
|
MascaraSnake
|
700b340827
|
Allow map-wide gravity to be set via level header
|
2020-05-03 18:33:18 +02:00 |
|
|
MascaraSnake
|
4b87bee759
|
Add level header options for setting special stage time and spheres requirements
|
2020-05-03 17:56:49 +02:00 |
|
|
MascaraSnake
|
a9bd307dc0
|
Merge branch 'next' into egg-capsule
# Conflicts:
# src/p_spec.c
|
2020-05-03 15:29:20 +02:00 |
|
|
MascaraSnake
|
dd50990e85
|
Add "trigger egg capsule" linedef executor
|
2020-05-03 15:22:13 +02:00 |
|
|
Steel Titanium
|
887c25e047
|
Remove inline keyword from P_DoTwinSpin function
The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error
|
2020-05-02 17:39:55 -04:00 |
|
|
Monster Iestyn
|
1528f2aef8
|
Fix drop shadow and rotsprite code to use SHORT()
|
2020-05-02 17:13:16 +01:00 |
|
|
MascaraSnake
|
d9ed914e14
|
Merge branch 'amyswings' into 'next'
Restore jump-related pflags properly during twinspin
See merge request STJr/SRB2!908
|
2020-05-02 10:03:49 -04:00 |
|
|
MascaraSnake
|
485a4e5035
|
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
|
2020-05-02 12:08:31 +02:00 |
|
|
MascaraSnake
|
2449c66b78
|
Merge branch 'find-sector-from-tag' into 'next'
Remove P_FindSectorFromLineTag and P_FindLineFromLineTag
See merge request STJr/SRB2!901
|
2020-05-01 05:49:52 -04:00 |
|
|
MascaraSnake
|
7922306113
|
Merge branch 'more-thinker-refactor' into 'next'
More thinker refactoring
See merge request STJr/SRB2!900
|
2020-05-01 05:47:14 -04:00 |
|
|
MascaraSnake
|
790affd13b
|
Merge branch 'next' into elevator-cleanup
# Conflicts:
# src/p_saveg.c
|
2020-05-01 11:42:05 +02:00 |
|
|
MascaraSnake
|
be0959fa90
|
Remove bogus comments from p_saveg.c
|
2020-05-01 11:25:32 +02:00 |
|
|
LJ Sonic
|
ef5f8f3bd2
|
Merge branch 'join-delay' into 'next'
Add a minimum delay between connections
See merge request STJr/SRB2!889
|
2020-05-01 03:29:15 -04:00 |
|
|
lachwright
|
f9b831c00b
|
Restore jump-related pflags properly during twinspin
|
2020-05-01 06:34:30 +08:00 |
|
|
Monster Iestyn
|
279ad0707e
|
Merge branch 'strncpy-brullshit' into 'next'
Fix a few strncpy bullshit
See merge request STJr/SRB2!895
|
2020-04-30 14:53:46 -04:00 |
|
|
Monster Iestyn
|
0d3876abf3
|
Merge branch 'next' into netarchive-cleanup
|
2020-04-29 15:27:07 +01:00 |
|
|
Monster Iestyn
|
2f0bf3860f
|
Don't discard const, added missing &
|
2020-04-29 15:24:28 +01:00 |
|
|
Monster Iestyn
|
d89d2505bb
|
Whoops the third
|
2020-04-29 14:45:52 +01:00 |
|
|
Louis-Antoine
|
9b3917cd72
|
Revert "Replace a few instance of strncpy with strlcpy"
This reverts commit 2e27f32d3e.
|
2020-04-29 10:55:49 +02:00 |
|
|
Louis-Antoine
|
ae05f11c45
|
Optimise number archiving
|
2020-04-28 23:12:02 +02:00 |
|
|
Louis-Antoine
|
3e8fb8db25
|
Optimise boolean archiving
|
2020-04-28 23:11:28 +02:00 |
|
|
Louis-Antoine
|
2e3c110534
|
Optimise string archiving and allow for longer strings
|
2020-04-28 22:19:44 +02:00 |
|
|
LJ Sonic
|
5c16e33432
|
Merge branch 'fix-intermission-mouse' into 'next'
Fix mouse being grabbed in intermission and cutscenes
See merge request STJr/SRB2!891
|
2020-04-28 04:25:32 -04:00 |
|
|
MascaraSnake
|
df692645c4
|
Merge branch 'raisethinker' into 'next'
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)
See merge request STJr/SRB2!899
|
2020-04-27 15:04:37 -04:00 |
|
|
MascaraSnake
|
4cec927bbb
|
Replace P_FindLineFromLineTag with P_FindLineFromTag
|
2020-04-27 14:34:42 +02:00 |
|
|
MascaraSnake
|
0a0812bc57
|
Remove P_FindSectorFromLineTag
|
2020-04-27 14:31:37 +02:00 |
|
|
MascaraSnake
|
4f3d837835
|
Store "no bosses" setting for lasers in thinker instead of checking sourceline.
|
2020-04-27 13:09:57 +02:00 |
|
|
MascaraSnake
|
630af5d225
|
Pass thwomp settings to P_AddThwompThinker
|
2020-04-27 13:01:31 +02:00 |
|
|
MascaraSnake
|
556c2a8c18
|
Store tag instead of sourceline in raise thinker
|
2020-04-27 12:54:08 +02:00 |
|
|
MascaraSnake
|
2f9cccf287
|
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)
|
2020-04-27 11:19:07 +02:00 |
|
|
Steel Titanium
|
e0f9b82544
|
Fix window icon being reset when switching renderers on non-Windows platforms
|
2020-04-26 18:46:43 -04:00 |
|
|
MascaraSnake
|
c026b707ce
|
Make new thinker loading functions set floordata/ceilingdata where necessary
|
2020-04-26 18:54:03 +02:00 |
|
|
MascaraSnake
|
fb1746e95b
|
Deprecate the camera scanner effect and print a warning when it's used
|
2020-04-26 18:42:31 +02:00 |
|
|
MascaraSnake
|
82bf72f5e1
|
Remove obsolete stuff from elevator_t
|
2020-04-26 18:38:45 +02:00 |
|
|
MascaraSnake
|
f4282718dc
|
Accidentally changed the wrong SaveElevatorThinker call to SaveCrumbleThinker
|
2020-04-26 18:31:39 +02:00 |
|
|
MascaraSnake
|
554de0e0f5
|
T_StartCrumble refactoring, part 1
|
2020-04-26 16:51:14 +02:00 |
|
|
MascaraSnake
|
295ed303af
|
Make T_StartCrumble use its own thinker data structure
|
2020-04-26 11:55:10 +02:00 |
|
|
Louis-Antoine
|
2e27f32d3e
|
Replace a few instance of strncpy with strlcpy
|
2020-04-26 00:42:17 +02:00 |
|
|
Louis-Antoine
|
212358dbba
|
Restore old entry searching functions and add alternate versions for long names
|
2020-04-26 00:39:52 +02:00 |
|
|
Monster Iestyn
|
7034e2537a
|
whoops the sequel
|
2020-04-25 16:53:52 +01:00 |
|
|
Monster Iestyn
|
049a7db877
|
whoops
|
2020-04-25 16:52:11 +01:00 |
|
|
MascaraSnake
|
3cd8f62ae9
|
Remove a line I overlooked in the thinker cleanup branch
|
2020-04-25 08:18:48 +02:00 |
|
|
Monster Iestyn
|
49cceda15b
|
Do the same with writing ARCH_FFLOOR values in Lua archiving code (reading was already dealt with years ago)
|
2020-04-24 22:43:23 +01:00 |
|
|
Monster Iestyn
|
7dda5f6b94
|
created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID
|
2020-04-24 22:29:41 +01:00 |
|
|
Monster Iestyn
|
e406a7bef5
|
no diff3 needed for line archiving
|
2020-04-24 20:58:38 +01:00 |
|
|
Monster Iestyn
|
1e61229cb7
|
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
|
2020-04-24 20:57:48 +01:00 |
|
|
Monster Iestyn
|
c1d2b8301b
|
split sector/lines archiving-related code into their own functions too
|
2020-04-24 20:40:50 +01:00 |
|
|
Monster Iestyn
|
2d45decbb0
|
remove statsec and statline as they appear to be entirely unused
|
2020-04-24 20:28:01 +01:00 |
|
|
Monster Iestyn
|
08a7fcbe8d
|
Split off FOF archiving-related code into their own functions
|
2020-04-24 20:26:57 +01:00 |
|
|
Monster Iestyn
|
d1d006a1a7
|
Merge branch 'thinker-cleanup' into 'next'
Plane movement thinker cleanup
See merge request STJr/SRB2!880
|
2020-04-24 14:30:52 -04:00 |
|
|
Louis-Antoine
|
e4f2c1dc70
|
Fix mouse being grabbed in intermission and cutscenes
|
2020-04-24 18:33:35 +02:00 |
|
|
Monster Iestyn
|
9df5d6e1e0
|
These are flags! Serves me right for just rushing this out
|
2020-04-24 16:53:54 +01:00 |
|
|
Monster Iestyn
|
2419b65f79
|
Sync crumblestate in netgames
|
2020-04-24 16:40:09 +01:00 |
|
|
Louis-Antoine
|
c90cc3b58f
|
Add a menu option for the minimum join delay
|
2020-04-24 15:38:07 +02:00 |
|
|
Louis-Antoine
|
9ec4ba3824
|
Add a minimum delay between connections
|
2020-04-24 14:05:15 +02:00 |
|
|
Monster Iestyn
|
bfb2467796
|
Merge branch 'uh-oh-spriteinfo' into 'next'
Fix minor issue with lua spriteinfo
See merge request STJr/SRB2!872
|
2020-04-23 16:12:55 -04:00 |
|
|
Monster Iestyn
|
4ef8093e92
|
Merge branch 'emeraldspawnfix' into 'next'
Fix emerald hunt not working properly, part 2
See merge request STJr/SRB2!887
|
2020-04-23 15:41:27 -04:00 |
|
|
Monster Iestyn
|
a71fe6445a
|
Merge branch 'master' into next
|
2020-04-23 18:49:53 +01:00 |
|
|
sphere
|
67f511a55e
|
Restore carelessly removed const keywords.
|
2020-04-22 23:38:10 +02:00 |
|
|
sphere
|
f85bfc87f5
|
Move variable declarations outside of for loops.
|
2020-04-22 23:17:18 +02:00 |
|