17656eff78
don't return string ref, since it can be modified after it's inserted because of the vector growing
2022-06-14 18:34:01 -04:00
78b979d670
Merge branch 'type-cleanup' into brushbsp
...
# Conflicts:
# include/light/entities.hh
# qbsp/brush.cc
# qbsp/map.cc
2022-06-14 17:19:30 -04:00
d24ea4922a
entdict cleanup
2022-06-14 17:18:13 -04:00
f1fd0bd30f
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-14 10:50:54 -04:00
54c3103bdc
mark it as warning
2022-06-14 10:50:47 -04:00
7827885f0f
add texturedef support
...
change Q2_CONTENTS_TRANSLUCENT parsing; remove it always, but if the surface doesn't have TRANS then swap it with DETAIL which is probably what they intended
2022-06-14 10:50:35 -04:00
bf36bd56f7
qbsp: fix qbsp_q1_sealing test case
2022-06-14 02:03:50 -06:00
b9250d9243
fix Ubuntu build
2022-06-14 00:52:15 -06:00
6c613b2b51
fix clangcl build
2022-06-14 00:49:15 -06:00
a309e8467b
testmaps: add qbsp_q1_sealing.map
2022-06-14 00:44:50 -06:00
0266507833
testqbsp: tag qbsp_q2_detail_seals as mayfail
2022-06-13 23:37:46 -06:00
4e7ecbf9ff
testqbsp: add qbsp_q2_detail_seals
2022-06-13 22:50:01 -06:00
1cddbf1ad9
testqbsp: add qbsp_q2_seal_empty_rooms
2022-06-13 22:39:04 -06:00
7b38f24ae8
Q2 doesn't use the old animation method
2022-06-13 07:26:23 -04:00
b2a0f8039e
remove dm/start/coop checking
...
remove entity target(name) checking; as mods and maps get more complex, this is best left up to the editors to use the FGD to report these things.
2022-06-13 07:10:53 -04:00
81686200c3
simplify illusionary line (hullnum is never > 0 for Q2 or the wrbrushes hull)
2022-06-13 07:02:02 -04:00
4e2e1c9bb3
default filltype to auto, which uses outside for hullnum > 0 and inside otherwise (lower leaf & node counts)
2022-06-13 06:19:58 -04:00
12caf1bcd4
move transsky/transwater code into portal_can_see_through
2022-06-13 02:34:39 -04:00
d917c253c5
restore inside fill to working status
2022-06-13 02:20:34 -04:00
4755f23efa
re-implement inside filling (not working fully yet)
2022-06-13 01:44:06 -04:00
c5141e7a30
remove unused counters
...
only print nodefaces for the main BSP
2022-06-12 11:33:18 -04:00
4a20305077
clean up light conditional
2022-06-12 06:38:29 -04:00
215ae86566
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-12 03:35:49 -04:00
98682f41fa
move brush/leaf counts into gamedef
...
(Q2 stores every combo currently, old code kept in case we want to use that instead)
2022-06-12 03:35:44 -04:00
4fde404e6b
testqbsp: mark q2_liquids as [!mayfail] for now
2022-06-12 00:27:36 -06:00
93291b21fc
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-12 02:24:32 -04:00
1a88b46e8c
RemapContentsForExport moved into gamedef
...
simplified gamedef stuff by checking which functions were still necessary, and no need to pass extended flags through at all now
detail type moved into Q1
2022-06-12 02:24:27 -04:00
54900cf7b6
move visblocker to a boolean
2022-06-12 01:02:31 -04:00
c5b84d9eb7
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
2022-06-11 14:07:21 -06:00
2c8de8b877
q2_liquids.map: add lava/water covering each other tests
2022-06-11 14:07:19 -06:00
13bf99a7f3
fix test cases (implement equals(game) properly, and `is_empty` is false depending on get_content_type for Q2 now)
...
remove unnecessary condition from Q2 contents_are_empty since areaportals are already considered a valid non-empty type via get_content_type
2022-06-11 09:19:51 -04:00
0dfeff934a
fix test failures introduced from noclipfaces change
2022-06-11 08:38:30 -04:00
10676603e9
move clip & origin into game-specific code
...
remove hint from brush; hint is technically a surface flag rather than a content flag, so we can infer it from the sides rather than needing to store it as a unique flag (we could still cache the result somewhere but this makes it consistent between q1 and q2)
2022-06-11 08:29:55 -04:00
be17bf7c7d
fix mistype
2022-06-11 07:32:43 -04:00
b33e792458
move clip-own-typeness over to gamedef & contentflags (fixes Q2 edge case with a solid version of a type bordering a translucent version)
2022-06-11 06:01:36 -04:00
e61998dd54
Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp
...
# Conflicts:
# qbsp/surfaces.cc
2022-06-11 05:43:29 -04:00
8b4f9f5480
move mirrorinside to gamedef
2022-06-11 05:37:50 -04:00
948d3463ba
testqbsp: Add q2_liquids test
2022-06-11 01:21:17 -06:00
5372c4a568
qbsp: fix q2 liquids not mirrored
2022-06-10 23:29:28 -06:00
121c6384fe
q2_liquids.map: "un-default" content/surface flags in TB so they don't require a baseq2 dir to compile correctly
2022-06-10 22:15:20 -06:00
28c6489968
q2_liquids.map, q2_water_trans.map from Paril
2022-06-10 22:11:59 -06:00
3bf797d72e
bspfile: build fix
2022-06-10 21:35:01 -06:00
64159d92f1
Merge remote-tracking branch 'github-desktop-paril/type-cleanup' into brushbsp
2022-06-10 21:32:23 -06:00
66063168f6
testqbsp: all q2 tests pass against these tools + q2tools-220
2022-06-10 20:30:20 -06:00
b3cedd7fed
testqbsp: adjust detail test case to pass in q2-220 tools
2022-06-10 20:21:00 -06:00
ce1c2c2c19
qbsp_q2_detail: translate map so center doesn't get chopped in q2 tools
2022-06-10 20:18:35 -06:00
c878a11f1d
testqbsp: fix detail test expectations
2022-06-10 20:14:54 -06:00
fc5f1573ef
qbsp: simplify ShouldClipbrushEatBrush
...
fixes lavaclip test case
2022-06-10 20:00:42 -06:00
d4f1707cdb
qbsp: proper merging of Q2 contents
2022-06-10 19:19:00 -06:00
31ab4546a3
testqbsp: update playerclip test expectation to match q2tools_220
2022-06-10 19:00:19 -06:00
Jonathan
Eric Wasylishen