Eric Wasylishen
59e71d7600
Merge branch 'master' into qbsp-contentflags
2021-10-01 23:39:12 -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
690ac8d24e
qbsp: Brush_GetContents_Q1: fix _mirrorinside
2021-10-01 21:19:18 -06:00
Eric Wasylishen
b36c428bef
brush.cc: attempt to fix test failures
2021-09-25 21:13:42 -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
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
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
b3258611c9
brush.cc: AdjustContentsFromName: fix all liquids getting set to water
2021-09-23 00:04:45 -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
80a4aa1b97
Merge branch 'master' into qbsp-contentflags
2021-09-22 00:12:27 -06:00
Jonathan
f89d5534b6
yay I can test tests now
2021-09-13 11:24:40 -04:00
Jonathan
4944ea36c7
set game on tests
2021-09-13 11:15:08 -04:00
Jonathan
75c303b503
last fix :(
2021-09-13 11:03:10 -04:00
Jonathan
e3378432ff
Fix test_qbsp (needs proper fixes, this is just a temp one)
2021-09-13 10:24:14 -04:00
Eric Wasylishen
d2ea0cee41
Merge remote-tracking branch 'origin/master' into qbsp-use-common
2021-09-12 23:04:42 -06:00
Jonathan
ae02ff5393
Implement leafbrushes cache
...
Fix bmodel leafbrushes (tank Spoike)
2021-09-12 13:27:39 -04:00
Jonathan
42cc946db1
Fix texinfo
2021-09-12 11:14:52 -04:00
Jonathan
91f0c47128
remove test code
...
fix two errors
2021-09-12 08:38:21 -04:00
Jonathan
c95a1e2ccb
q2 and bug fixes
...
# Conflicts:
# include/qbsp/qbsp.hh
# include/qbsp/winding.hh
# qbsp/brush.cc
# qbsp/csg4.cc
# qbsp/merge.cc
2021-09-12 08:34:01 -04:00
Ozkan Sezer
b2911290a7
fix hexen2 hull sizes ( #318 )
2021-09-11 11:46:03 -06:00
Jonathan
8cdb9ff6c4
Initial attempt at leafbrushes
2021-09-09 05:11:47 -04:00
Jonathan
35040d1bd3
Q2 working sorta
2021-09-09 02:13:28 -04:00
Jonathan
9800f4f738
Mostly all native!!
2021-09-09 00:26:17 -04:00
Jonathan
004fcb57c1
Content flags type, splitting up native and compiler flags.
...
Extreme WIP and likely not working properly. Need to rid all direct .native usages and direct them through target_version->game
2021-09-07 06:13:17 -04:00
Jonathan
c16bbf403d
Change miptex thingies to handle const as the comment wishes they would
...
Use optional to properly indicate the intended purpose of optional/"unset" values rather than a magic number (also because for some reason outputnum was stuck at 0 even though it defaults to -1 and I didn't want to debug why)
beginning of Q2 contents
2021-09-07 03:24:16 -04:00
Jonathan
00efa6e67d
Fix operator<
...
Introduce gamedef, to reduce rewriting of data in bspversions
fix name of needs_subdivision
include value in texinfo, in prep for Q2
2021-09-07 01:41:32 -04:00
Jonathan
437459a4dd
Finish using game everywhere
2021-09-06 18:09:13 -04:00
Jonathan
01d1400971
Merge branch 'qbsp-use-common' of https://github.com/ericwa/ericw-tools into qbsp-use-common
...
# Conflicts:
# common/bspfile.cc
# qbsp/writebsp.cc
2021-09-06 17:27:42 -04:00
Jonathan
3bc9b1b0f8
Instead of directly comparing BSP version pointers just for game type, I compacted quake2/hexen2 into a single enum.
...
Feature check in bspver for colored lightmaps, which replaces the many "version == q2 || version == qbism || version == hl".
2021-09-06 17:13:37 -04:00
Eric Wasylishen
5fef157f53
qbsp: take floor/ceil of node/leaf bounds even for bsp2
...
for consistency with refactor branch
2021-09-06 14:53:05 -06:00
Eric Wasylishen
71bb22dc28
qbsp: auto switch to extended limits formats
2021-09-06 14:20:51 -06:00
Eric Wasylishen
b1892d6aa3
qbsp: merge from master
2021-09-06 13:52:28 -06:00
Eric Wasylishen
648ef89845
qbsp: naming fix
2021-09-06 13:44:36 -06:00
Eric Wasylishen
d85ca375e5
qbsp: fix node/leaf mins/maxs calculations
...
they should use floor/ceil.
Otherwise a node with max X=10.5 will be written
to bsp29 as having a max of 10
2021-09-06 12:03:59 -06:00
Jonathan
dad0e61f63
Fix for texinfo/miptex searching routines
...
surf flags now use the "native + extended" format that will eventually be used for brush contents. Q1 output seems identical, haven't tested Q2 yet.
2021-09-05 16:56:29 -04:00
Jonathan
04ad8e2962
OOP wad file stuff
2021-09-04 23:23:03 -04:00
Jonathan
3b656e6ef1
Cleanup & preserve texture name for q2bsp
2021-09-04 22:15:04 -04:00
Jonathan
b01fddf7f1
More Q2 support
2021-09-04 18:49:01 -04:00
Eric Wasylishen
54799a11fc
qbsp: restore bspx brushes writing
2021-09-04 11:47:33 -06:00
Eric Wasylishen
1e6e938ead
qbsp: restore writing LMSHIFT bspx lump
2021-09-04 10:47:43 -06:00
Eric Wasylishen
047bc1299a
qbsp: fix tests
2021-09-01 01:19:24 -06:00
Eric Wasylishen
54d9e08033
qbsp: handle target bsp version
2021-09-01 00:42:30 -06:00
Eric Wasylishen
3cbf54749e
qbsp: fix -onlyents
2021-08-31 23:53:40 -06:00
Eric Wasylishen
bc44af4d1d
qbsp: fix unused variable warnings
2021-08-31 22:42:49 -06:00
Eric Wasylishen
8ed7dc9c05
qbsp: build fix
2021-08-30 01:18:47 -06:00
Eric Wasylishen
e571d1a4b2
qbsp: remove bsp29 limit check, as it will be done in common
2021-08-26 21:44:02 -06:00
Eric Wasylishen
86407d7ef3
qbsp: writebsp: rename some functions
2021-08-26 21:17:51 -06:00
Eric Wasylishen
f0d1c8488b
qbsp: pad lumps with \0 rather than ' ', for consistency with common/bspfile
2021-08-26 20:22:45 -06:00