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

10076 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
97cf90b9af Merge branch 'crumblebob-fixes' into 'next' 
Fix crumbling floatbob FOFs in MP SS5 rising up into space for no reason

See merge request STJr/SRB2!961
 2020-05-25 07:58:21 -04:00
Monster Iestyn
ed25fefcae T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5 due to P_FloorzAtPos messing up as a result) 2020-05-24 21:15:31 +01:00
MascaraSnake
747d784c77 Merge branch 'splitshot-notarget-fix' into 'next' 
A_SplitShot no target fix

See merge request STJr/SRB2!956
 2020-05-23 07:52:36 -04:00
MascaraSnake
0b7f8ca3e8 Merge branch 'lua-mapthing-len' into 'next' 
Lua mapthing len

See merge request STJr/SRB2!957
 2020-05-23 07:51:58 -04:00
Monster Iestyn
4b7f0f49f1 added the ability to get the # of a mapthing_t in Lua 2020-05-22 18:32:34 +01:00
Monster Iestyn
c9c7327011 A_SplitShot fix: don't even attempt to A_FaceTarget (or anything beyond) if there is no target to face to begin with 2020-05-21 19:42:48 +01:00
Monster Iestyn
7722d41be6 Merge branch 'sprite-projection-fixes' into 'next' 
Sprite projection fixes

See merge request STJr/SRB2!954
 2020-05-20 15:33:30 -04:00
Monster Iestyn
702a7041d4 also do the fovtan multiplication thing with precip sprites 2020-05-20 19:34:18 +01:00
James R
4eeae51cbb Merge branch 'more-lua-map-names' into 'next' 
G_BuildMapTitle for Lua, G_BuildMapName outside of levels

See merge request STJr/SRB2!694
 2020-05-19 23:13:35 -04:00
Monster Iestyn
c3d576058a on second thought maybe we don't need extra tx clamping, it turns out to be more effort than it's worth (at least for now) 
meanwhile, let's move x/yscale calculations down since we don't actually need them until later on
 2020-05-19 22:00:34 +01:00
Monster Iestyn
65d6b04fd2 change limits for tx based on fov, by multiplying by fovtan 
this makes it so that higher fov values can actually let you see all the sprites that should be in the view
 2020-05-19 18:54:39 +01:00
Monster Iestyn
35e5d673e0 do tx checking after tz clamping, not before 2020-05-19 18:43:33 +01:00
Monster Iestyn
12e1094143 We don't actually need x1 or x2 until these points in the function, at least for papersprites 2020-05-19 17:23:22 +01:00
Monster Iestyn
1a790235c6 added basic culling of papersprites if tx for either is too large, proper clamping to be added later 
also removed some commented out old code
 2020-05-19 17:19:44 +01:00
Monster Iestyn
c8320b6c9d split "rot" into two variables: frame and rot, for frame number and rotation angle 
it always bothered me that "rot" was used for both of the above, since it confused me as to what it was for every time I look at this function
 2020-05-19 16:58:53 +01:00
Monster Iestyn
dd42682791 remove gxt and gyt, as they are unnecessary 
also add a few comments to explain what tx/tz are
 2020-05-19 16:48:50 +01:00
MascaraSnake
6f854f2de3 Merge branch 'more-polyobject-cleanup' into 'next' 
Smooth polyobject movement and other cleanup

See merge request STJr/SRB2!947
 2020-05-18 16:00:55 -04:00
MascaraSnake
33a22331f8 Merge branch 'waypoints' into 'next' 
Store waypoints at map load instead of iterating through the thinker list to find them

See merge request STJr/SRB2!938
 2020-05-18 16:00:46 -04:00
LJ Sonic
4619646860 Merge branch 'slope-cleanup' into 'next' 
I forgot to test OpenGL :slight_smile:

See merge request STJr/SRB2!953
 2020-05-18 14:37:18 -04:00
Louis-Antoine
d40a8efce2 I forgot to test OpenGL :slight_smile: 2020-05-18 20:35:30 +02:00
LJ Sonic
536104fc5b Merge branch 'slope-cleanup' into 'next' 
Encapsulate plane height checks

See merge request STJr/SRB2!860
 2020-05-18 10:17:25 -04:00
Louis-Antoine
435643b958 Fix P_GetZAt for Lua 2020-05-18 16:16:45 +02:00
Louis-Antoine
d0abd6e86c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_spec.c
 2020-05-18 16:14:05 +02:00
Louis-Antoine
a06c4a8c98 Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
MascaraSnake
4cd5d76066 Remove linedef type 21 from ZB config (somehow I forgot to do that) 2020-05-17 14:18:27 +02:00
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
LJ Sonic
208af4e710 Merge branch 'fix-packet-name' into 'next' 
Add missing packet name

See merge request STJr/SRB2!948
 2020-05-16 17:27:47 -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
34d2bd49ca Merge branch 'signspinactiontypo' into 'next' 
Fix A_SignSpin not being usable in Lua or SOC due to an error

See merge request STJr/SRB2!946
 2020-05-16 04:49:33 -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