From e22bfaee2e37c2dabb2fcdbccc737f8adb5d870e Mon Sep 17 00:00:00 2001 From: TeamSpen210 Date: Thu, 12 Dec 2019 13:15:41 +1000 Subject: [PATCH 1/2] Remove wirebox() from BaseEntityBrush This doesn't work properly --- fgd/bases/BaseEntityBrush.fgd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fgd/bases/BaseEntityBrush.fgd b/fgd/bases/BaseEntityBrush.fgd index c4b91dc3f..fe910c4f5 100644 --- a/fgd/bases/BaseEntityBrush.fgd +++ b/fgd/bases/BaseEntityBrush.fgd @@ -1,4 +1,4 @@ -@BaseClass wirebox(mins, maxs) = BaseEntityBrush +@BaseClass = BaseEntityBrush [ targetname(target_source) : "Name" : : "The name that other entities refer to this entity by." globalname(string) : "Global Entity Name" : : "Name by which this entity is linked to another entity in a different map. " + @@ -22,6 +22,8 @@ linedivider_base(string) readonly : "----------------------------------------------------------------------------------------------------------" : "" + // We could have wirebox() for these, but don't. That messes up if these are unset. + // This is a pretty advanced feature, so it's fine that it has no preview. mins(vector) : "Minimum Bounding Box Size" : : "Co-ordinate of the minimum bounding box corner, relative to entity origin. " + "The bounding box is drawn from this corner to the other one. " + "Requires Bounding Box collisions (solid 2) to be used. " + From 29be898b11bb71c1cac73cbd6145d362115dbf47 Mon Sep 17 00:00:00 2001 From: TeamSpen210 Date: Thu, 12 Dec 2019 13:25:43 +1000 Subject: [PATCH 2/2] Add batch file to build the releases --- .gitignore | 64 ++++++++++++++++++++++++++++-------------------------- build.bat | 11 ++++++++++ 2 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 build.bat diff --git a/.gitignore b/.gitignore index a3fec9bf7..6bc292c32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,33 @@ -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + .DS_Store .AppleDouble .LSOverride # Icon must ends with two \r. -Icon +Icon + # Thumbnails ._* @@ -34,11 +35,12 @@ Icon # Files that might appear on external disk .Spotlight-V100 .Trashes - -# Portal 2 stuff -*.vmx -*.log -*.prt -*.filelist.txt + +# Portal 2 stuff +*.vmx +*.log +*.prt +*.filelist.txt *.bsp -bin/bee2\.fgd + +build/ diff --git a/build.bat b/build.bat new file mode 100644 index 000000000..20b41b468 --- /dev/null +++ b/build.bat @@ -0,0 +1,11 @@ +robocopy hammer build/hammer /S /PURGE +python unify_fgd.py exp p2 srctools -o "build/portal2.fgd" +python unify_fgd.py exp p1 srctools -o "build/portal.fgd" +python unify_fgd.py exp hl2 srctools -o "build/hl2.fgd" +python unify_fgd.py exp ep1 ep2 srctools -o "build/episodic.fgd" +python unify_fgd.py exp csgo srctools -o "build/csgo.fgd" +python unify_fgd.py exp tf2 srctools -o "build/tf2.fgd" +python unify_fgd.py exp asw srctools -o "build/asw.fgd" +python unify_fgd.py exp l4d srctools -o "build/l4d.fgd" +python unify_fgd.py exp l4d2 srctools -o "build/l4d2.fgd" +python unify_fgd.py exp infra srctools -o "build/infra.fgd"