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 |
|
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 |
|
Louis-Antoine
|
cce2ade8a5
|
I forgot to test OpenGL :slight_smile:
|
2020-05-18 20:35:30 +02: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 |
|
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 |
|
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 |
|
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 |
|
Monster Iestyn
|
3c1bd4215f
|
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
|
88c32f7790
|
no message
|
2020-05-14 03:35:46 +03:00 |
|
MascaraSnake
|
93b6615e61
|
Store PolyObject waypoint return behavior in an enum
|
2020-05-13 16:21:47 +02:00 |
|
MascaraSnake
|
ea0176fada
|
Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway
|
2020-05-13 14:40:07 +02:00 |
|
MascaraSnake
|
14608b0f49
|
Merge branch 'actnum-tweaks' into 'next'
Act number tweaks
See merge request STJr/SRB2!905
|
2020-05-13 04:25:53 -04:00 |
|
MascaraSnake
|
7ea005fdc1
|
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
|
bbded108ef
|
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
|
2e8bb50808
|
Fix accidental swap of first and last waypoint
|
2020-05-13 09:32:00 +02:00 |
|
MascaraSnake
|
7004d8ca75
|
Merge branch 'next' into waypoints
|
2020-05-12 23:51:32 +02:00 |
|
MascaraSnake
|
4c526f6e50
|
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
|
2020-05-12 23:50:30 +02:00 |
|
Monster Iestyn
|
b167f12013
|
Merge branch 'gcc10-fixes' into 'master'
GCC 10 compiling fixes
See merge request STJr/SRB2!937
|
2020-05-12 14:47:49 -04:00 |
|
Monster Iestyn
|
86e2053dcd
|
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
|
be0e7e63bf
|
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
|
6878220a1b
|
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
|
62a640e282
|
make savegamename in doomdef.h an extern, put the actual definition in d_main.c
|
2020-05-12 18:37:15 +01:00 |
|
sphere
|
948582ce4e
|
Restore SHORT().
|
2020-05-12 17:20:29 +02:00 |
|
sphere
|
4d9d125a99
|
Fix some errors and add some comments. Also, actnum is not an INT32.
|
2020-05-12 17:20:28 +02:00 |
|
sphere
|
21130dfbb0
|
Support act numbers up to 99 and draw both digits individually.
|
2020-05-12 17:17:24 +02:00 |
|
MascaraSnake
|
999ebe2fd1
|
Rename variables for Fang waypoints, in preparation for new global waypoint data structure
|
2020-05-12 14:53:10 +02:00 |
|