Commit graph

11471 commits

Author SHA1 Message Date
James R
bd82b02478 Merge branch 'plane-sorting-fix-part-3' into 'next'
Improved sprite sorting against 3d floors

See merge request STJr/SRB2!1235
2020-11-22 18:31:23 -05:00
James R
4f39497feb Merge branch 'master' into next 2020-11-22 15:23:12 -08:00
James R
fd8a15dc37 Merge remote-tracking branch 'origin/what-is-a-standard-2' 2020-11-22 15:19:39 -08:00
James R
1a2c2c8471 Resolve one last conflict in splat sorting
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
2020-11-22 15:12:34 -08:00
James R
d7e32e616d Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3 2020-11-22 14:41:42 -08:00
James R
78c2fa09a0 Merge branch 'flame-orb' into 'next'
Flame Shield & Thunder Shield Adjustment (Closes #363)

Closes #363

See merge request STJr/SRB2!1220
2020-11-22 17:31:23 -05:00
James R
ce06077e72 Merge branch 'replay-height-fix' into 'next'
Made height/spinheight and height change values in replays more accurate

See merge request STJr/SRB2!1241
2020-11-22 17:25:41 -05:00
James R
e3142663aa Merge branch 'replay-camera-update' into 'next'
Make the replay camera follow the player

See merge request STJr/SRB2!1243
2020-11-22 17:23:38 -05:00
James R
0d4fc032c5 Merge branch 'remove-unused-music-types' into 'next'
Remove unused music type enums

See merge request STJr/SRB2!1253
2020-11-22 17:16:35 -05:00
James R
1021c51614 Merge branch 'uncap-palettes' into 'next'
Uncap palette lump palettes & allow flashpal palettes to display during pause

See merge request STJr/SRB2!1255
2020-11-22 17:16:21 -05:00
James R
eb7adb0c3f Merge branch 'echo-filenames' into 'master'
Echo filenames when compiling without ECHO=1

See merge request STJr/SRB2!1260
2020-11-22 17:11:03 -05:00
GoldenTails
b4c88e92d9 Add NOECHOFILENAMES, if people don't want logspam. 2020-11-21 22:21:18 -06:00
Nev3r
bca0fa2017 Merge branch 'spritestuff2' into 'next'
New sprite features

See merge request STJr/SRB2!1257
2020-11-21 10:51:56 -05:00
GoldenTails
f49136136a Echo filenames when compiling without ECHO=1 2020-11-19 15:17:56 -06:00
Jaime Ita Passos
09fe7d5f1b Update R_DrawFloorSprite_NPO2_8 and R_DrawTranslucentFloorSprite_NPO2_8 to have the lastest NPO2 optimizations 2020-11-19 00:59:37 -03:00
Jaime Ita Passos
be274a4fa9 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
James R
1d107b268c Merge branch 'unfuck-icon-mac' into 'next'
Use SDL version of executable icon at runtime on macOS

See merge request STJr/SRB2!1250
2020-11-17 20:24:42 -05:00
lachwright
6f315c7bb1 Uncap palette lump palettes & allow flashpal palettes to display during pause 2020-11-16 17:37:12 +11:00
lachwright
dd4065795a Add parentheses 2020-11-15 15:52:55 +11:00
James R
e1a8a393a3 Merge branch 'udmf-multitag' into 'next'
UDMF: Multitag support

See merge request STJr/SRB2!1097
2020-11-14 19:18:14 -05:00
James R
01e232ac3b Fix one last instance of printing address diff 2020-11-14 16:18:54 -08:00
James R
66edde2556 Remove unused music type enums 2020-11-14 15:56:40 -08:00
James R
0527e60928 Merge branch 'lua-musicfuncs' into 'next'
Expose more music functions to Lua

See merge request STJr/SRB2!1230
2020-11-14 18:51:22 -05:00
James R
cba81f48b1 Merge branch 'nolua2' into 'next'
Don't let Lua set cvars that have CV_NOLUA

See merge request STJr/SRB2!1245
2020-11-14 18:37:21 -05:00
James R
c5dcd44011 Merge branch 'precip-bad-access' into 'next'
Fix potential crash with precipitation in OpenGL

See merge request STJr/SRB2!1249
2020-11-14 18:33:58 -05:00
James R
a1459356c8 Merge branch 'mobjspawnscale' into 'next'
Reallow P_MobjSpawn to change the scale of objects spawned from mapthings

Closes #328

See merge request STJr/SRB2!1251
2020-11-14 18:08:40 -05:00
Nev3r
cf8e131621 Better documentation. 2020-11-14 20:50:34 +01:00
Nev3r
c5504ffc70 Add documentation for the iterator macros. 2020-11-14 20:25:00 +01:00
lachwright
ce06031f5e Reallow P_MobjSpawn to change the scale of objects spawned from mapthings 2020-11-15 02:53:10 +11:00
lachwright
3840303b02 Use SDL version of executable icon at runtime on macOS 2020-11-15 01:13:41 +11:00
Nev3r
19b11a8c75 Remove direct definition for D__USE_MINGW_ANSI_STDIO, as the latest standards consider this to be deprecated. 2020-11-13 11:33:27 +01:00
James R
630dd8acb0 OpenGL: don't access field that doesn't exist in precipmobj_t 2020-11-13 00:46:03 -08:00
Nev3r
9d1c869aee Fix size_t/INT32 compare. 2020-11-12 13:59:21 +01:00
Nev3r
003f46c18e Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing. 2020-11-12 13:48:14 +01:00
Nev3r
a9b5e804ca Extern the global tag groups properly. 2020-11-12 12:25:02 +01:00
Nev3r
38e17d556e Forgot to change %d to %s for sizeu1(). 2020-11-10 13:11:42 +01:00
Nev3r
f28a4077ba Remove unused tag parameter. 2020-11-10 13:10:01 +01:00
Nev3r
1a2f6c4859 Missing prototype. 2020-11-10 13:09:30 +01:00
Riku Salminen
0cefac70d3 Declared the cvar in netcmd to get rid of warnings 2020-11-10 13:53:31 +02:00
Nev3r
179cbc7264 Use memmove() 2020-11-10 12:45:30 +01:00
Riku Salminen
340509838d Getting the brach up to date with STJR 2020-11-10 13:37:46 +02:00
Nev3r
7f14edf62e Use sizeu1() 2020-11-10 12:34:08 +01:00
Nev3r
87e19198ae Indent 2020-11-10 12:23:30 +01:00
Nev3r
c22dbe1d2e rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro. 2020-11-10 12:22:55 +01:00
Riku Salminen
16a4ab37d3 Try to add cvars for old camera 2020-11-10 13:21:34 +02:00
Riku Salminen
27931ca32e Update p_tick.c, Replacing mobj angle with cmd angleturn 2020-11-10 13:21:34 +02:00
Riku Salminen
bb16216839 Update p_tick.c, got rid of an useless angle change function 2020-11-10 13:21:34 +02:00
Riku Salminen
1d1b508cc8 Make the replay camera follow the player 2020-11-10 13:21:33 +02:00
Nev3r
5be2c1a6e0 Add copyright notices. 2020-11-10 12:12:16 +01:00
Riku Salminen
cd18b9365b Try to add cvars for old camera 2020-11-10 13:06:47 +02:00