From f4d2d5add1c4e684872a0ae1451640bccaca4873 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Sat, 5 Oct 2019 07:59:36 -0700 Subject: [PATCH] more work on sync system --- .gitattributes | 23 ----------------------- config/config.json | 12 ------------ 2 files changed, 35 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 6d3830cd..00000000 --- a/.gitattributes +++ /dev/null @@ -1,23 +0,0 @@ -*.wav filter=lfs diff=lfs merge=lfs -text -*.fdata filter=lfs diff=lfs merge=lfs -text -*.obj filter=lfs diff=lfs merge=lfs -text -*.png filter=lfs diff=lfs merge=lfs -text -*.psd filter=lfs diff=lfs merge=lfs -text -*.lib filter=lfs diff=lfs merge=lfs -text -*.dll filter=lfs diff=lfs merge=lfs -text -*.icns filter=lfs diff=lfs merge=lfs -text -*.ico filter=lfs diff=lfs merge=lfs -text -*.tgz filter=lfs diff=lfs merge=lfs -text -*.zip filter=lfs diff=lfs merge=lfs -text -*.bmp filter=lfs diff=lfs merge=lfs -text -*.xbm filter=lfs diff=lfs merge=lfs -text -*.jar filter=lfs diff=lfs merge=lfs -text -*.aar filter=lfs diff=lfs merge=lfs -text -*.pyd filter=lfs diff=lfs merge=lfs -text -*.exe filter=lfs diff=lfs merge=lfs -text -*.a filter=lfs diff=lfs merge=lfs -text -/tools/make_bob/mac/* filter=lfs diff=lfs merge=lfs -text -/tools/mali_texture_compression_tool/mac/* filter=lfs diff=lfs merge=lfs -text -/tools/nvidia_texture_tools/mac/* filter=lfs diff=lfs merge=lfs -text -/tools/powervr_tools/mac/* filter=lfs diff=lfs merge=lfs -text - diff --git a/config/config.json b/config/config.json index 54f95ec8..4bd4bc0c 100644 --- a/config/config.json +++ b/config/config.json @@ -24,7 +24,6 @@ "projectpath": "ballisticacore-ios.xcodeproj", "scheme": "BallisticaCore iOS Legacy" }, - "pubsync_public_commit": "16d87a4a67ef69c6b2d08f2dea183a4a0f219ac6", "pylint_ignored_untracked_deps": [ "bs_mapdefs_tip_top", "bs_mapdefs_lake_frigid", @@ -57,16 +56,5 @@ "assets/src/server", "src/generated_src", "tools" - ], - "sync_items": [ - { - "src_path": ".editorconfig", - "src_project_id": "bamaster" - }, - { - "dst_path": "assets/src/data/scripts/bafoundation", - "src_path": "src/bafoundation", - "src_project_id": "bamaster" - } ] } \ No newline at end of file