Commit Graph

2203 Commits

Author SHA1 Message Date
Eric Wasylishen 2560603f9b qbsp: csg4.cc: bring closer to original behaviour 2021-10-03 12:32:50 -06:00
Eric Wasylishen f0d12fc8f3 qbsp: Brush_LoadEntity: bring closer to the original code 2021-10-03 12:02:52 -06:00
Eric Wasylishen b78553d81b qbsp: outside.cc: match original behaviour 2021-10-03 00:22:51 -06:00
Eric Wasylishen 2fc1e9099a light: remove dead / non-working code for non-embree light tracing 2021-10-02 21:12:12 -06:00
Eric Wasylishen 8a7164791e light: fix "don't do this on Q2" logic for 0 light faces 2021-10-02 21:00:45 -06:00
Eric Wasylishen 8c1c9965b4 Merge branch 'master' into qbsp-contentflags 2021-10-02 20:27:59 -06:00
Eric Wasylishen 3bd65d5aa5 testmaps: add lava, water, sky, origin to qbspfeatures.map 2021-10-02 20:15:43 -06:00
Eric Wasylishen 8fd3f14bf9 bspinfo: json export
Co-authored-by: Jonathan <jonno.5000@gmail.com>
2021-10-02 17:57:31 -06:00
Eric Wasylishen a871b55419 bspxentry_t: make lumpdata a uint8_t* 2021-10-02 17:57:31 -06:00
Eric Wasylishen 9e9e21eaae qbsp: move BSPX BRUSHLIST struct types out to bspfile.hh 2021-10-02 17:57:31 -06:00
Eric Wasylishen 5135ba05b6 build: delete unused files
Co-authored-by: Jonathan <jonno.5000@gmail.com>
2021-10-02 17:57:31 -06:00
Eric Wasylishen 542c530e56 3rdparty: replace json submodule with a minified fork
The main git repo is several hundred MB.

https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent

This is mentioned in https://github.com/nlohmann/json/blob/develop/README.md
2021-10-02 12:31:22 -06:00
Eric Wasylishen 59e71d7600 Merge branch 'master' into qbsp-contentflags 2021-10-01 23:39:12 -06:00
Eric Wasylishen d4464a6503 testmaps: update hash 2021-10-01 23:25:39 -06:00
Eric Wasylishen ddf2a36d39 qbsp: make func_detail_wall an alias for func_detail_fence 2021-10-01 23:18:27 -06:00
Eric Wasylishen 3e56b635c0 testmaps: update hashes 2021-10-01 23:17:48 -06:00
Eric Wasylishen 5dc3982a54 testmaps: update qbspfeatures.map 2021-10-01 22:58:45 -06:00
Eric Wasylishen 690ac8d24e qbsp: Brush_GetContents_Q1: fix _mirrorinside 2021-10-01 21:19:18 -06:00
Eric Wasylishen 8bd7232e84 Merge branch 'master' into qbsp-contentflags 2021-09-27 00:01:10 -06:00
Eric Wasylishen af7e3308f6 qbsp: testmaps: add qbspfeatures.map 2021-09-27 00:00:41 -06:00
Eric Wasylishen b36c428bef brush.cc: attempt to fix test failures 2021-09-25 21:13:42 -06:00
Eric Wasylishen ea620b3e5d bspinfo: more JSON export types 2021-09-25 20:44:57 -06:00
Eric Wasylishen 5a1cb66308 brush.cc: fix sorting of clip brushes 2021-09-25 19:04:47 -06:00
Eric Wasylishen 54d7f50b38 brush.cc: clear CFLAGS_CLIP on bmodels to match old behaviour 2021-09-25 18:04:57 -06:00
Eric Wasylishen 8ff65cc05a bspinfo: JSON export of BSPX BRUSHLIST lump 2021-09-25 16:54:14 -06:00
Eric Wasylishen f1744118e2 qbsp: move BSPX BRUSHLIST struct types out to bspfile.hh 2021-09-25 15:42:42 -06:00
Eric Wasylishen f7c0c80a26 qbsp, light: allow _minlight to go up to 510 instead of 255 on func_detail/etc. 2021-09-25 13:11:15 -06:00
Eric Wasylishen 4b25b6b095 bspinfo: output more lumps to json 2021-09-24 20:17:43 -06:00
Eric Wasylishen ab4fa45306 vis: various fixes for vising q2 maps
# Conflicts:
#	vis/vis.cc
2021-09-23 14:46:28 -04:00
Eric Wasylishen 71189def47 qbsp: write correct .prt file for Q2 (PRT1 with clusters)
# Conflicts:
#	qbsp/portals.cc
2021-09-23 14:43:48 -04:00
Eric Wasylishen 73c665abfe bspfile.cc: gamedef_q1_like_t: fix template argument shadowing 2021-09-23 00:39:10 -06:00
Eric Wasylishen b3258611c9 brush.cc: AdjustContentsFromName: fix all liquids getting set to water 2021-09-23 00:04:45 -06:00
Eric Wasylishen d5a647c6a3 trace_embree.cc: try <climits> for UCHAR_MAX 2021-09-22 23:08:06 -06:00
Eric Wasylishen 5cfe40d79a trace_embree.cc: add missing <cstdint> include (for UCHAR_MAX) 2021-09-22 22:58:33 -06:00
Eric Wasylishen 70aa7ebcdb writebsp.cc: remove unneeded memset
map.exported_texinfos.push_back({}); will push a zeroed gtexinfo_t.
2021-09-22 22:34:36 -06:00
Eric Wasylishen 4c5d8b99f9 add missing <tuple> include (for std::tie) 2021-09-22 22:32:37 -06:00
Eric Wasylishen 8093e94864 bspfile.cc: fix build 2021-09-22 00:25:23 -06:00
Eric Wasylishen 80a4aa1b97 Merge branch 'master' into qbsp-contentflags 2021-09-22 00:12:27 -06:00
Eric Wasylishen 4c3e10d817
Merge pull request #314 from ericwa/qbsp-use-common
Qbsp: use common bsp writing code
2021-09-22 00:04:21 -06:00
Eric Wasylishen 77cbc5780f tests: update onlyents hash (this branch is correct, master branch is broken) 2021-09-21 23:42:41 -06:00
Eric Wasylishen c0ff104887 Merge branch 'master' into qbsp-use-common 2021-09-21 23:33:32 -06:00
Eric Wasylishen d86638d6f3 tests: commit E1M1-edited-ents.map for easier testing/debugging 2021-09-21 22:49:02 -06:00
Eric Wasylishen 8d51e23ecc bspfile: add fixme about q2 overflow checking 2021-09-21 00:09:55 -06:00
Eric Wasylishen 0c0cc9ef81 bspfile: fix OverflowsUint16 2021-09-20 23:59:26 -06:00
Eric Wasylishen 23a234f6e9 Merge branch 'master' into qbsp-use-common 2021-09-20 23:52:20 -06:00
Eric Wasylishen 2e7e886fa3 testmaps: -onlyents test 2021-09-20 23:35:41 -06:00
Eric Wasylishen a535a0bd1b ci: add -wrbrushes test 2021-09-20 21:40:55 -06:00
Eric Wasylishen 2360017199 Revert "ci: setup github actions on windows"
This reverts commit b193a26bbf.
2021-09-20 20:55:27 -06:00
Eric Wasylishen b193a26bbf ci: setup github actions on windows 2021-09-20 20:47:02 -06:00
Eric Wasylishen f45f512922 testmaps: add phong test map 2021-09-20 19:42:25 -06:00