Brad Hefta-Gaub
|
583b7b1267
|
Merge pull request #3732 from thoys/20166
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
|
2014-11-04 15:51:05 -08:00 |
|
Philip Rosedale
|
6b8476a87f
|
Merge pull request #3734 from birarda/lobby
bubble up a PickRay with action event, camera cleanup
|
2014-11-04 12:03:29 -08:00 |
|
Stephen Birarda
|
b968f05123
|
use a new cursor for selection in lobby
|
2014-11-04 11:54:14 -08:00 |
|
Stephen Birarda
|
f53455ee55
|
use a ray from the near clip for action ray
|
2014-11-04 11:40:47 -08:00 |
|
AndrewMeadows
|
d7234d5995
|
Merge pull request #3731 from ctrlaltdavid/20138
CR for Job #20138 - Repopulate example default models for "Upload URL" to better sized models
|
2014-11-04 11:08:47 -08:00 |
|
Stephen Birarda
|
8452182b45
|
replace position and orientation calls in lobby
|
2014-11-04 10:43:09 -08:00 |
|
Stephen Birarda
|
303e8f6da9
|
more js changes for changes to camera interface
|
2014-11-04 10:41:36 -08:00 |
|
Stephen Birarda
|
fe0d593ac4
|
expose camera mode as property and leverage in scripts
|
2014-11-04 10:41:13 -08:00 |
|
Stephen Birarda
|
81ef722ef8
|
update camera calls in JS to use new mode methods
|
2014-11-04 10:35:41 -08:00 |
|
Stephen Birarda
|
99219a1758
|
use actionRay in lobby script
|
2014-11-04 10:17:00 -08:00 |
|
Ryan Huffman
|
2e8e31fce9
|
Update inspect tool behavior to pan correctly
|
2014-11-04 10:06:45 -08:00 |
|
Ryan Huffman
|
573e6f119f
|
Add entity camera options to settings
|
2014-11-04 10:06:17 -08:00 |
|
David Rowe
|
4fdc00948f
|
Repopulate example models in newEditEnties.js too
|
2014-11-04 09:39:37 -08:00 |
|
David Rowe
|
fd8fb32190
|
Repopulate example models for "Upload URL" to better sized models
|
2014-11-04 09:33:39 -08:00 |
|
Ryan Huffman
|
fc977e21e6
|
Remove print statements
|
2014-11-04 09:14:14 -08:00 |
|
Ryan Huffman
|
a3fa1e4ce8
|
Merge branch 'master' of github.com:highfidelity/hifi into inspect-tool
|
2014-11-04 08:32:58 -08:00 |
|
Ryan Huffman
|
185b9ac545
|
Add Inspect tool to newEditEntities
|
2014-11-04 08:32:21 -08:00 |
|
Ryan Huffman
|
640c2c5fbf
|
Add optional orientation easing to entity camera
|
2014-11-04 08:30:10 -08:00 |
|
Stephen Birarda
|
a86ccfd603
|
Merge pull request #3725 from ZappoMan/entityScriptsAndEvents
add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity
|
2014-11-03 15:51:33 -08:00 |
|
ZappoMan
|
60182a78cb
|
CR feedback
|
2014-11-03 15:42:40 -08:00 |
|
ZappoMan
|
e12e3b05e1
|
add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity
|
2014-11-03 15:33:01 -08:00 |
|
Stephen Birarda
|
d3372537c5
|
Merge pull request #3715 from ZappoMan/entityScriptsAndEvents
Entity Scripts
|
2014-11-03 15:02:52 -08:00 |
|
ZappoMan
|
252d05282b
|
added example entity script that teleports your avatar to the entity when you click on it
|
2014-11-03 12:03:08 -08:00 |
|
ZappoMan
|
30c5451b87
|
added example of playing a sound on click
|
2014-11-03 11:52:16 -08:00 |
|
ZappoMan
|
f9bd954fbe
|
typo
|
2014-11-03 11:43:30 -08:00 |
|
ZappoMan
|
948f3a4c1f
|
added an example entity script that makes the avatar do crazy legs when you click on an entity
|
2014-11-03 11:38:49 -08:00 |
|
David Rowe
|
d085be6c47
|
Better estimate of HMD offset
|
2014-11-03 11:14:04 -08:00 |
|
ZappoMan
|
49a389618e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents
|
2014-11-03 10:54:19 -08:00 |
|
AndrewMeadows
|
8d02e64804
|
Merge pull request #3711 from ctrlaltdavid/20130
CR for Job #20130 - Repeated inspect.js errors
|
2014-11-03 08:43:53 -08:00 |
|
AndrewMeadows
|
80a385b23a
|
Merge pull request #3710 from ZappoMan/lockAndMaterialProperties
Improvements to Entities
|
2014-11-03 08:41:55 -08:00 |
|
AndrewMeadows
|
61d12ba0a9
|
Merge pull request #3709 from huffman/entity-tool-updates
Entity tool cleanup and fixes
|
2014-11-03 08:37:01 -08:00 |
|
AndrewMeadows
|
aa726bdb56
|
Merge pull request #3708 from DaveDubUK/19996
CR for Job #19996 - Applying the principles of animation to a procedural animation script
|
2014-11-03 08:25:43 -08:00 |
|
ZappoMan
|
2ffe15c833
|
add example entity script for change color on hover
|
2014-11-01 11:43:40 -07:00 |
|
Thijs Wenker
|
af74fc09b9
|
Adds AudioDevice mute functionality to ScriptEngine
|
2014-11-01 02:42:22 +01:00 |
|
ZappoMan
|
a5088eece6
|
first cut at running scripts from entities
|
2014-10-31 14:03:30 -07:00 |
|
David Rowe
|
f84030ce3f
|
Fix pan and orbit camera controls in inspect.js after API change
|
2014-10-30 19:16:29 -07:00 |
|
ZappoMan
|
fecea5fe3c
|
fixes to the Model List feature in editModels.js and added it to new edit
|
2014-10-30 15:27:05 -07:00 |
|
Ryan Huffman
|
7ccacbd8ac
|
Remove old entity selection code and fix rotation bug
|
2014-10-30 14:57:23 -07:00 |
|
ZappoMan
|
81cc15495f
|
rename Models to Entities, and add menu option to disable Light entities
|
2014-10-30 14:43:43 -07:00 |
|
Ryan Huffman
|
55fdbfec1f
|
Disable edit camera tools
|
2014-10-30 14:43:35 -07:00 |
|
Brad Hefta-Gaub
|
12fbc9a039
|
Merge pull request #3705 from birarda/lobby
lobby easter egg for status
|
2014-10-30 11:40:24 -07:00 |
|
Stephen Birarda
|
bc24fa7de0
|
lobby easter egg for status
|
2014-10-30 11:39:37 -07:00 |
|
AndrewMeadows
|
4cf77d1c6c
|
Merge pull request #3702 from ZappoMan/lockAndMaterialProperties
Lock and textures properties
|
2014-10-30 11:35:38 -07:00 |
|
Brad Hefta-Gaub
|
cdca6588e2
|
Merge pull request #3704 from huffman/orbit-camera
Update edit camera controls to hide cursor when orbiting
|
2014-10-30 11:28:27 -07:00 |
|
Ryan Huffman
|
87a17f869f
|
Update edit camera controls to hide cursor
|
2014-10-30 11:25:39 -07:00 |
|
Stephen Birarda
|
409a01c498
|
show the reticle sphere in lobby interface
|
2014-10-30 11:16:52 -07:00 |
|
ZappoMan
|
95c5b417c9
|
texture support in model entities
|
2014-10-30 11:04:19 -07:00 |
|
Stephen Birarda
|
35dc72521b
|
only show sphere if user is wearing the oculus
|
2014-10-30 10:44:55 -07:00 |
|
Stephen Birarda
|
ec126f16d5
|
make the oculus reticle a sphere overlay
|
2014-10-30 10:43:10 -07:00 |
|
Stephen Birarda
|
ae4233c680
|
add a missing semicolon for @zappoman
|
2014-10-30 10:22:30 -07:00 |
|