Sryder
d4080e94f7
Better fake contrast.
...
Fake contrast for the segs are calculated at map load.
OpenGL only has the options "Standard" and "Smooth" now. Standard is default and replicates software. Smooth changes the contrast more smoothly depending on angle.
2020-05-21 16:32:34 +01:00
Monster Iestyn
b232530695
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
58d62f9881
also do the fovtan multiplication thing with precip sprites
2020-05-20 19:34:18 +01:00
Latapostrophe
8b0aa9e333
Change flash cooldown from 5 to 2 seconds
2020-05-20 14:21:50 +02:00
James R
0e25e9a074
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
sphere
ff6b9a9cf0
Add linedef actions 507 & 508, allow using offsets for actions 502-504.
2020-05-19 23:39:35 +02:00
Monster Iestyn
8ad59bbb51
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
4ad02cae93
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
a2a6208548
do tx checking after tz clamping, not before
2020-05-19 18:43:33 +01:00
Monster Iestyn
b1f804871f
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
c9d2a79ecc
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
f496001c8b
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
a361437f77
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
a928eb3cf7
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
f1744efbd5
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
Sally Coolatta
1ec651ff00
Combine K_FindRandomItems & K_FindEggboxes
2020-05-18 15:30:55 -04:00
Sally Coolatta
c3a5193150
Remove this code, it's in grand-pricks & functional now
2020-05-18 15:19:48 -04:00
Sally Coolatta
0282615c38
Merge branch 'master' into pet-robo
2020-05-18 15:18:37 -04:00
Sally Coolatta
6aa6521fb4
Allow spectators through Block Players lines
2020-05-18 14:52:26 -04:00
Sal
843721cc8f
Merge branch 'sprite-offsets' into 'master'
...
Sprite offsets for horizontal springs
See merge request KartKrew/Kart!265
2020-05-18 14:39:09 -04:00
LJ Sonic
8f864fd52b
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
Sal
ac8513c9ce
Merge branch 'colorize-tweak' into 'master'
...
Skincolor code cleanup + some new colors
See merge request KartKrew/Kart!260
2020-05-18 14:37:15 -04:00
Louis-Antoine
cce2ade8a5
I forgot to test OpenGL :slight_smile:
2020-05-18 20:35:30 +02:00
Sally Coolatta
846ff298eb
Fix k_color.c brief
2020-05-18 10:35:12 -04:00
LJ Sonic
7ffe368501
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
4c37c18385
Fix P_GetZAt for Lua
2020-05-18 16:16:45 +02:00
Louis-Antoine
74fa35221d
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
6af2871fa5
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
Louis-Antoine
d6aed61ded
Allow input buffer to hold more than 64 tics
2020-05-18 11:34:09 +02:00
Louis-Antoine
dc527a8afb
Use per-node reference tics in ExpandTics
2020-05-17 20:23:07 +02:00
Louis-Antoine
24bd03cd22
Store starttic as a raw value in PT_SERVERTICS packets
...
This avoids some desynch issues and is simpler to handle.
Those packets are always big anyway, so the difference is irrelevant.
2020-05-17 20:09:11 +02:00
MascaraSnake
60076f04cb
Remove linedef type 21 from ZB config (somehow I forgot to do that)
2020-05-17 14:18:27 +02:00
MascaraSnake
b6251c1088
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
42e6d1a593
Merge branch 'fof-cleanup' into 'next'
...
FOF cleanup
See merge request STJr/SRB2!910
2020-05-17 02:30:16 -04:00
LJ Sonic
a024621a7a
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
ebeac311af
Add missing packet name
2020-05-16 23:22:33 +02:00
Monster Iestyn
6531fc6e85
lib_sStopSoundByID: fixed mixed declaration and code compiler warning
2020-05-16 16:14:47 +01:00
MascaraSnake
e1dea63413
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
2b3e9cd758
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
a36e9684fd
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
ef85e7f99d
Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location
2020-05-16 10:24:06 +02:00
MascaraSnake
55aacf6b83
polywaypointdata_t: Turn reverse and continuous into flags
2020-05-16 09:49:30 +02:00
MascaraSnake
fe77e7506b
EV_DoPolyObjWaypoint: Don't discard movement if you start at the last waypoint
2020-05-16 09:09:26 +02:00
MascaraSnake
52e05bc8d5
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
bb8ad195c4
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
f8dee9c104
Rewrite T_PolyObjWaypoint to move more smoothly
2020-05-16 08:45:06 +02:00
Sally Coolatta
99d51b80fd
Merge branch 'master' into colorize-tweak
2020-05-16 02:10:40 -04:00
Sally Coolatta
6356984eba
Merge branch 'master' into sprite-offsets
2020-05-16 00:10:06 -04:00
Sally Coolatta
8be2d12b99
Merge remote-tracking branch 'public/master'
2020-05-16 00:08:53 -04:00
Sally Coolatta
bdb871325f
Merge remote-tracking branch 'public/next'
2020-05-16 00:05:55 -04:00