MascaraSnake
|
c05d1dd979
|
Merge branch 'software-missing-sprite-column' into 'next'
Fix missing sprite column (resolves #135)
See merge request STJr/SRB2!944
|
2020-05-17 02:30:32 -04:00 |
|
MascaraSnake
|
a7c7f7afa9
|
Merge branch 'fof-cleanup' into 'next'
FOF cleanup
See merge request STJr/SRB2!910
|
2020-05-17 02:30:16 -04:00 |
|
Louis-Antoine
|
bf11e3a361
|
Add missing packet name
|
2020-05-16 23:22:33 +02:00 |
|
Monster Iestyn
|
20e4d5ab9e
|
lib_sStopSoundByID: fixed mixed declaration and code compiler warning
|
2020-05-16 16:14:47 +01:00 |
|
MascaraSnake
|
9b25ab27ca
|
Merge branch 'stop-sound-by-id' into 'next'
S_StopSoundByID Lua support
See merge request STJr/SRB2!925
|
2020-05-16 04:55:46 -04:00 |
|
MascaraSnake
|
5d7bea6400
|
Merge branch 'more-demo-cleanup' into 'next'
More Demo code cleanup
See merge request STJr/SRB2!942
|
2020-05-16 04:52:31 -04:00 |
|
MascaraSnake
|
371a1851e3
|
Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location
|
2020-05-16 10:24:06 +02:00 |
|
MascaraSnake
|
536e355cdf
|
polywaypointdata_t: Turn reverse and continuous into flags
|
2020-05-16 09:49:30 +02:00 |
|
MascaraSnake
|
06dda9c69d
|
EV_DoPolyObjWaypoint: Don't discard movement if you start at the last waypoint
|
2020-05-16 09:09:26 +02:00 |
|
MascaraSnake
|
3680b246c9
|
T_PolyObjWaypoint: We can find waypoints in constant time now, so no need to store the waypoint mobj in the thinker anymore
|
2020-05-16 09:03:02 +02:00 |
|
MascaraSnake
|
1057c0f7c1
|
T_PolyObjWaypoint: If the polyobject reaches its target exactly, find next waypoint in the same tic
|
2020-05-16 08:49:03 +02:00 |
|
MascaraSnake
|
e422d1fa1d
|
Rewrite T_PolyObjWaypoint to move more smoothly
|
2020-05-16 08:45:06 +02:00 |
|
Steel Titanium
|
69c86c63b3
|
Fix A_SpinSpin not being usable in Lua or SOC due to an error
|
2020-05-15 23:05:29 -04:00 |
|
MascaraSnake
|
ed9b76e4b9
|
Merge branch 'opengl-character-select-mipmap-memory-leak-fix' into 'next'
Fix colormap mipmap memory leak on the character select in OpenGL
See merge request STJr/SRB2!943
|
2020-05-15 16:41:19 -04:00 |
|
MascaraSnake
|
8f4ed5af62
|
Merge branch 'nights-character-select' into 'next'
Character select in Nights mode.
See merge request STJr/SRB2!862
|
2020-05-15 16:39:38 -04:00 |
|
Jaime Passos
|
00ac9deb5b
|
Fix missing sprite column
|
2020-05-15 16:17:31 -03:00 |
|
Jaime Passos
|
dd3c7aa0af
|
Fix colormap mipmap memory leak on the character select in OpenGL
|
2020-05-15 15:58:20 -03:00 |
|
MascaraSnake
|
0508f99419
|
T_PolyObjWaypoint: Move duplicated movement code into its own function
|
2020-05-15 17:35:07 +02:00 |
|
MascaraSnake
|
9cd9d2e0d7
|
Merge branch 'carry-dust-devil' into 'next'
Add carry types to Dust devils
See merge request STJr/SRB2!886
|
2020-05-15 02:50:29 -04:00 |
|
Monster Iestyn
|
ee520b4a0d
|
split significant chunks of G_CheckDemoStatus into their own smaller functions, also give writing demo checksums its own little function
|
2020-05-14 20:57:21 +01:00 |
|
ZipperQR
|
6a9543b1c2
|
no message
|
2020-05-14 03:35:46 +03:00 |
|
MascaraSnake
|
7413da918b
|
Store PolyObject waypoint return behavior in an enum
|
2020-05-13 16:21:47 +02:00 |
|
MascaraSnake
|
b561ee7921
|
Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway
|
2020-05-13 14:40:07 +02:00 |
|
MascaraSnake
|
acdb4b42ea
|
Merge branch 'actnum-tweaks' into 'next'
Act number tweaks
See merge request STJr/SRB2!905
|
2020-05-13 04:25:53 -04:00 |
|
MascaraSnake
|
9d06cb4be4
|
Merge branch 'fix-window-icon' into 'master'
Fix window icon being reset when switching renderers on non-Windows platforms
See merge request STJr/SRB2!898
|
2020-05-13 04:14:51 -04:00 |
|
MascaraSnake
|
0e2fb59650
|
Merge branch 'ogl-gif-fix' into 'master'
Fix OpenGL only recording the first frame of unoptimized GIFs
See merge request STJr/SRB2!928
|
2020-05-13 04:09:58 -04:00 |
|
MascaraSnake
|
aa16bd22f9
|
Fix accidental swap of first and last waypoint
|
2020-05-13 09:32:00 +02:00 |
|
MascaraSnake
|
36843cbfd6
|
Merge branch 'next' into waypoints
|
2020-05-12 23:51:32 +02:00 |
|
MascaraSnake
|
d708789c3a
|
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
|
2020-05-12 23:50:30 +02:00 |
|
Monster Iestyn
|
8c88c3dbb4
|
added missing extern keyword for ntemprecords in doomstat.h (definition is in g_game.c)
|
2020-05-12 18:43:49 +01:00 |
|
Monster Iestyn
|
064f4bcf34
|
added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case)
|
2020-05-12 18:42:16 +01:00 |
|
Monster Iestyn
|
dab212dc56
|
turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)
|
2020-05-12 18:40:51 +01:00 |
|
Monster Iestyn
|
89cd756cd8
|
make savegamename in doomdef.h an extern, put the actual definition in d_main.c
|
2020-05-12 18:37:15 +01:00 |
|
sphere
|
4eb5f09c6f
|
Restore SHORT().
|
2020-05-12 17:20:29 +02:00 |
|
sphere
|
0287c6956e
|
Fix some errors and add some comments. Also, actnum is not an INT32.
|
2020-05-12 17:20:28 +02:00 |
|
sphere
|
69c11a8220
|
Support act numbers up to 99 and draw both digits individually.
|
2020-05-12 17:17:24 +02:00 |
|
MascaraSnake
|
435e6c9812
|
Rename variables for Fang waypoints, in preparation for new global waypoint data structure
|
2020-05-12 14:53:10 +02:00 |
|
Steel Titanium
|
feced5ec3c
|
Merge branch 'master' into next
|
2020-05-11 18:20:09 -04:00 |
|
SteelT
|
78fe9af56a
|
Merge branch 'splitscreen-titlecards-fix' into 'master'
Fix splitscreen Title Card act name regression
See merge request STJr/SRB2!934
|
2020-05-11 18:18:22 -04:00 |
|
SteelT
|
432cca7556
|
Merge branch 'menu-soc-bullshit-mergefix' into 'master'
Menu soc bullshit mergefix
See merge request STJr/SRB2!933
|
2020-05-11 18:17:59 -04:00 |
|
James R
|
e80f6497d7
|
Merge remote-tracking branch 'origin/next' into 2.2.4-prep
|
2020-05-11 15:01:32 -07:00 |
|
Louis-Antoine
|
0c4f983eb5
|
Fix crash with rollout rock
|
2020-05-11 23:48:35 +02:00 |
|
James R
|
a645f3a44f
|
Update patch.pk3 asset hash
|
2020-05-11 14:41:36 -07:00 |
|
James R
|
c52c8e0282
|
Update version names, SUBVERSION, MODVERSION
|
2020-05-11 14:41:36 -07:00 |
|
Monster Iestyn
|
d508d16cef
|
Merge branch 'master' into next
|
2020-05-11 20:08:02 +01:00 |
|
Zwip-Zwap Zapony
|
334ad93c56
|
Fix splitscreen Title Card act name regression
This fixes act names not being shown on player 2's view
|
2020-05-11 19:57:20 +02:00 |
|
MascaraSnake
|
e288c9d4f2
|
Merge branch 'fix-simple-camera-and-eggstatue' into 'next'
Fix Simple Camera not working with the tutorial's statue challenge
See merge request STJr/SRB2!931
|
2020-05-11 13:31:09 -04:00 |
|
toaster
|
e5bc0583e5
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit
# Conflicts:
# src/m_menu.c
|
2020-05-11 15:00:31 +01:00 |
|
James R
|
7257fc730a
|
Remove instances of HAVE_BLUA that actually disable Lua now
|
2020-05-10 19:59:56 -07:00 |
|
James R
|
6b4ee94e38
|
Use camera angle, not mobj angle, when comparing Angle Anchor
|
2020-05-10 19:40:28 -07:00 |
|
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 |
|
Zipper
|
87f7100d2e
|
Update p_user.c
|
2020-05-06 09:30:15 -04:00 |
|
ZipperQR
|
d0376e284a
|
S_StopSoundByID Lua support
|
2020-05-06 16:22:04 +03: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 |
|
ZipperQR
|
0d7c49e7e4
|
no message
|
2020-05-03 14:02:23 +03:00 |
|
MascaraSnake
|
d0d25025e1
|
Refactor P_CheckBouncySectors
|
2020-05-03 10:01:58 +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 |
|