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
Louis-Antoine
1b62785cfa
Refactor Lua file transfer code
2020-05-19 15:16:51 +02:00
Louis-Antoine
362adf4576
Allow resuming the most recent file transfer
2020-05-19 11:28:24 +02:00
MascaraSnake
ccd2371d42
Merge branch 'next' into movement-refactor
...
# Conflicts:
# src/p_map.c
2020-05-19 09:50:23 +02: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
Zachary McAlpin
d45a120786
Remove redundant M_QuitResponse call
2020-05-18 14:56:10 -05:00
Zachary McAlpin
5470a03e11
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-18 14:50:58 -05:00
Louis-Antoine
cce2ade8a5
I forgot to test OpenGL :slight_smile:
2020-05-18 20:35:30 +02:00
GoldenTails
40e93e1977
Deprecate FixedRem.
...
It's about time!
2020-05-18 11:29:56 -05: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
3fd2bb4548
Increase the length of the player input buffer even more
2020-05-18 12:35:55 +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
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
Louis-Antoine
ebeac311af
Add missing packet name
2020-05-16 23:22:33 +02:00
Louis-Antoine
35c987e731
Show total size when downloading gamestate
2020-05-16 22:49:20 +02:00
Louis-Antoine
c221b76716
Rewrite file transfer code
...
This code uses a custom packet acknowledgement system,
which is more suited for file transfer and does not suffer from
the small sender window used by the default acknowledgement system
2020-05-16 22:09:00 +02:00
Jaime Passos
588d6798fd
Fix mistake
2020-05-16 14:01:42 -03:00
Jaime Passos
1b81e81c56
Attempt to properly match Software texture blending
...
without messing with the original ASTBlendPixel function
2020-05-16 13:51:10 -03:00
Monster Iestyn
6531fc6e85
lib_sStopSoundByID: fixed mixed declaration and code compiler warning
2020-05-16 16:14:47 +01:00
MascaraSnake
b068a37d14
Merge branch 'udmf-next' into udmf-polyobjects
...
# Conflicts:
# src/p_polyobj.c
2020-05-16 11:18:47 +02: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
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
Steel Titanium
5853e9342d
Fix A_SpinSpin not being usable in Lua or SOC due to an error
2020-05-15 23:05:29 -04:00
MascaraSnake
8e6ead4a2a
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
28d0514588
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
toaster
0834bc0b30
* Swap location of Tutorial and Marathon Run, per sphere's suggestion.
...
* Lock Marathon Run if Record Attack isn't available, to avoid confusing new players.
2020-05-15 21:32:54 +01:00
toaster
76da8262e6
Correctly reset map/timer for retries where the first map in Marathon Run is LF_NORELOAD (by forcing a reload when the retry option is used).
2020-05-15 21:17:57 +01:00
James R
08ea4afb64
Jart? What's that?
2020-05-15 12:57:31 -07:00
Jaime Passos
c421a12fea
Fix ASTBlendPixel outputting empty pixels if the background pixel was empty, BUT if the foreground pixel had no alpha at all
2020-05-15 16:41:39 -03:00
Jaime Passos
668b9bc684
Fix missing sprite column
2020-05-15 16:17:31 -03:00
Jaime Passos
4cc0829b90
Fix colormap mipmap memory leak on the character select in OpenGL
2020-05-15 15:58:20 -03:00
Jaime Passos
1bf1da749e
Fix memory leak
2020-05-15 15:45:00 -03:00
MascaraSnake
8d16937c6a
T_PolyObjWaypoint: Move duplicated movement code into its own function
2020-05-15 17:35:07 +02:00
toaster
5495ea16aa
* In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default.
...
* Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
2020-05-15 16:33:20 +01:00
toaster
285e439f1a
Remove emblem hints from Marathon Run (I think Options is good just for the sake of live events, though).
2020-05-15 15:23:31 +01:00
toaster
8cfe4d9cf8
Introducing "antisplice" - a pair of small highlights on the Marathon bar that is based on the real time the executable has been open for and *isn't* restored with the Live Event Backup, making spliced runs basically intractable.
2020-05-15 15:08:45 +01:00
toaster
e97c77fe71
Fix "press any other key" sending you to HOM hell.
2020-05-15 14:24:29 +01:00
toaster
af7e7bc18c
Re-order Marathon bar to be drawn before FPS and captions if applicable.
2020-05-15 13:39:27 +01:00