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 |
|
Sally Coolatta
|
6839a8cb69
|
OGL model support for runtime sprite offsets
|
2020-05-15 23:58:22 -04:00 |
|
Sally Coolatta
|
ff756ae35c
|
OGL sprite support
|
2020-05-15 23:49:17 -04: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 |
|
Sally Coolatta
|
719d4702c1
|
Merge branch 'master' into sprite-offsets
|
2020-05-15 23:00:30 -04:00 |
|
Sally Coolatta
|
0706ec3b16
|
Merge branch 'master' into colorize-tweak
|
2020-05-15 22:57:06 -04:00 |
|
Sal
|
c3f2c7618f
|
Merge branch 'clearbans-please' into 'master'
Write empty file on clearbans
See merge request KartKrew/Kart-Public!156
|
2020-05-15 19:29:11 -04:00 |
|
Sal
|
9e6933ff48
|
Merge branch 'nomixer-fix' into 'master'
Fix "NOMIXER" flag compiling
See merge request KartKrew/Kart-Public!159
|
2020-05-15 19:28:54 -04:00 |
|
Sal
|
a20a89f5c7
|
Merge branch 'now-we-spin-in-spinout-only' into 'master'
No more first person hyper spin
See merge request KartKrew/Kart-Public!160
|
2020-05-15 19:28:38 -04:00 |
|
Sal
|
280f538335
|
Merge branch 'ferror-errno-yareyare' into 'master'
Fix false file error reporting
See merge request KartKrew/Kart-Public!162
|
2020-05-15 19:27:08 -04:00 |
|
Sal
|
135c9598a8
|
Merge branch 'hud-is-fucked' into 'next'
HUD inconsistency in Record Attack
See merge request KartKrew/Kart-Public!164
|
2020-05-15 19:26:26 -04:00 |
|
Sal
|
35fb7154a1
|
Merge branch 'fastline-identification' into 'next'
Add targets to MT_FASTLINEs that are spawned
See merge request KartKrew/Kart-Public!169
|
2020-05-15 19:24:35 -04:00 |
|
Sal
|
112c7af0bf
|
Merge branch 'player-dot-ping' into 'next'
player.ping for the ping in milliseconds of the player
See merge request KartKrew/Kart-Public!167
|
2020-05-15 19:24:21 -04:00 |
|
Sal
|
dae724b761
|
Merge branch 'alias-recursion-fix' into 'master'
Fix alias recursion never counting down
See merge request KartKrew/Kart-Public!166
|
2020-05-15 19:24:02 -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 |
|
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 |
|
MascaraSnake
|
8d16937c6a
|
T_PolyObjWaypoint: Move duplicated movement code into its own function
|
2020-05-15 17:35:07 +02:00 |
|
MascaraSnake
|
bb03937054
|
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 |
|