Howard Stearns
069e6237cc
Noop change with more declarations, in hopes of convincing MSVS how lambdas work.
...
(Hey, it's worth a try...)
2015-05-25 16:52:14 -07:00
samcake
ffca6a6502
Merge pull request #4935 from sethalves/sam-model-fixes
...
fixes Sam made in my branch while trying to get a mesh to render
2015-05-25 16:39:25 -07:00
Howard Stearns
cbf4e09a10
Remove global collision event.
2015-05-25 16:10:50 -07:00
Howard Stearns
1b134d60d5
Fix typo that messed up the otherEntity for collisions.
2015-05-25 15:46:55 -07:00
Anthony Thibault
18d683bced
Particle entities should avoid resetting simulation when setMaxParticles is called.
...
This caused all particles to disappear when a network packet was received.
2015-05-25 12:22:38 -07:00
Howard Stearns
599886079d
Restore blank line for minimum diff.
2015-05-25 11:33:12 -07:00
Howard Stearns
4266a99d78
Put the javascript methods on Script, not Entities, and other minimum-diff cleanup.
2015-05-25 11:28:33 -07:00
Howard Stearns
2b12f0bcd0
Merge branch 'master' of https://github.com/highfidelity/hifi into entity-events-in-normal-scripts
2015-05-25 08:47:14 -07:00
Atlante45
c0725813b6
typo
2015-05-25 12:11:24 +02:00
Atlante45
526ec3d489
Move #if #else #endif for convenience
...
This is a convenience change. The double '{' created by the #else messes
up Xcode autoindentation.
It won't that way and the fact that useClientState is a const set to
false when SUPPORT_LEGACY_OPENGL, the code inside the if should still
get optimised out by the compiler.
2015-05-25 11:45:16 +02:00
Sam Gateau
f0ab6d96f5
merge with upstream team-teaching
2015-05-24 19:45:37 -07:00
Sam Gateau
35b8d45bee
Insert a first scene and the engine in the Application and render a first Item
2015-05-24 17:03:43 -07:00
Brad Hefta-Gaub
c141f41cee
Merge pull request #4960 from Atlante45/undef_ref
...
Fix entityProperties.html undefined ref
2015-05-24 12:41:11 -07:00
Howard Stearns
a0d09c0a6d
Mulitple independent handlers for same entity/event.
2015-05-24 11:48:11 -07:00
Atlante45
3d7a834356
Ignore new entity dimensions if one of them is 0
2015-05-24 20:20:20 +02:00
Atlante45
18812ab25f
Fix entityProperties.html undefined ref
2015-05-24 19:21:04 +02:00
Atlante45
cc7a67e05b
Fix entityProperties.html undefined ref
2015-05-24 19:18:33 +02:00
Howard Stearns
b884d3cf90
Handle all the signals.
2015-05-24 09:57:12 -07:00
Atlante45
20cb2464d1
Merge branch 'master' of https://github.com/highfidelity/hifi into text-renderer
2015-05-24 17:42:51 +02:00
Howard Stearns
1dd2b7275e
Simpler and more uniform version that handles all the standard entity-script events.
2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4
Working experimental first version.
2015-05-23 13:35:35 -07:00
Brad Hefta-Gaub
8c0bf19536
Merge pull request #4956 from Triplelexx/particle-entityProperties
...
expose particle properties for editing
2015-05-23 12:02:16 -07:00
Brad Hefta-Gaub
4ffe573d0d
Merge pull request #4957 from Atlante45/master
...
Fix incorrect scale constants
2015-05-23 11:47:43 -07:00
Atlante45
9e121aa387
Fix incorrect scale constants
2015-05-23 20:13:14 +02:00
Triplelexx
9a29489784
expose particle properties for editing
...
I have made these changes to aid with experimenting with particles when
running the edit scripts locally.
2015-05-23 17:57:25 +01:00
Clément Brisset
ec089ed6e8
Merge pull request #4955 from ZappoMan/team-teaching
...
Team teaching - merge from master
2015-05-23 07:47:57 +02:00
ZappoMan
bcac50b362
verify that entityitem cleanup is happening correctly
2015-05-22 22:39:41 -07:00
ZappoMan
43b1c1bf00
more work on smart pointers
2015-05-22 22:39:41 -07:00
ZappoMan
72ffd01920
more work on smart pointers
2015-05-22 22:39:37 -07:00
ZappoMan
9988f2d1cd
EnitityItem smart pointers
2015-05-22 22:38:02 -07:00
ZappoMan
58c7b286ef
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-22 22:21:29 -07:00
Brad Hefta-Gaub
910c8549fc
Merge pull request #4951 from huffman/ctx
...
Team Teaching - Add gpu::context to RenderArgs and use RenderArgs in more render() methods
2015-05-22 22:20:45 -07:00
Brad Hefta-Gaub
225021671a
Merge pull request #4950 from ericrius1/particleScriptName
...
renamed ajt-test to particles.js since ajt-test doesn't tell us anyth…
2015-05-22 22:17:39 -07:00
Brad Hefta-Gaub
d7b2ca64cd
Merge pull request #4949 from sethalves/octree-send-thread-adjustments
...
entity-server sends initial planky more reliably
2015-05-22 22:17:17 -07:00
ZappoMan
76c5bd1ab7
verify that entityitem cleanup is happening correctly
2015-05-22 22:01:25 -07:00
ZappoMan
31021c1dfd
more work on smart pointers
2015-05-22 21:46:05 -07:00
ZappoMan
9fa9942861
more work on smart pointers
2015-05-22 21:45:57 -07:00
Brad Hefta-Gaub
b9766aaf70
Merge pull request #4952 from huffman/remove-scale-assert
...
Temporarily remove isValidScale assert
2015-05-22 18:40:15 -07:00
Atlante45
a52c79c378
typo
2015-05-23 03:25:57 +02:00
Atlante45
a44054f9db
Make TextureCache::getImageTexture static
2015-05-23 03:24:26 +02:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Ryan Huffman
43317bc829
Temporarily remove isValidScale assert
2015-05-22 17:00:39 -07:00
Ryan Huffman
822ae800c5
Update Model::endScene to require RenderArgs
2015-05-22 16:17:01 -07:00
Ryan Huffman
8380eec03b
Update Model::renderCore to use RenderArgs
2015-05-22 16:10:43 -07:00
Ryan Huffman
47d9cf42c5
Remove unused lodManager
2015-05-22 16:04:05 -07:00
Ryan Huffman
05f8ba558f
Update RenderArgs construction in paintGL
2015-05-22 16:02:24 -07:00
Ryan Huffman
7be646d62e
Make gpu::context the first RenderArgs ctor parameter
2015-05-22 16:02:10 -07:00
Ryan Huffman
1d12744781
Remove commented out code
2015-05-22 15:34:19 -07:00
Ryan Huffman
bffcfa2ab8
Add cache sync flag in Context::enqueueBatch
2015-05-22 15:34:05 -07:00
Ryan Huffman
d1a5662ca7
Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
2015-05-22 15:33:40 -07:00
