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
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
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
Stephen Birarda
2aebfc968a
don't render Avatars when in lobby
2014-10-30 10:21:52 -07:00
Stephen Birarda
183d080b1e
use new lobby panel wall to avoid shimmer on frame edge
2014-10-30 10:11:05 -07:00
ZappoMan
c650cabb5d
support for locked property, some plumbing for textures property
2014-10-30 10:05:20 -07:00
Brad Hefta-Gaub
12c79b2be8
Merge pull request #3696 from birarda/lobby
...
tweaks to lobby to add the orb shell
2014-10-30 09:20:21 -07:00
Stephen Birarda
136aba450b
add semicolons back to all of lobby, fix long line
2014-10-30 09:18:46 -07:00
ZappoMan
83706cfc4e
Revert "remove sample code"
...
This reverts commit bde221c0c3
.
2014-10-29 21:22:06 -07:00
ZappoMan
bde221c0c3
remove sample code
2014-10-29 21:09:31 -07:00
Brad Hefta-Gaub
6b4b0bc8a4
Merge pull request #3693 from Adrianl3d/20016
...
CR for Job #20016 - Input box overlay in Javascript
2014-10-29 20:45:57 -07:00
Adrianl3d
2532a54a2d
code tidy up
...
Fixed indentation, fixed text overflow.
2014-10-30 13:28:50 +10:00
Stephen Birarda
4a32b5acf3
add a reticle so oculus selection is more obvious
2014-10-29 16:19:44 -07:00
Stephen Birarda
64c5405a36
use an ORB_SHIFT variable to easily shift the orb position
2014-10-29 16:01:33 -07:00
Stephen Birarda
88475f6154
fix positioning of lobby panel wall inside orb sphere
2014-10-29 15:47:23 -07:00
Stephen Birarda
26f71de65f
Merge branch 'master' of https://github.com/highfidelity/hifi into lobby
2014-10-29 14:50:47 -07:00
Stephen Birarda
a333325a92
when user drops into lobby hide everything else
2014-10-29 14:29:28 -07:00
Brad Hefta-Gaub
d49b617a4a
Merge pull request #3695 from RyanDowne/master
...
Philip's head move script changes
2014-10-29 13:59:26 -07:00
Brad Hefta-Gaub
daf867f3ee
Merge pull request #3694 from birarda/lobby
...
initial version of the lobby panel wall to jump to locations
2014-10-29 13:59:02 -07:00
Ryan
d8ce5d530f
Philip's head move script changes
2014-10-29 13:50:49 -07:00
Stephen Birarda
ed098be2bc
don't remove testModelOverlaySubMeshes
2014-10-29 13:49:12 -07:00
Stephen Birarda
cb4ae5f1bb
initial version of the lobby script to jump to locations
2014-10-29 13:43:59 -07:00
Brad Hefta-Gaub
51531e1fb5
Merge pull request #3689 from huffman/fix-edit-entities-arrow
...
Fix issue with arrow keys moving objects when edit mode off
2014-10-29 12:11:06 -07:00
ZappoMan
c3d1d13fa9
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes
2014-10-29 11:56:27 -07:00
ZappoMan
0696bd39f5
added example script for lobby model overlays
2014-10-29 11:39:23 -07:00
Ryan Huffman
e8f7c2c2ae
Fix issue with arrow keys moving objects when edit mode off
2014-10-29 11:20:19 -07:00
Adrianl3d
1d335c1218
Added textInputOverlayExample.js
...
Displays a text overlay and captures keystrokes which appear on the
overlay. Demonstrates keystroke events, mouse click events, clickable
text overlay and image overlay buttons
2014-10-29 23:39:44 +10:00