Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
2 parents a13b39a + af13698 commit 0a6936e93bc27ba383f232c9b2c7afc5cccd72f0 @jeromeetienne committed Mar 6, 2013
Showing 810 changed files with 167,650 additions and 204,554 deletions.
View
@@ -118,7 +118,10 @@ buildBundle: buildCore
cat vendor/threex/THREEx.screenshot.js >> build/tquery-bundle.js
cat vendor/threex/THREEx.FullScreen.js >> build/tquery-bundle.js
cat vendor/threex.dragpancontrols.js >> build/tquery-bundle.js
- cat vendor/three.js/Stats.js >> build/tquery-bundle.js
+ cat vendor/three.js/stats.min.js >> build/tquery-bundle.js
+ # include the debug.js - temporary
+ # cat plugins/js/debug-bundle.js >> build/tquery-bundle.js
+ # cat plugins/js/three-debug.js >> build/tquery-bundle.js
minifyBundle: buildBundle
echo $(BANNER) > build/tquery-bundle.min.js
@@ -133,6 +136,7 @@ buildBundleRequire: buildBundle
cat build/tquery-bundle.js > build/tquery-bundle-require.js
cat plugins/requirejs/vendor/require.js >> build/tquery-bundle-require.js
cat plugins/requirejs/build/all.confrequire.js >> build/tquery-bundle-require.js
+ cat plugins/requirejs/footer.js >> build/tquery-bundle-require.js
minifyBundleRequire: buildBundleRequire
echo $(BANNER) > build/tquery-bundle-require.min.js
View
@@ -36,8 +36,12 @@ looks like the code below... Quite short.
#### Current
+#### Release - r56.0
+* ported to three.js r56
+
#### Release - r53.0
* ported to three.js r53
+* plugins/minimal : added a minimal page for requirejs
#### Release - r52.0
* ported to three.js r52
View
@@ -1 +1 @@
-r53.0
+r56.0
Oops, something went wrong.

0 comments on commit 0a6936e

Please sign in to comment.