zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-11 21:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into texture_rework

Browse source
This commit is contained in:
Rachael Alexanderson 2020-05-23 08:53:11 -04:00
commit 00acbac04e
3 changed files with 573 additions and 370 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/audio/music/music.cpp
View file

@ -37,7 +37,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdexcept>
#include "i_sound.h" #include "i_sound.h"
#include "i_music.h" #include "i_music.h"

1
src/common/utility/files_decompress.cpp
View file

@ -39,6 +39,7 @@
#include <zlib.h> #include <zlib.h>
#include <bzlib.h> #include <bzlib.h>
#include <algorithm> #include <algorithm>
#include <stdexcept>
#include "files.h" #include "files.h"
#include "templates.h" #include "templates.h"

940
wadsrc_lights/static/filter/strife/gldefs.txt
View file

File diff suppressed because it is too large Load diff