No description

nukeykt e6f53f7c30 Resolve merge issues ... # Conflicts: # GNUmakefile # platform/Windows/eduke32.sln # platform/Windows/props/build_common.props # source/audiolib/include/music.h # source/blood/src/blood.cpp # source/blood/src/gui.cpp # source/blood/src/mapedit.cpp # source/blood/src/sound.cpp # source/build/include/vfs.h # source/build/src/vfs.cpp		2019-10-24 19:48:11 +02:00
build-doc	- moved documentation out of the Source folder and added surface shader sources.	2019-10-05 13:17:26 +02:00
cmake	- transitioned project to CMake and deleted most of the old build system.	2019-09-22 23:15:46 +02:00
libraries	- made things compile again after updating enet. Also removed the redundant dumb and game_music_emu libraries which just got imported by accident when using other things from GZDoom.	2019-10-20 09:16:01 +02:00
package/common	Make use of SDL2's Game Controller API.	2019-09-20 16:03:49 +02:00
platform	- deleted some unused files.	2019-10-19 20:30:08 +02:00
source	Resolve merge issues	2019-10-24 19:48:11 +02:00
tools	- added compile tools from GZDoom repo:	2019-09-22 08:52:30 +02:00
wadsrc	- tweaked the fade ramp a bit.	2019-10-20 01:14:48 +02:00
.gitattributes	- transitioned project to CMake and deleted most of the old build system.	2019-09-22 23:15:46 +02:00
.gitignore	- fixed bad endif() placing in CMake projects	2019-10-17 08:44:01 +02:00
_clang-format	Minor _clang-format tweaks	2019-09-20 15:22:42 +02:00
AUTHORS.md	Move acknowledgments to separate file	2019-09-21 11:48:19 +02:00
CMakeLists.txt	- made things compile again after updating enet. Also removed the redundant dumb and game_music_emu libraries which just got imported by accident when using other things from GZDoom.	2019-10-20 09:16:01 +02:00