Skip to content

Commit cff8e12

Browse files
committed
Merge branch 'master' into suicide-mode
2 parents 2d794e1 + 0e7caaa commit cff8e12

File tree

1,115 files changed

+95042
-107170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,115 files changed

+95042
-107170
lines changed

.eslintrc

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@
1414
"Map": true,
1515
},
1616
"rules": {
17-
semi: [2, "always"],
18-
"quotes": [2, "single", "avoid-escape"],
17+
"quotes": "off",
1918
"no-underscore-dangle": 0,
2019
"no-shadow": 0,
2120
"no-loop-func": 0,
2221
"eol-last": 0,
2322
"no-use-before-define": 0,
2423
"new-cap": 0,
2524
"no-constant-condition": 0,
25+
"no-cond-assign": "off",
2626
"no-redeclare": 0,
27-
"complexity": [2, 10],
2827
"no-throw-literal": 2,
29-
"indent": [2, "tab", { "SwitchCase": 2 }],
30-
"consistent-this": [2, "that"],
28+
"indent": "off",
29+
"consistent-this": "off",
3130
"consistent-return": 0,
32-
"no-lonely-if": 2,
31+
"no-lonely-if": "off",
3332
"operator-assignment": [2, "always"],
34-
"padded-blocks": [2, "never"],
35-
"space-before-function-paren": [2, { "anonymous": "always", "named": "never" }]
33+
"space-before-function-paren": [2, { "anonymous": "always", "named": "never" }],
34+
"no-console": "off"
3635
},
3736
"env": {
3837
"browser": true,
3938
"node": true,
40-
"amd": true
39+
"amd": true,
40+
"es6": true
4141
}
4242
}

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
node_modules/
33
.idea
44

5+
out-tern/
56
out-doc/
67
src-preprocessed/
78

.jshintrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// Predefined globals whom JSHint will ignore.
77
"browser" : true, // Standard browser globals e.g. `window`, `document`.
8-
8+
"node" : true,
99
"jquery" : true,
1010

1111
// Development.
@@ -56,7 +56,7 @@
5656
"shadow" : true, // Allows re-define variables later in code e.g. `var x=1; x=2;`.
5757
"supernew" : false, // Tolerate `new function () { ... };` and `new Object;`.
5858
"undef" : true, // Require all non-global variables be declared before they are used.
59-
"strict" : true, // Require "use strict"
59+
"strict" : false, // Require "use strict"
6060

6161
// Personal styling preferences.
6262
"newcap" : true, // Require capitalization of all constructor functions e.g. `new F()`.

CHANGES

+65-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,65 @@
1+
v0.15.43 --- 2016-03-30
2+
3+
### Fixes
4+
5+
* Fixed another bug in the PipRenderSystem, so the quad updates when the viewport size changes.
6+
7+
v0.15.42 --- 2016-03-30
8+
9+
### Fixes
10+
11+
* Fixed bug in PiP when aspect ratio is 1
12+
* Undeprecated Quaternion.prototype.setArray
13+
14+
v0.15.41 --- 2016-03-30
15+
16+
### Fixes
17+
18+
* Clear the html system style cache when an element's style gets updated in the loader.
19+
20+
v0.15.40 --- 2016-03-29
21+
22+
### Fixes
23+
24+
* Added convenience methods for adding/removing stats panel. Fixed stats info bug
25+
* Removed old tpf cap
26+
27+
v0.15.39 --- 2016-03-29
28+
29+
### Additions
30+
31+
+ Added PiP (Picture in Picture) rendering functionality
32+
33+
### Fixes
34+
35+
* ShakeAction fix, so it can transition to itself
36+
* Minor code fix in KeyDownAction
37+
* Change statemachine system cleanup to be synchronous and properly clean up actions
38+
39+
v0.15.38 --- 2016-03-24
40+
41+
### Additions
42+
43+
+ Added DomEventAction
44+
45+
### Fixes
46+
47+
* Cannot call map on HTML node list.
48+
* Fixed particlecomponent update position even if paused + update to TransformComponent.prototype.sync
49+
50+
v0.15.37 --- 2016-03-24
51+
52+
### Fixes
53+
54+
* Add support for adding custom html attributes in html components
55+
* Performance fixes for HtmlSystem
56+
* PickingSystem performance improvements + added visual test for picking
57+
* Correctly invalidate style cache in the HTML system
58+
* Debug frustums update correctly for cameras that are not the main camera
59+
* Fixes for "texture not set" warnings. Engine now works with webgl insight as well
60+
* Skyboxhandler bail early if the textures are same
61+
* Fix timeline autostart bug
62+
163
v0.15.36 --- 2016-03-17
264

365
### Fixes
@@ -9,7 +71,7 @@ v0.15.36 --- 2016-03-17
971
v0.15.35 --- 2016-03-16
1072

1173
### Additions
12-
74+
1375
+ Added timeline autoStart property
1476
+ Use entity meta data as entity attributes
1577

@@ -23,7 +85,7 @@ v0.15.35 --- 2016-03-16
2385
v0.15.34 --- 2016-03-14
2486

2587
### Additions
26-
88+
2789
+ Setting depth function is now supported (Material.depthState.depthFunc)
2890

2991
### Fixes
@@ -36,7 +98,7 @@ v0.15.34 --- 2016-03-14
3698
v0.15.33 --- 2016-03-09
3799

38100
### Fixes
39-
101+
40102
* Fix requestFullscreen on Safari and IE/Edge
41103
* Transition triggerEnterAction on the actual event and not next frame
42104
* ClickAction optimization, don't pickSync if already diff too much

0 commit comments

Comments
 (0)