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 |
|
Sal
|
e75b6da6fc
|
Merge branch 'new-cars-movie' into 'master'
Code changes required for new Kart sprites
See merge request KartKrew/Kart!259
|
2020-05-14 22:54:22 -04:00 |
|
Sally Coolatta
|
4555b20e6c
|
Merge branch 'master' into new-cars-movie
|
2020-05-14 22:42:29 -04:00 |
|
Sal
|
9921dfbb05
|
Merge branch 'water-physics' into 'master'
Altered water physics
See merge request KartKrew/Kart!261
|
2020-05-14 18:47:08 -04:00 |
|
Sally Coolatta
|
b51f206c1c
|
Support antigrav
|
2020-05-14 18:45:54 -04:00 |
|
Sal
|
4b8f46490e
|
Merge branch 'waypoint-helpers-tweaks' into 'master'
Fix Waypoint Anchors and split paths; DefaultWaypointRadius for your level headers!
See merge request KartKrew/Kart!254
|
2020-05-14 18:15:33 -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 |
|
Latapostrophe
|
6c68c95654
|
Make explosions cause earthquakes and initiate flashpals
|
2020-05-14 17:55:33 +02:00 |
|
Latapostrophe
|
fc789790bb
|
Create a quick P_StartQuake without epicenter/radius support and clean up the grand total of 4 earthquake uses in the code
|
2020-05-14 17:28:33 +02:00 |
|
Latapostrophe
|
f467791161
|
Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master
|
2020-05-14 17:01:38 +02:00 |
|
Snu
|
9dda3a2edf
|
Use P_SetTarget instead of fast->target
|
2020-05-14 04:17:24 +01:00 |
|
Snu
|
d40b5dd73e
|
god damnit
|
2020-05-14 03:23:28 +01:00 |
|
Snu
|
e502397a98
|
add targets to MT_FASTLINEs spawned to tell what they're spawned from
|
2020-05-14 03:13:00 +01:00 |
|
ZipperQR
|
88c32f7790
|
no message
|
2020-05-14 03:35:46 +03:00 |
|
James R
|
6e3a92ed52
|
player.ping for the ping in milliseconds of the player
|
2020-05-13 16:17:40 -07:00 |
|
Monster Iestyn
|
49ff331ac0
|
Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a.
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)
(cherry picked from commit e501d9c6af)
|
2020-05-13 16:03:26 -07: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 |
|
Sally Coolatta
|
249fff87ad
|
Merge branch 'new-cars-movie' into colorize-tweak
|
2020-05-12 22:46:46 -04:00 |
|
Sally Coolatta
|
0038241325
|
Merge branch 'master' into new-cars-movie
|
2020-05-12 22:41:37 -04:00 |
|
Sally Coolatta
|
1788d29263
|
Merge branch 'master' into pet-robo
|
2020-05-12 22:38:23 -04:00 |
|
Sal
|
40333bf158
|
Merge branch 'merge-12' into 'master'
Merge v1.2
See merge request KartKrew/Kart!262
|
2020-05-12 22:34:31 -04: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 |
|
Sally Coolatta
|
95a077b4dd
|
C'mon git merge everything, not just most of it |:V
|
2020-05-12 03:16:35 -04:00 |
|
Sally Coolatta
|
15d18640de
|
Merge remote-tracking branch 'public/master' into merge-12
|
2020-05-12 03:16:14 -04:00 |
|