Sam Gateau
966afa1e4a
Adding the drawKeyLight shader
2017-05-17 18:26:49 -07:00
Sam Gateau
3e7795ec11
Adding the drawKeyLight shader
2017-05-17 18:23:47 -07:00
Sam Gateau
79f700e8ce
Adding the drawKeyLight shader
2017-05-17 18:12:48 -07:00
Sam Gateau
0f250e693d
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-17 09:49:20 -07:00
Thijs Wenker
2d6c6af37f
Merge pull request #10381 from Triplelexx/21297
...
DNM 21297 - Edit.js: Make the default particle system attractive
2017-05-17 15:55:40 +02:00
Triplelexx
c678fd67ed
change default particle texture to production
2017-05-17 14:52:11 +01:00
Thijs Wenker
278bc610d4
Merge pull request #10466 from misslivirose/feat-find-entities-by-type
...
Add function findEntitiesByType EntityScriptingInterface
2017-05-17 15:06:04 +02:00
Brad Hefta-Gaub
764bfe94f5
Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
...
Feature/snap turn smoothing 21270
2017-05-16 21:05:38 -07:00
Brad Hefta-Gaub
ee6bed5c1c
Merge pull request #10189 from Atlante45/fix/memory-leak
...
Set max packet per second on the agent
2017-05-16 21:03:05 -07:00
Brad Hefta-Gaub
b0d2de7bc0
Merge pull request #10427 from ctrlaltdavid/21334
...
Fix erroneous "did not start playing recording" messages
2017-05-16 20:54:27 -07:00
Brad Hefta-Gaub
12aa354ddd
Merge pull request #10474 from ctrlaltdavid/21346
...
Fix recording playback not clearing attachments and nametags
2017-05-16 20:53:17 -07:00
Brad Hefta-Gaub
254c6e9292
Merge pull request #10441 from Atlante45/feat/launch-sandbox
...
Launch the Sandbox as early as possible
2017-05-16 20:52:23 -07:00
Brad Hefta-Gaub
b759a148f3
Merge pull request #10480 from ctrlaltdavid/21360
...
Add domain to record script user activity logging
2017-05-16 20:48:27 -07:00
Brad Hefta-Gaub
36c7821e1e
Merge pull request #10455 from ZappoMan/TriangleSetOptimizations
...
TriangleSet optimizations - ~80% improvement in Ray picking against models
2017-05-16 20:47:50 -07:00
Seth Alves
36f8d08b32
Merge pull request #10450 from hiflex/patch-1
...
Fix the Face Camera checkbox on the text entity properties tab.
2017-05-16 20:31:56 -07:00
Brad Hefta-Gaub
f623a9dc82
Merge pull request #10478 from sethalves/delete-localtree-children
...
clean up children of deleted avatar-entity
2017-05-16 18:14:45 -07:00
David Rowe
04fcdfc4a2
Add domain to record script user activity logging
2017-05-17 12:23:53 +12:00
Seth Alves
1e4e2cc1b4
when a parent entity is deleted, delete its children in the local tree, rather than waiting for the server to tell us about it
2017-05-16 16:22:40 -07:00
samcake
2cd2c95940
Adding more debugging tool
2017-05-16 16:12:31 -07:00
Triplelexx
5a742002e2
change default particle values
2017-05-16 23:39:38 +01:00
Andrew Meadows
e446d0f8c9
Merge pull request #10473 from huffman/fix/model-mesh-parts-assert
...
Remove unnecessary assert in Model.cpp
2017-05-16 15:29:22 -07:00
Atlante45
201f81f20a
Don't wait on the sandbox
2017-05-16 14:41:57 -07:00
anshuman64
b36fb81524
Merge pull request #10475 from highfidelity/viveChange
...
Change Puck Calibration Time from 2 sec to 1 sec
2017-05-16 13:58:18 -07:00
Anshuman Dewangan
e3cd85bd22
Changed calibration time from 2 to 1 sec
2017-05-16 13:55:04 -07:00
David Rowe
7897bf8aa8
Fix display name not getting cleared
2017-05-17 08:17:55 +12:00
David Rowe
733b0feabd
Fix attachment data not getting cleared
2017-05-17 08:17:33 +12:00
Zach Fox
e0dd047263
Merge pull request #10472 from zfox23/snapshot_fixSnapshotDeletion
...
Snapshots: Fix case when user story would be incorrectly deleted
2017-05-16 12:54:10 -07:00
Zach Fox
aa0394c2ef
Fix case when user stories would be incorrectly deleted
2017-05-16 11:07:03 -07:00
Ryan Huffman
8eacf0ad4b
Remove unnecessary assert in Model.cpp
...
This clause inside was not longer valid - it is a valid state for
part->_meshIndex < _modelMeshRenderItems.size(). A better check might be
to compare it to the size of _meshStates which we use below, but we use
_meshStates.at(...) which will do the bounds checking, which makes the
assert unnecessary.
2017-05-16 10:56:33 -07:00
Sam Cake
4c3ddfbff9
Adding debuging of the ambient lighting
2017-05-16 01:01:19 -07:00
David Rowe
0cd5fe35da
Lint
2017-05-16 15:54:55 +12:00
David Rowe
8ab261d1b0
Work around Script.clearTimeout() occasionally failing
2017-05-16 15:52:34 +12:00
Liv Erickson
32fd905918
style pass
2017-05-15 20:49:30 -07:00
Liv Erickson
ae458dcbcf
changing models to more generally reference entities in comment
2017-05-15 20:33:22 -07:00
David Rowe
4b175e98e9
Delete persistence entity if recording fails to load for manual playback
2017-05-16 15:30:30 +12:00
Liv Erickson
a606f8a8d4
Fixing code style
2017-05-15 20:28:48 -07:00
David Rowe
6d9bf2b33e
Typos
2017-05-16 13:58:42 +12:00
Liv
08eb6442b5
Add function findEntitiesByType EntityScriptingInterface
...
Updated EntityScriptingInterface.cpp and .h to create a new function for
the Entities API that can be called to filter out entities found by a
specific entity type.
2017-05-15 18:36:36 -07:00
Andrew Meadows
9a4b624029
Merge pull request #10464 from zfox23/fixIdentityUpdatedAt_FINAL_REAL_V2
...
Implement PR10462 correctly & fix identity packet bugs again
2017-05-15 17:50:58 -07:00
Zach Fox
bc1e97032a
Thanks to Andrew!
2017-05-15 17:39:19 -07:00
samcake
db4387e55d
Trying to mess with the defautl texture for skybox
2017-05-15 17:31:29 -07:00
samcake
8626e1f3d1
Keep fixing the cascading behavior to the zone render item
2017-05-15 17:19:46 -07:00
David Rowe
6bdd498ecf
Cancel autoplay when manually playing
2017-05-16 10:47:52 +12:00
Zach Fox
64ae5119ae
Merge pull request #10462 from zfox23/fixIdentityUpdatedAt
...
Force _identityUpdatedAt to stay above 0, fixing more identity packet bugs
2017-05-15 15:44:26 -07:00
Zach Fox
e492ca9364
Improve the test - thanks Dave!
2017-05-15 14:55:05 -07:00
Zach Fox
a2a24b22a8
Force _identityUpdatedAt to stay above 0
2017-05-15 14:25:47 -07:00
David Rowe
5c5eb298f5
Better error message
2017-05-16 09:20:58 +12:00
David Rowe
8480a8e7d5
Merge branch 'master' into 21334
2017-05-16 08:52:31 +12:00
samcake
2df6d0df48
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-15 13:40:56 -07:00
Sam Gateau
1e42878d7f
Merge pull request #10460 from samcake/orange
...
Fix the default skybox texture
2017-05-15 13:38:41 -07:00
