stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-16 17:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity
12694 commits 174 branches 41 tags 300 MiB
Commit graph

12694 commits

This branch
This branch
All branches
Author SHA1 Message Date
spherallic
6a6b292c73 Fix Flame Shield interactions in old-style special stages. 2021-11-27 14:22:21 +01:00
sphere
491ffc7447 Merge branch 'firedeath' into 'next' 
Fix #214 (Crushstacean + Fireball Player Removal)

Closes #214

See merge request STJr/SRB2!1629
 2021-11-26 14:11:09 +00:00
SMS Alfredo
cf79bc8382 Fix #214 (Crushstacean + Fireball Player Removal) 2021-11-26 14:11:09 +00:00
sphere
59660c56c2 Merge branch 'name-unnamed-userdata' into 'next' 
Give userdata that needed names some names.

See merge request STJr/SRB2!1639
 2021-11-26 14:07:39 +00:00
sphere
b83de902a5 Merge branch 'less-console-text-draw' into 'next' 
Pause the console refresh while startup wads are loading. (Competing with !1347) (Resolves #412)

Closes #412

See merge request STJr/SRB2!1357
 2021-11-26 13:57:55 +00:00
sphere
dd2a1c8394 Merge branch 'master' into 'next' 
merge master into next again

See merge request STJr/SRB2!1659
 2021-11-26 13:57:28 +00:00
sphere
f97261ae85 Merge branch 'let-mixed-declarations' into 'master' 
Remove mixed code and declarations warning

See merge request STJr/SRB2!1618
 2021-11-26 13:55:43 +00:00
sphere
e0071c1c36 Merge branch '11-array-bounds' into 'master' 
Fix GCC 11 array-bounds warning in P_SetupStateAnimation

See merge request STJr/SRB2!1614
 2021-11-26 13:55:40 +00:00
spherallic
4480af69c7 Only show Ultimate mode warning in unmodified vanilla gameplay. 2021-11-26 14:18:08 +01:00
sphere
08e63fc822 Show values on (float) sliders in the options menu. 2021-11-26 14:18:00 +01:00
sphere
d9fde5c395 Add emblem counter to the Extras checklist. 2021-11-26 14:17:49 +01:00
sphere
a48c8826a1 Add modifiedgame warning to save select menu. 2021-11-26 14:17:36 +01:00
sphere
00c50aea78 Merge branch 'master' into 'next' 
merge master into next

Closes #671

See merge request STJr/SRB2!1657
 2021-11-25 09:25:52 +00:00
sphere
68b622e848 Merge branch 'master' into 'master' 
Fix Debian (.deb) build from making (Project_root)/bin/Linux

See merge request STJr/SRB2!1595
 2021-11-25 09:23:06 +00:00
sphere
5a3c5f7503 Merge branch 'msys2-no-dynbase' into 'master' 
MSYS2: Don't compile with dynamic base

See merge request STJr/SRB2!1652
 2021-11-25 09:20:05 +00:00
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
litten 1up
dbd1e61e7c Merge branch 'master' of https://git.do.srb2.org/stjr/srb2 
modified:   src/CMakeLists.txt
	modified:   src/Makefile
	modified:   src/Makefile.d/detect.mk
	modified:   src/r_picformats.h
	modified:   src/sdl/mixer_sound.c
 2021-11-14 15:55:33 -06:00
Hannu Hanhi
8136f5522b Fix uninitialized history pointers in thinkframe_hooks array 2021-11-10 01:55:31 +02: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
Hannu Hanhi
56c5a887c8 Call the Lua timestamp function getTimeMicros 2021-11-08 20:28:35 +02: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
Hannu Hanhi
270c7701b4 Timestamp function for Lua 2021-11-08 01:17:30 +02:00
sphere
9a5bb59801 https://mb.srb2.org/threads/the-most-utterly-unimportant-typo-ever.27152 2021-11-07 12:51:21 +01:00
Jaime Ita Passos
0ecfc38c46 Remove misplaced line from R_DrawTiltedSplat_NPO2_8 2021-11-06 01:49:29 -03:00
katsy
da33cb674e fix water fof height calculation on slopes 2021-11-05 16:51:44 -05:00
SteelT
c55e973364 MSYS2: Don't compile with dynamic base 
Resolves #671
 2021-11-03 17:16:46 -04: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
Hannu Hanhi
77ecfb9cdc Perfstats averaging and refactor 2021-10-29 02:18:02 +03: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
GoldenTails
8110473643 Give userdata that needed names some names. 2021-10-22 18:31:37 -05:00
FlykeSpice
a8c6a65260 Fix visplanes getting allocated twice 
I guess that is legacy remnant stuff
 2021-10-11 00:20:11 -04:00
MascaraSnake
5f7babb53f Adapt linedef type 313 to UDMF 2021-09-26 20:42:01 +02:00
MascaraSnake
c9f510d096 Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2021-09-26 07:12:32 +02:00
MascaraSnake
75ef804f64 Merge branch 'udmf-lighting' into udmf-linedef-executors 2021-09-26 07:01:56 +02:00
MascaraSnake
53f8a1bfb2 Merge branch 'udmf-polyobjects' into udmf-lighting 2021-09-26 07:01:23 +02:00
MascaraSnake
98f99e52f8 Merge branch 'udmf-scrollers' into udmf-polyobjects 2021-09-26 06:56:12 +02:00