sphere
b868716672
Merge branch 'tails' into 'next'
...
Remove misplaced CopyTiccmd from 2phuman (resolves #674 )
Closes #674
See merge request STJr/SRB2!1627
2021-11-25 09:19:53 +00:00
sphere
f191525fbb
Merge branch 'interfree' into 'next'
...
Don't cache the default background patches if we have an interscreen (resolves #546 )
Closes #546
See merge request STJr/SRB2!1619
2021-11-25 09:19:46 +00:00
sphere
e01c91d58a
Merge branch 'fix-nonet-compiling' into 'next'
...
Fix NONET compiling
See merge request STJr/SRB2!1651
2021-11-25 09:19:30 +00:00
sphere
b955c9c4d5
Merge branch 'boxsparkle_mario' into 'next'
...
Exclude MT_BOXSPARKLE from Mario blocks
See merge request STJr/SRB2!1556
2021-11-24 13:43:20 +00:00
sphere
8a5cf4aea6
Merge branch 'ringslinger-penalty-split' into 'next'
...
Fix Ringslinger weapon ring penalty missplitment
Closes #684
See merge request STJr/SRB2!1655
2021-11-24 13:27:07 +00:00
sphere
88e022b6e1
Merge branch '555-2-2-9-rotated-patches-are-cropped-have-incorrect-dimensions' into 'next'
...
Fix #555
Closes #555
See merge request STJr/SRB2!1648
2021-11-24 12:22:11 +00:00
sphere
d776b1a23e
Merge branch 'revert-2578e01c' into 'next'
...
Revert "Merge branch 'writable-colormaps' into 'next'" (closes #675 )
Closes #675
See merge request STJr/SRB2!1649
2021-11-09 16:06:59 +00:00
Zwip-Zwap Zapony
cade6f3cf6
Fix Ringslinger weapon ring penalty missplitment
2021-11-09 16:59:49 +01:00
sphere
9ad9683c66
Merge branch 'change-my-name' into 'next'
...
Change my name
See merge request STJr/SRB2!1650
2021-11-08 13:34:27 +00:00
Jaime Ita Passos
1d7061b892
Fix NONET compiling
2021-11-08 01:34:03 -03:00
Jaime Ita Passos
32a68f35c9
Change my name
2021-11-08 01:11:51 -03:00
LZA
34b05efdf1
Revert "Merge branch 'writable-colormaps' into 'next'"
...
This reverts merge request !959
2021-11-08 03:40:53 +00:00
Jaime Ita Passos
a14c008dee
Fix #555
2021-11-08 00:38:24 -03:00
sphere
9a5bb59801
https://mb.srb2.org/threads/the-most-utterly-unimportant-typo-ever.27152
2021-11-07 12:51:21 +01:00
sphere
06dfd360ee
Merge branch 'drawntooverlay' into 'next'
...
Make Overlay objects account for player->drawangle
See merge request STJr/SRB2!1599
2021-10-29 10:40:25 +00:00
SMS Alfredo
865c0a081d
Make Overlay objects account for player->drawangle
2021-10-29 10:40:25 +00:00
sphere
2d8230cb27
Merge branch 'sunnywithcloudsandshowers' into 'next'
...
Fix broken rain to rain weather switching
See merge request STJr/SRB2!1626
2021-10-27 17:52:29 +00:00
katsy
e10eddd11d
Fix broken rain to rain weather switching
2021-10-27 17:52:29 +00:00
sphere
edaa955bcc
Merge branch 'dave-credits' into 'next'
...
Fix #672
Closes #672
See merge request STJr/SRB2!1623
2021-10-27 17:51:29 +00:00
SteelT
c9ff904960
Merge branch 'remove-unused-function' into 'next'
...
Remove unused I_GetMouseGrab function
See merge request STJr/SRB2!1628
2021-10-26 14:29:04 +00:00
SteelT
0f4074f22d
Remove unused I_GetMouseGrab function
2021-09-23 13:46:26 -04:00
katsy
ed5942a0b6
fix tailsbot controls
2021-09-22 23:18:54 -05:00
James R
d88eb7cc14
Missed the 'i'
2021-09-21 02:17:44 -07:00
James R
143a515445
Correct Big Wave Dave/InstantSonic credits
2021-09-21 02:15:11 -07:00
katsy
3d2f9e6150
don't create the default patches if we have an interscreen
2021-09-13 17:20:20 -05:00
James R
923e6f31aa
Fix faulty comparison
...
Logical comparisons evaluate to a boolean value...
2021-09-12 19:03:39 -07:00
James R
fec5f2778e
Fix compiler warnings
2021-09-12 19:03:39 -07:00
Tatsuru
952ae51669
Merge branch 'hudlib-hook-refactor' into 'next'
...
Refactor HUD hooks too
See merge request STJr/SRB2!1577
2021-09-13 01:38:05 +00:00
James R
c33d8b3b5d
Merge remote-tracking branch 'origin/next' into hudlib-hook-refactor
2021-09-12 18:37:47 -07:00
Tatsuru
db92f31f7d
Revert "Merge branch 'draw-act-num' into 'next'"
...
This reverts merge request !1532
2021-09-12 18:41:36 -04:00
Tatsuru
30567d75df
Merge branch 'draw-act-num' into 'next'
...
Expose act number drawing functions to Lua
See merge request STJr/SRB2!1532
2021-09-12 22:15:43 +00:00
Tatsuru
252a48c2dc
Merge branch 'shorter-hidetime' into 'next'
...
Cut cv_hidetime's minimum value to 1 (resolves #586 )
Closes #586
See merge request STJr/SRB2!1544
2021-09-12 22:13:26 +00:00
Tatsuru
1875c0dc79
Merge branch 'where-the-fuck-is-my-mobj-at' into 'next'
...
Add player mobj check to P_PlayerInPain (resolves #640 )
Closes #640
See merge request STJr/SRB2!1587
2021-09-12 22:06:54 +00:00
Tatsuru
bb0a0bd4ab
Merge branch 'oneline' into 'next'
...
Add a missing scale assignment to A_Boss3ShockThink
See merge request STJr/SRB2!1588
2021-09-12 22:04:28 +00:00
SMS Alfredo
d5cdb2dc78
Add a missing scale assignment to A_Boss3ShockThink
2021-09-12 22:04:28 +00:00
Tatsuru
9187656b90
Merge branch 'shocksplit' into 'next'
...
Split up x/y/z averages in A_Boss3ShockThink (resolves #589 )
Closes #589
See merge request STJr/SRB2!1538
2021-09-12 21:49:28 +00:00
Tatsuru
cd5ba1271a
Merge branch 'youvebeenblocked' into 'next'
...
Add proper parameters to MobjMoveBlocked so you can actually tell what you're being blocked by (Resolves #332 )
Closes #332
See merge request STJr/SRB2!1491
2021-09-12 21:38:40 +00:00
Tatsuru
66f054f150
Merge branch 'mapload-trigger-fix' into 'next'
...
Don't call map load trigger linedefs when joining or reloading gamestate
See merge request STJr/SRB2!1592
2021-09-12 21:08:52 +00:00
Tatsuru
df249a4a4d
Merge branch 'folder-fixes' into 'next'
...
Fix minor issues with folder addons
See merge request STJr/SRB2!1617
2021-09-12 21:08:07 +00:00
LZA
aaf4653f1e
Fix minor issues with folder addons
2021-09-12 21:08:06 +00:00
Tatsuru
96a378ef1e
Merge branch 'replay-overwrite-fix' into 'next'
...
Replay overwrite fix
See merge request STJr/SRB2!1523
2021-09-12 20:33:15 +00:00
Tatsuru
94799e2196
Merge branch 'fix-antique-ghost-netvars' into 'next'
...
Fix antique ghost netvars
See merge request STJr/SRB2!1545
2021-09-12 20:33:01 +00:00
Tatsuru
59e1706f5c
Merge branch 'png-trans-fix' into 'next'
...
Fix issue with png_get_tRNS
See merge request STJr/SRB2!1606
2021-09-12 20:30:36 +00:00
Tatsuru
7a53b242b6
Merge branch 'develop-fix' into 'next'
...
Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility
Closes #663
See merge request STJr/SRB2!1607
2021-09-12 20:29:02 +00:00
Tatsuru
9016b5cf7c
Merge branch 'playercontroldirection' into 'next'
...
Remove camera dependency from P_GetPlayerControlDirection
Closes #183
See merge request STJr/SRB2!1512
2021-09-12 20:27:42 +00:00
Tatsuru
0781b91de5
Merge branch 'fix-archiving-error-msg' into 'next'
...
Fix incorrect error message during Lua archiving
See merge request STJr/SRB2!1593
2021-09-12 20:27:17 +00:00
Tatsuru
bcd7468d25
Merge branch 'lua-camera' into 'next'
...
Allow Lua write access to camera_t variables & expose the cameras globally
See merge request STJr/SRB2!1581
2021-09-12 20:20:49 +00:00
SteelT
f62064d4ba
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into next
2021-09-12 16:18:26 -04:00
Tatsuru
bff2106016
Merge branch 'even-more-slope-copying' into 'next'
...
Add flag to line slopes for even more slope copying
See merge request STJr/SRB2!1550
2021-09-12 20:16:52 +00:00
SteelT
e2ea480af9
Merge branch 'master' into next
2021-09-12 15:46:32 -04:00
