4ad360155f
Fix nonpacked to packed cast for OpenGL
...
(cherry picked from commit d2a7a87c7f39bd423fde7f8b4228082d12839583)
2020-04-11 22:10:05 -07:00
ff04e0c103
chaos conflict
2019-06-11 17:02:47 +02:00
de5e44cfbc
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
430831423c
Strip out things that limit wad files added by filename
2019-04-17 23:09:10 -05:00
7441dd7d9b
Merge branch 'master' into next
2019-03-25 18:08:36 +00:00
544f806f92
Merge commit 'upstream/master~1'
2019-03-22 10:18:10 -04:00
76967e46bb
destroy hw_glide.h because no modern GPU supports such API
2019-03-21 18:23:40 -03:00
da001a5b54
PK3 support
2019-03-19 18:25:55 -03:00
f714cba310
Improve custom shader support
2019-03-19 17:37:04 -03:00
75919422c6
custom shader support
2019-03-18 23:03:29 -03:00
6d751ff302
Remove the define.
2019-03-15 18:46:25 -04:00
5a170b9e4e
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
c30c3f7a3a
Merge remote-tracking branch 'remotes/upstream/next' into HEAD
2019-03-11 21:53:53 -05:00
fcf072cbeb
Merge remote-tracking branch 'remotes/upstream/master' into HEAD
2019-03-11 21:53:47 -05:00
66c9d9aa83
Move modified check on -file addons later in startup
2019-03-10 19:44:31 -05:00
5f0c4271d7
Use consts in place of some 16s
2019-03-09 16:46:55 -06:00
15323328c5
Check using memcmp()
2019-03-03 22:43:21 -05:00
3d5d02fc15
Error if the lump is a PNG lump
2019-03-03 19:58:01 -05:00
d4f05e5be9
fixup merged mess for NO-LUA mess
2019-03-02 13:32:47 -05:00
ae368a3e0f
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 17:33:32 -05:00
c2618fd987
Merge branch 'master' into next
2019-03-01 17:32:17 -05:00
f823768699
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
84755ec171
Handle things in a more sensible way
2019-02-20 19:04:18 -06:00
f34ed24132
Correct an oversight
2019-02-19 22:20:18 -06:00
de9e25d5b3
Add missing ifdefs
2019-02-14 20:59:07 -05:00
66273898b7
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process.
...
* Make G_SetGameModified only console-print for major mods.
* Add amnesty to "major mod" detection while loading files with custom savedatas.
* Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
2f2d3768d5
* Increased leniency for SOC wrt "major mods".
...
* If your file defines state and object freeslots in SOC, you are allowed to modify those freeslots IN ANY SOC SCRIPT IN THE SAME FILE without being marked as a "major mod".
* If your file contains broken unlockables/emblems that don't actually have effect for any reason, it's not counted as a "major mod".
* Added add-ons menu message for adding a "major mod".
2019-01-17 20:51:41 +00:00
de72403fb9
Add MUSICDEF lump for defining custom songs & replacing existing songs
...
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
393c64b8bc
Merge branch 'expanded-nmuslist' into 'next'
...
Expand NMUSList to include HUD changes
See merge request STJr/SRB2!388
2019-01-01 15:06:04 -05:00
1b7a9aaa01
2.1 Score/Time/Rings lump name
2018-12-16 16:53:13 -05:00
899120e475
Revert NMUSlist to original 2.1
2018-12-16 16:42:57 -05:00
d7321fd8c4
Pull expanded NMUSlist from 2.2
2018-12-16 16:40:40 -05:00
046d36a657
Remove Kart entries from NMUSlist
2018-12-16 16:08:31 -05:00
f0967520ed
Compile fixes; enable PK3 support in addons menu
...
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
2018-12-15 21:44:39 -05:00
37950341ec
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
0a3b3736bf
Handle Kart-specific changes; add PK3 to exttable
2018-12-15 20:50:33 -05:00
b32f50648d
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
aa16edec1d
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 00:31:23 -05:00
e0a1c43813
Free lump names *before* either lumpinfo or the WAD itself!
2018-11-30 14:19:47 +00:00
aa9b36ac04
Fix this memory freeing
2018-11-29 22:31:20 -05:00
4cfaf746bb
Reimplement png warning
2018-11-29 11:16:40 -05:00
d9654bcc1a
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 10:26:38 -05:00
46571fbda2
Fixes to merge process
2018-11-29 10:07:35 -05:00
305ad4f73e
backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading
2018-11-29 14:16:02 +00:00
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
3e6388c183
use UINT8 * instead of void or Bytef *
2018-11-27 15:49:41 +00:00
1889c36dea
add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?)
2018-11-27 13:57:32 +00:00
b7f7c2ecf7
PK3: fixup support for newer version of zlib
2018-11-26 20:08:26 -05:00
4e332b3848
Fix MSVC build
2018-11-26 18:27:07 -05:00
James R