Merge remote-tracking branch 'refs/remotes/origin/v1.0Beta'

3drepo · Mar 21, 2016 · 548d923 · 548d923
2 parents 72cd275 + 1390010
commit 548d923
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/bouncer/CMakeLists.txt b/bouncer/CMakeLists.txt
@@ -3,7 +3,7 @@
 add_subdirectory(src)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 0a)
+set(VERSION_MINOR 0b)
 
 include_directories(${Boost_INCLUDE_DIRS} ${MONGO_INCLUDE_DIR} ${ASSIMP_INCLUDE_DIR} src)
 add_definitions(-DREPO_API_LIBRARY)	

diff --git a/bouncer/src/repo/repo_bouncer_global.h b/bouncer/src/repo/repo_bouncer_global.h
@@ -34,7 +34,7 @@
 
 //------------------------------------------------------------------------------
 #define BOUNCER_VMAJOR 1
-#define BOUNCER_VMINOR "0a"
+#define BOUNCER_VMINOR "0b"
 //
 
 
diff --git a/tools/release/README.txt b/tools/release/README.txt
@@ -1,4 +1,4 @@
-3D Repo Bouncer Library v 1.0(alpha)
+3D Repo Bouncer Library v 1.0(beta)
 
 This is the internal library used for 3D Repo GUI.
 
@@ -24,3 +24,30 @@ download a copy of our desktop client - 3D Repo GUI.
 =========================== Contact ==============================
 If you need any help, please contact support@3drepo.org, we
 look forward to hear from you.
+
+============================ Improvments =============================
+* (Issue #27) Increased speed of file imports
+* (Issue #47) Optimised graph generation on longer relies on ASSIMP
+* (Issue #69) Fix issues with textured models
+* (Issue #70) Removed Spurious log messages during file import
+* (Issue #72, #81) Fetch head will now fetch the latest COMPLETE version
+* (Issue #73, #74) Fix some memory leaks
+* (Issue #84) Add support for Boost v.1.60
+* (Issue #86) Removed default node searches within RepoScene (you will now need to specify which graph to look for)
+* (Issue #87) Fix crashes due to user connecting to the database without credentials
+* (Issue #89) Tone down errors related to roles
+* (Issue #90) Remove false warnings due to numerical inaccuracies
+* (Issue #91) Commiting new versions of models will no longer reset project settings
+* (Issue #95) Added workaround for generating optimised graphs with texture (textures should now be visible on the web)
+
+============================= New Features ============================
+* (Issue #46) Ability to regenerate optimised graph
+* (Issue #51) Ability to remove a project in a single function call 
+* (Issue #67, #76) Ability to generate X3D exports for web viewing
+* (Issue #79) Map node now stores the API key if required
+* (Issue #94) Support textured models with no UV coordinates (where the mesh has the same 2D dimension as the texture image)
+* (Issue #96) Models are now shifted to the origin for viewing, and will be shifted accordingly when federated.
+
+
+
+
diff --git a/tools/release/release_win.py b/tools/release/release_win.py
@@ -12,11 +12,11 @@
 githubRepo = "https://github.com/3drepo/3drepobouncer"
 
 #Release tag (Also used to name the folder)
-releaseTag = "v1.0a"
+releaseTag = "v1.0b"
 
 #name
 projName = "3drepobouncer"
-bouncerdll = "3drepobouncer_1_0a.dll"
+bouncerdll = "3drepobouncer_1_0b.dll"
 
 #Visual Studio Version (Tag as you expect to type to -G on Cmake)
 vsVersion = "\"Visual Studio 12 Win64\""