Merge pull request #107 from playcanvas/master

m

CHANGES.md

@@ -1,5 +1,21 @@
 # PlayCanvas Engine Changes
 
+### v0.169.1
+* [FIX] Absolute script URLs
+
+### v0.169.0
+* Scripts referenced in scene are preloaded during loadScene() and loadSceneHierarchy()
+* No longer load scripts during app.preload()
+
+### v0.168.12
+* [FIX] Jumping pixels on normal mapped reflections
+
+### v0.168.11
+* [FIX] texCubeLOD path bug introduced in 0.168.9
+
+### v0.168.10
+* Improve specular occlusion
+
 ### v0.168.9
 * Added Dual-Paraboloid atlased reflections
 * Use Spherical Harmonics instead of low-res cubemap

VERSION

@@ -1 +1 @@
-0.169.0-dev
+0.170.0-dev

build/build.py

@@ -152,8 +152,8 @@ def insert_versions(path):
     # open source, read in data and replace with version and revision numbers
     sf = open(path, 'r')
     text = sf.read()
-    text = text.replace("__CURRENT_SDK_VERSION__", get_version())
-    text = text.replace("__REVISION__", get_revision())
+    text = text.replace("__CURRENT_SDK_VERSION__", get_version().strip())
+    text = text.replace("__REVISION__", get_revision().strip())
 
     # Open a temporary destination file
     dst = path + '.tmp'

src/core/core_core.js

@@ -9,6 +9,11 @@
  * Contains: https://github.com/tildeio/rsvp.js - see page for license information
  */
 var pc = {
+
+        version: "__CURRENT_SDK_VERSION__",
+
+        revision: "__REVISION__",
+
         /**
         * @name pc.config
         * @description Configuration data made available to the application from the server

src/core/core_log.js

@@ -19,7 +19,7 @@ pc.extend(pc, function () {
          * @param {String} text
          */
         open: function (text) {
-            pc.log.write(Date());
+            pc.log.write("Powered by PlayCanvas " + pc.version + " " + pc.revision);
         },
 
         /**
@@ -106,4 +106,4 @@ var logWARNING = pc.log.warning;
 var logERROR = pc.log.error;
 
 var logALERT = pc.log.alert;
-var logASSERT = pc.log.assert;
+var logASSERT = pc.log.assert;