Commit graph

1820 commits

Author SHA1 Message Date
Thijs Wenker
e913095af5 Merge branch 'master' of https://github.com/worklist/hifi into 20216
Conflicts:
	interface/CMakeLists.txt
2014-12-19 13:53:33 +01:00
Ryan Huffman
5b89208068 Merge branch 'master' of git://github.com/highfidelity/hifi into orientation-display
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/overlays/Cube3DOverlay.cpp
2014-12-18 16:46:17 -08:00
Ryan Huffman
1776b2dee2 Update line3d in editModels to use start instead of position 2014-12-18 16:41:41 -08:00
Ryan Huffman
5537fb970b Update scripts to use instead of for line3d 2014-12-18 16:23:24 -08:00
Adrianl3d
af1591277c changes as per list
removed dummy code, remove mic mute state at startup, some text changes.
2014-12-19 04:17:36 +10:00
Thijs Wenker
99b0cca8f3 realsenseHands.js example 2014-12-18 00:08:20 +01:00
Ryan Huffman
cb7f5a5b45 Roll gridTool.js back temporarily 2014-12-17 12:41:58 -08:00
Brad Hefta-Gaub
61ec1bdd6a Merge pull request #3977 from huffman/fix-minor-grid
Fix minor grid spacing not updating
2014-12-17 09:13:32 -08:00
Ryan Huffman
b95eac759e Fix minor grid spacing not updating 2014-12-17 08:52:48 -08:00
ZappoMan
85c8951734 really remove the debug settings from Model rendering 2014-12-16 13:57:22 -08:00
Ryan Huffman
a9223f5887 Remove text from label 2014-12-12 15:45:31 -08:00
Ryan Huffman
2fab404f7f Reorganize selectionManager selection checking 2014-12-12 15:35:39 -08:00
Ryan Huffman
dde9b92dbd Update SelectionManager -> selectionManager 2014-12-12 15:31:54 -08:00
Ryan Huffman
33b4c614ea Add buttons for moving selection to grid and resetting to natural dimensions 2014-12-12 15:28:57 -08:00
Ryan Huffman
a5cbc9b3e2 Fix properties window to work with undo/redo 2014-12-12 15:28:22 -08:00
Ryan Huffman
1a90a81037 Add id to properties window 2014-12-12 15:27:56 -08:00
Ryan Huffman
d1f5bf2e3c Add rotation to properties window 2014-12-12 15:27:30 -08:00
Ryan Huffman
b8737ad525 Update 'f' focus to only work when something is selected 2014-12-12 15:26:07 -08:00
David Rowe
1ab9129616 Update laserPointer.js to detect pointing with Leap Motion or similar 2014-12-11 21:31:23 -08:00
Brad Hefta-Gaub
31cbd6e88c Merge pull request #3954 from ctrlaltdavid/20226
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
2014-12-11 14:33:24 -08:00
Atlante45
b7d9023645 Don't stop defaultScripts 2014-12-11 12:06:24 -08:00
Stephen Birarda
76cf122d74 Merge pull request #3950 from birarda/master
use higher resolution images in lobby
2014-12-11 11:24:19 -08:00
Stephen Birarda
230b8740bf add higher resolution images to lobby 2014-12-11 11:23:27 -08:00
AndrewMeadows
bb6f976699 Merge pull request #3945 from ZappoMan/someCleanup
AudioRefector-ectomy
2014-12-11 10:39:41 -08:00
Brad Hefta-Gaub
cfe0b28504 Merge pull request #3948 from huffman/lobby-black-panels
Update lobby to use new URLs + black panels in place of H
2014-12-10 20:16:22 -08:00
Ryan Huffman
0c746168ef Update lobby to use new URLs + black panels in place of H 2014-12-10 19:48:05 -08:00
Brad Hefta-Gaub
de5702157b Merge pull request #3946 from Atlante45/lobby_in_default
Lobby in defaultScripts
2014-12-10 17:27:14 -08:00
Atlante45
ccf8d0a787 DefaultScript.js doesn't appear in running scripts 2014-12-10 16:55:40 -08:00
Atlante45
ff372c5f4e Added lobby.js to default scripts 2014-12-10 16:53:21 -08:00
ZappoMan
eda7432868 remove audio reflector 2014-12-10 15:37:48 -08:00
Ryan Huffman
9c9bfeed33 Add missing 'var' to local variable 2014-12-10 14:27:37 -08:00
Ryan Huffman
961f629074 Fix indentation, 4 -> 2 2014-12-10 14:26:42 -08:00
Ryan Huffman
7515c26d71 Merge remote-tracking branch 'upstream/master' into lobby-reorder 2014-12-10 14:17:47 -08:00
Ryan Huffman
a24acb4858 Fix style 2014-12-10 14:15:43 -08:00
Ryan Huffman
6fa1d7a7bd Update lobby to start on the second row 2014-12-10 14:08:59 -08:00
Atlante45
10a6428277 Chess board correct orientation 2014-12-10 10:37:54 -08:00
David Rowe
ff6db7a9fa Merge branch 'master' into 20226 2014-12-09 19:20:30 -08:00
David Rowe
3ea3a497c6 Update scripts to use new textSize() method 2014-12-09 18:33:29 -08:00
Brad Hefta-Gaub
69f7a89003 Merge pull request #3937 from Atlante45/mouse_pick_in_oculus
Mouse pick improvments
2014-12-09 18:33:25 -08:00
Brad Hefta-Gaub
9c1be46893 Merge pull request #3929 from huffman/new-entities-default
New entities default
2014-12-09 18:00:25 -08:00
AndrewMeadows
1697636db5 Merge pull request #3933 from ZappoMan/entityCollisions
move emit of collisions to after done moving entities, so that callbacks can delete entities
2014-12-09 17:46:41 -08:00
Philip Rosedale
756e1b4d63 Merge pull request #3935 from PhilipRosedale/master
option to suppress lobby text for now, defaults to true
2014-12-09 17:40:03 -08:00
Philip Rosedale
96c3a0edbd option to suppress lobby text for now, defaults to true 2014-12-09 17:39:05 -08:00
Atlante45
b197558b87 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-09 16:46:13 -08:00
Atlante45
0a4f74cf9c Single reticle in the lobby 2014-12-09 16:29:45 -08:00
Ryan Huffman
ec62c6833c Make editEntities a default script and remove editVoxels.js 2014-12-09 12:15:22 -08:00
Ryan Huffman
a63d0e7770 Rename newEditEntities.js to editEntities.js 2014-12-09 12:15:22 -08:00
Stephen Birarda
55ec455f77 Merge pull request #3928 from huffman/entity-tool-settings
Entity tool settings
2014-12-09 12:14:17 -08:00
ZappoMan
895e22fcdb removed debug code 2014-12-09 12:12:04 -08:00
ZappoMan
79fc8a5a71 remove debug ryans rotate problem 2014-12-09 11:58:01 -08:00
Ryan Huffman
19ba2a1f84 Remove print statement 2014-12-09 08:56:29 -08:00
Ryan Huffman
2696f71be9 Update edit entities to disable on wasd or arrow keys 2014-12-09 08:54:28 -08:00
Ryan Huffman
e5aee44ceb Add setting save/load to grid tool 2014-12-09 08:51:04 -08:00
ZappoMan
3c09ca71cb move emit of collisions to after done moving entities, so that callbacks can delete entities 2014-12-08 18:09:49 -08:00
Clément Brisset
db751ca0c4 Merge pull request #3924 from ZappoMan/entityCollisions
make collision callbacks work as entity methods
2014-12-08 16:47:25 -08:00
ZappoMan
0d636314ba fixed CR feedback 2014-12-08 16:20:39 -08:00
Brad Hefta-Gaub
39b1f73976 Merge pull request #3921 from Atlante45/tabs_to_spaces
Tabs to spaces
2014-12-08 15:55:05 -08:00
ZappoMan
7449821a9b add ID to the properties dialog box 2014-12-08 15:06:50 -08:00
ZappoMan
efbe8ce757 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions 2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06 make collision callbacks work 2014-12-08 14:15:03 -08:00
Ryan
7fffcd3b53 Swap out the lobby model for the one with the correct light value 2014-12-08 12:47:37 -08:00
Atlante45
716fca6ae7 tabs to spaces 2014-12-08 11:49:55 -08:00
Clément Brisset
681a1a3297 Merge pull request #3917 from ctrlaltdavid/20202
CR for Job #20202 - Add "backgroundVisible" property to text overlays
2014-12-08 11:43:52 -08:00
ZappoMan
27bc394bed repair collision info mismatch 2014-12-08 10:52:53 -08:00
ZappoMan
aefeda37bd more debugging 2014-12-08 09:41:58 -08:00
Philip Rosedale
732b40f68c Merge pull request #3918 from ZappoMan/acEntityCrash
Ac entity crash
2014-12-08 09:16:40 -08:00
ZappoMan
0f5930a43d add identifyEntity() to butterflies script 2014-12-08 06:50:28 -08:00
Philip Rosedale
60c2a89292 Merge pull request #3915 from ZappoMan/modelRayPick
Proper Model Ray Picking
2014-12-07 14:19:26 -08:00
Ryan Huffman
a53e1c69fd Merge pull request #3914 from thoys/20163
CR for Job #20163 - Implement virtual keyboard for use in HMD
2014-12-07 10:22:34 -08:00
ZappoMan
8dd1a2815f use precision picking in newEditEntities 2014-12-06 15:43:17 -08:00
ZappoMan
91fd574eb5 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-06 15:28:54 -08:00
Thijs Wenker
351819708b style fixes 2014-12-06 23:50:30 +01:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
David Rowe
dbb547507d Merge branch 'master' into 20202 2014-12-06 11:14:45 -08:00
David Rowe
ca62e61579 Update scripts with text overlays to use new backgroundAlpha property 2014-12-06 11:11:52 -08:00
David Rowe
4ee99ef38a Remove dead code that's causing problems 2014-12-06 11:03:28 -08:00
David Rowe
fd00ad95ca Fix voxel size text display 2014-12-06 09:24:30 -08:00
Brad Hefta-Gaub
2bf93bd9f0 Merge pull request #3913 from huffman/entity-tool-property-fixes
Entity tool property fixes + add script property
2014-12-06 00:40:18 -08:00
Thijs Wenker
ccdb13c951 virtualkeyboard: moved files to hifi public bucket 2014-12-06 00:33:33 +01:00
Ryan Huffman
a89411fd5e Add script URL to properties tool 2014-12-05 15:27:40 -08:00
Ryan Huffman
896a34212b Fix sections not properly updating in properties tool 2014-12-05 15:27:24 -08:00
Andrzej Kapolka
01c209ef07 Merge pull request #3912 from PhilipRosedale/master
Add gamepad warp to headMove, remove step turning when head rotated
2014-12-05 15:27:03 -08:00
Philip Rosedale
2c8b1721cc Add warp from right ('O') button on gamepad 2014-12-05 14:06:41 -08:00
ZappoMan
d5fbe5b6b4 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-05 12:48:00 -08:00
Brad Hefta-Gaub
a3fbaab957 Merge pull request #3911 from huffman/entity-tool-window-polish
Entity Properties Tool Window Polish
2014-12-05 12:38:43 -08:00
Brad Hefta-Gaub
1de7db390e Merge pull request #3908 from PhilipRosedale/master
Orbiting sound example, ability to set injector position, better butterflies
2014-12-05 12:37:42 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
David Rowe
f5a1c26492 Add backgroundAlpha property to 2D and 3D text overlays 2014-12-05 11:08:00 -08:00
Ryan Huffman
849397288e Update properties tool to be a resizable table 2014-12-05 10:46:35 -08:00
Ryan Huffman
0ece6c0968 Update properties window to show properties for locked entities 2014-12-05 10:43:15 -08:00
Philip Rosedale
bc609016a9 remove debug 2014-12-05 08:59:41 -08:00
Philip Rosedale
c5247ca65b Add ability to set injector properties during playing, and orbitingSound.js 2014-12-05 08:45:00 -08:00
Philip Rosedale
dbf64b2de7 Merge pull request #3898 from DaveDubUK/walk-JS-1.12
Version 1.12 of the walk.js script
2014-12-04 16:29:19 -08:00
Thijs Wenker
c0ba9e73c2 fixed font height bq 2014-12-05 01:07:49 +01:00
Philip Rosedale
47c2ea95f4 Merge branch 'master' of https://github.com/worklist/hifi 2014-12-04 16:07:28 -08:00
Thijs Wenker
a7185738e9 virtualkeyboard: scaling text in input box 2014-12-05 00:52:36 +01:00
Clément Brisset
26340353ac Merge pull request #3897 from ZappoMan/rayPickWork
Work on improving pickable entities - Lights Optionally pickable, Spheres & Text pick properly, other bug fixes
2014-12-04 15:43:17 -08:00
Ryan Huffman
ba3f051c8c Disable the warp button in gamepad.js 2014-12-04 15:11:16 -08:00
Ryan Huffman
3bbee640fb Make gamepad mirror button toggle 2014-12-04 14:48:03 -08:00
Ryan Huffman
500b8a49d1 Add button to gamepad.js to toggle mirror mode 2014-12-04 14:17:24 -08:00
Ryan Huffman
e3a34f6db0 Add multi-speed control to gamepad.js 2014-12-04 12:17:31 -08:00
Thijs Wenker
5e2d1c3364 more comfortable movement setting 2014-12-04 21:15:10 +01:00
Brad Hefta-Gaub
3a396b3256 Merge pull request #3900 from huffman/entity-tools-fix-rp-rotation
Fix entity tool rotation to rotate around registration point
2014-12-04 11:41:22 -08:00
Ryan Huffman
1ee45e8bd1 Fix entity tool rotation to rotate around registration point 2014-12-04 11:24:56 -08:00
Brad Hefta-Gaub
cab1be25ed Merge pull request #3899 from huffman/entity-tools-fix-registration-point
Entity tools fix registration point
2014-12-04 11:04:27 -08:00
Ryan Huffman
1f82831bcc Fix call to getRelativeCenterPosition 2014-12-04 10:47:09 -08:00
Clément Brisset
a7a7ad775e Merge pull request #3896 from huffman/fix-entity-selection
Fix entity tool selection when inactive
2014-12-04 10:39:42 -08:00
Ryan Huffman
acd5495b2a Add getRelativeCenterPosition 2014-12-04 10:29:10 -08:00
Ryan Huffman
b2c5b19fd7 Remove print 2014-12-04 10:20:02 -08:00
Ryan Huffman
efdc8f5494 Fix stretch tools to work correctly with registrationPoint 2014-12-04 10:19:51 -08:00
DaveDubUK
f223f51fa6 Version 1.12 of the walk.js script 2014-12-04 18:15:25 +00:00
Ryan Huffman
53f195eec4 Fix position of overlays when registrationPoint is not centered 2014-12-04 10:05:34 -08:00
Ryan Huffman
f48d304df0 Add registrationPoint to SelectionManager 2014-12-04 10:03:54 -08:00
Ryan Huffman
74acf9513b Fix entity tool selection when inactive 2014-12-04 08:47:18 -08:00
Philip Rosedale
dd8deeea59 simpler butterflies script that doesn't put as much traffic on entity server 2014-12-03 22:39:11 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
2014-12-03 15:07:47 -08:00
Brad Hefta-Gaub
96c3bfceef Merge pull request #3889 from huffman/entity-tools-polish-2
Entity tools polish - round 2
2014-12-03 14:31:27 -08:00
Ryan Huffman
d08337326c Update selection box color to red 2014-12-03 12:59:51 -08:00
Stephen Birarda
f0b0c5fe0b change warp button to button face right 2014-12-03 11:08:41 -08:00
ZappoMan
5f9c1c490b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-03 10:44:56 -08:00
Ryan Huffman
5c5c66b265 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-polish-2 2014-12-03 08:40:38 -08:00
Ryan Huffman
4e78003520 Fix issue with selection boxes not being hidden 2014-12-02 18:03:00 -08:00
Ryan Huffman
f25d509363 Remove unused lastPlaneIntersection 2014-12-02 17:50:34 -08:00
Ryan Huffman
aa067bc153 Update UpDown translation to follow the mouse as other tools do 2014-12-02 17:49:25 -08:00
Ryan Huffman
c4ca7e1b18 Remove clearSelections from findClickedEntity - it shouldn't handle it 2014-12-02 16:01:40 -08:00
Ryan Huffman
30a7b60958 Update checkMove to only update rotation handles instead of all handles 2014-12-02 16:01:09 -08:00
Ryan Huffman
0fb0169ff2 Move baseOfEntityProjectionOverlay update to updateHandles() 2014-12-02 16:00:33 -08:00
Ryan Huffman
2f1ceb922a Increase size of selection boxes 2014-12-02 15:59:56 -08:00
Ryan Huffman
2b5a4e4563 Add selection boxes in multi-selection mode 2014-12-02 15:56:43 -08:00
Ryan Huffman
77365ec282 Move entity selection to click event and add ability to deselect 2014-12-02 15:49:45 -08:00
ZappoMan
bb6e302d69 support toggle of light picking in newEditEntities.js 2014-12-02 15:23:05 -08:00
Ryan Huffman
167ab05de4 Default 'Allow Select Large/Small Models' to true 2014-12-02 15:19:51 -08:00
ZappoMan
a47a0377ef Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-02 14:57:30 -08:00
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Philip Rosedale
1ce201c04f add same for rotation 2014-12-02 14:33:19 -08:00
Philip Rosedale
2f11501e5b Fix constant movement with hydra by adding null zone for thrust 2014-12-02 14:28:46 -08:00
Ryan Huffman
89b3a4d987 Fix selection shadow not updating when grid moves 2014-12-02 12:17:10 -08:00
Ryan Huffman
9d9a7ead5b Remove unnecessary overlay property updates 2014-12-01 16:39:36 -08:00
Ryan Huffman
a8eb49a822 Remove now-unused *Offset variables 2014-12-01 16:38:40 -08:00
Ryan Huffman
ce4d407378 Update normalizeDegrees to be exclusive on the -180 end 2014-12-01 16:12:18 -08:00
Ryan Huffman
06ab17987b Fix position of rotation degrees display
The position of the display was not always correct depending on the
camera orientation relative to the selection.
2014-12-01 16:08:50 -08:00
Ryan Huffman
4f0683dc5e Fix stretch tools not following mouse correctly 2014-12-01 15:07:03 -08:00
Ryan Huffman
da568c96ce Add rotation degrees overlay 2014-12-01 12:24:51 -08:00
Ryan Huffman
2c524cd70c Darken colors of selection/highlight boxes 2014-12-01 12:24:34 -08:00
Ryan Huffman
1950ce5a4b Add option for white grid color 2014-12-01 12:24:24 -08:00
AndrewMeadows
1b5b4c0b44 Merge pull request #3872 from ZappoMan/cleanupMenus
remove Entities developer menu items from C++ menu, make them available through script
2014-12-01 09:29:56 -08:00
Philip Rosedale
709a40516d Add auto-turn of body when head is beyond 45 degrees 2014-11-29 12:17:38 -08:00
ZappoMan
85ca03199e remove Entities developer menu items from C++ menu, make them available through script 2014-11-26 17:53:41 -08:00
David Rowe
5871ecd85c Stop incrementing counter after limit reached 2014-11-26 12:03:27 -08:00
Brad Hefta-Gaub
883fda241f Merge pull request #3864 from huffman/entity-tools-front-draw
Update entity tools to draw grabbers in front
2014-11-25 12:55:16 -08:00
Ryan Huffman
75d560744b Update rotation handles to drawInFront = true 2014-11-25 12:34:03 -08:00
Brad Hefta-Gaub
c4ea6bac1d Merge pull request #3863 from huffman/overlay-front-draw
Overlay Front Draw
2014-11-25 12:27:21 -08:00
Ryan Huffman
b3ca6fda72 Update entity tool grabbers look and size 2014-11-25 12:04:11 -08:00
Ryan Huffman
b97870f32e Update extra entity tool stretch handles to be optionally visible 2014-11-25 12:01:29 -08:00
Ryan Huffman
9020fee31a Merge branch 'master' of github.com:highfidelity/hifi into overlay-front-draw 2014-11-25 09:53:18 -08:00
Ryan Huffman
1b1482bab3 Adjust size of stretch overlays to be smaller 2014-11-24 21:00:04 -08:00
Andrew Meadows
8966ab32d8 add lifetime to gun bullets 2014-11-24 20:37:52 -08:00
Ryan Huffman
664de8215f Merge pull request #3850 from Adrianl3d/master
Added notifications.js
2014-11-24 10:38:37 -08:00
Adrianl3d
ffe66cd5c5 Clean up code
Fix code to standards
2014-11-25 04:23:00 +10:00
ZappoMan
345735fa8c tweaks 2014-11-23 20:50:39 -08:00
ZappoMan
a95b6dbabd hacking on global functions 2014-11-23 20:36:33 -08:00
ZappoMan
3ee6d6a6db work in making entity script mixable and inheritable 2014-11-23 20:12:52 -08:00
ZappoMan
80c1f5038c Merge branch 'master' of https://github.com/highfidelity/hifi into lobbyTweaks 2014-11-23 11:39:05 -08:00
ZappoMan
f23d8f6c20 text sizing tweaks 2014-11-23 11:21:05 -08:00
ZappoMan
437af06245 switch to 3d text for description 2014-11-23 11:16:33 -08:00
Thijs Wenker
e12f64bae4 virtual-keyboard:
- added keycodes
- resizes the example text entity based on text size
- adds the author of the text entity in the bottom right corner
2014-11-23 17:15:14 +01:00
ZappoMan
53bd8fd6d2 handle no description and blank panels better 2014-11-22 21:30:58 -08:00
ZappoMan
efe202b7e8 make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby 2014-11-22 21:25:43 -08:00
ZappoMan
310e31377d handle line wrapping in description 2014-11-22 14:49:56 -08:00
ZappoMan
f014025b81 first cut at lobby tweaks 2014-11-22 14:28:06 -08:00
ZappoMan
93755e6506 fix bugs in unloading scripts when changing domains 2014-11-22 11:53:50 -08:00
Adrianl3d
2edd252576 Fix persist time
Set persist time to 10 secs
2014-11-22 21:47:14 +10:00
Philip Rosedale
983975e872 lets you grab an object and turn it near your face to better see it 2014-11-21 20:05:36 -06:00
Adrianl3d
6a66351e7f Clean up code
Fix indentations, whitespace, and layout
2014-11-22 10:39:34 +10:00
Ryan Huffman
ab2fa16be3 Update edit entities moveUp arrow position 2014-11-21 12:06:46 -08:00
Philip Rosedale
85419a3e2d limit max distance of movement, don't pull to 3P unless going back 2014-11-21 01:04:52 -06:00
Philip Rosedale
5d6d9ae0df cleaner version 2014-11-20 22:53:49 -06:00
Philip Rosedale
069f1be89d jump with number keys to preset places 2014-11-20 22:48:03 -06:00
Thijs Wenker
a60374e4c1 virtual-keyboard: added text-entity example 2014-11-21 02:59:05 +01:00
Philip Rosedale
9a9f6bc485 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-20 19:20:57 -06:00
Philip Rosedale
57d3bac805 Merge pull request #3844 from ZappoMan/sitEntityScript
First cut at sit entity script
2014-11-20 19:20:39 -06:00
Thijs Wenker
2b57f68857 virtual-keyboard:
- shift key functions
- keys show pressed while pressing them
- keyboard.onKeyPress and onKeyRelease are functional
2014-11-21 02:07:11 +01:00
Stephen Birarda
64d9dc4efa fix for scaling of lobby and missing reticle 2014-11-20 17:05:37 -08:00
Philip Rosedale
ddcd39ea65 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-20 18:51:04 -06:00
Philip Rosedale
d8a74a4db4 add max distance at which you will auto-magically look at someone else 2014-11-20 18:34:06 -06:00
Stephen Birarda
7f795ec67c repairs for new lobby shell 2014-11-20 16:20:32 -08:00
Stephen Birarda
4f879a06a6 fix flipped URLs for models in lobby 2014-11-20 16:11:08 -08:00
ZappoMan
3761f24619 fix stand up icon 2014-11-20 16:08:36 -08:00
Stephen Birarda
c15354d935 update lobby for new orb and panel wall 2014-11-20 15:44:05 -08:00
ZappoMan
ee6516970e first cut at entity script for sitting 2014-11-20 15:37:00 -08:00
Philip Rosedale
cd2a6f0f9c merge fix 2014-11-20 17:35:50 -06:00
Thijs Wenker
fefe9bdb87 virtual-keyboard: rescale-able 2014-11-20 22:40:49 +01:00
Stephen Birarda
0a6ffe3dbd Merge pull request #3841 from birarda/master
fix oculus mode check for lobby
2014-11-20 10:55:57 -08:00
Stephen Birarda
81b46d6c2c fix oculus mode check for lobby 2014-11-20 10:55:40 -08:00
Brad Hefta-Gaub
168487e0a7 Merge pull request #3840 from huffman/entity-snap-on-create
Entity snap on create (+ remove getEntityItemID)
2014-11-20 09:58:54 -08:00
Ryan Huffman
6a68281308 Remove EntityScriptingInterface::getEntityItemID 2014-11-20 09:39:41 -08:00
Stephen Birarda
f3b5102969 remove texture replace fix to avoid a crash 2014-11-20 09:38:41 -08:00
Ryan Huffman
6f0d5faa5b Update tools to snap to grid on creation 2014-11-20 09:20:22 -08:00
Philip Rosedale
5101e469dc Merge branch 'master' of https://github.com/worklist/hifi 2014-11-19 23:54:31 -06:00
Clément Brisset
2c6a76ec17 Merge pull request #3830 from huffman/entity-list-window
Entity list window
2014-11-19 17:05:48 -08:00
Ryan Huffman
4b5d67d519 Update entityList.js to check for invalid entityIDs 2014-11-19 15:33:32 -08:00
Stephen Birarda
afe4a4e432 don't show reticle if not wearing HMD, reset panel textures 2014-11-19 15:26:18 -08:00
Stephen Birarda
987b75d8f7 switch to next musak when finished 2014-11-19 14:52:57 -08:00
Thijs Wenker
4eb4330e84 virtualkeyboard now scales to the viewportdimensions 2014-11-19 23:08:50 +01:00
Stephen Birarda
45450c4fe3 handle offset passed in AudioInjectorOptions for mixer injections 2014-11-19 13:42:24 -08:00
Stephen Birarda
81c5f9ba5a inject lobby music at a random starting point 2014-11-19 13:36:27 -08:00
Ryan Huffman
0242e0efcf Fix layout of entity list window 2014-11-19 13:35:08 -08:00
Ryan Huffman
3ff44964b5 Add entity list window 2014-11-19 13:25:38 -08:00
Stephen Birarda
03bfaa4869 handle RAW stereo audio files by using stereo.raw extension 2014-11-19 12:20:12 -08:00
Ryan Huffman
1706faf2da Fix animationIsPlaying not showing correctly in properties tool window 2014-11-19 11:20:47 -08:00
Ryan Huffman
4d56c21442 Add snapping to vertical translation 2014-11-19 10:35:42 -08:00
Philip Rosedale
9afaf8f6d8 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-18 21:58:40 -08:00
Thijs Wenker
7dc35bb349 virtual-keyboard:
- positioned in bottom
- keyboard hover-able
2014-11-19 03:12:22 +01:00
Brad Hefta-Gaub
51a2bf8226 Merge pull request #3825 from Atlante45/fix_ac_deadlock
AC ambiance script / moved AC scripts to new directory
2014-11-18 17:47:33 -08:00
Atlante45
44190b6fde AC ambiance script / moved AC scripts to new directory 2014-11-18 17:27:37 -08:00
Philip Rosedale
340742ec36 Merge pull request #3821 from ZappoMan/movables
More work on the movable.js script
2014-11-18 16:53:09 -08:00
Brad Hefta-Gaub
ee19a2d5a7 Merge pull request #3820 from huffman/grid-updates
Grid tool updates + fixes
2014-11-18 14:57:08 -08:00
ZappoMan
c070835681 use move sounds for turning until further research and foley work 2014-11-18 14:41:56 -08:00
ZappoMan
b53124cba7 tweaks to sound behavior 2014-11-18 14:25:12 -08:00
Adrianl3d
f1543a9d36 Added notifications.js
Creates overlay notifications from events and key strokes. improved
fading.
2014-11-19 04:36:57 +10:00
Ryan Huffman
16e3887cbc Set snapToGrid to default to false 2014-11-18 10:28:14 -08:00
Ryan Huffman
a4cc12e448 Add snapToSpacing functionality 2014-11-18 10:28:03 -08:00
Ryan Huffman
10008cb41f Fix snapToGrid checkbox not working 2014-11-18 10:27:26 -08:00
Philip Rosedale
79497586dd Merge branch 'master' of https://github.com/worklist/hifi 2014-11-18 10:15:32 -08:00
Ryan Huffman
c39bd362b7 Fix grid controls not updateable 2014-11-18 09:52:00 -08:00
ZappoMan
8f9ca32a2b added sounds to moving 2014-11-17 22:13:49 -08:00
ZappoMan
bc4e7ab662 add rotate support to movable.js 2014-11-17 20:13:17 -08:00
Thijs Wenker
d52f410c03 virtualKeyboard: added cursor which responds to HMD 2014-11-18 03:11:47 +01:00
Thijs Wenker
21f209f5a4 Merge branch 'master' of https://github.com/worklist/hifi into 20163 2014-11-18 02:27:10 +01:00
Thijs Wenker
0119797454 virtual keyboard rendered 2014-11-18 02:26:11 +01:00
Philip Rosedale
ce6464eaf0 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-17 17:19:08 -08:00
ZappoMan
1ac9f2f563 first cut at movable entities script 2014-11-17 14:51:46 -08:00
Chris Collins
9fac84a937 Changed the Alpha on the editmodels overlay
Changed the Alpha on the editmodels overlay
2014-11-17 12:58:54 -08:00
Philip Rosedale
1836b5639e Merge branch 'master' of https://github.com/worklist/hifi 2014-11-17 11:59:27 -08:00
Philip Rosedale
226f9a93c5 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-17 07:49:10 -08:00
ZappoMan
5686ef6e94 Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity 2014-11-16 11:04:36 -08:00
Brad Hefta-Gaub
3ab5753ce0 Merge pull request #3803 from stojce/20170
CR for Job #20170 - Add checkbox to boolean item in NewEditEntities.js properties panel
2014-11-16 08:48:59 -08:00
ZappoMan
05fa3c89a7 Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity 2014-11-15 20:38:07 -08:00
Brad Hefta-Gaub
db3755f4a6 Merge pull request #3794 from thoys/20176
CR for Job #20176 - Ability to clone Overlay in Javascript
2014-11-15 08:27:36 -08:00
Stojce Slavkovski
cc487d76ca Merge branch 'master' of https://github.com/highfidelity/hifi into 20170
Conflicts:
	examples/libraries/entityPropertyDialogBox.js
2014-11-15 09:50:09 +01:00
ZappoMan
a37275e6b1 fix animation frame 2014-11-14 21:17:13 -08:00
Philip Rosedale
9e5ad96bfe Merge branch 'master' of https://github.com/worklist/hifi 2014-11-14 17:55:25 -08:00
Atlante45
4d7c5f2d4f Protect board from pieces 2014-11-14 17:35:20 -08:00
Atlante45
b1d29cf888 user data cleanup 2014-11-14 17:28:05 -08:00
ZappoMan
0cb95fc82a add support for text properties to new html propety tools 2014-11-14 17:20:05 -08:00
ZappoMan
3f18741b15 add new text entity tool to newEditEntities.js 2014-11-14 16:40:56 -08:00
Atlante45
87d472a5a9 2 space indent -> 4 space indent 2014-11-14 16:37:30 -08:00
ZappoMan
9657e7a469 add text entity editing to editModels and entityPropertyDialogBox 2014-11-14 16:28:47 -08:00
Atlante45
94f3f461ce Cleanup script for chess boards 2014-11-14 15:21:34 -08:00
Atlante45
58796df843 scriptEntity url 2014-11-14 15:17:09 -08:00
Atlante45
a6f57cb7e2 Index error 2014-11-14 15:13:54 -08:00
Atlante45
b948ff2dc8 Move dead pieces 2014-11-14 15:13:13 -08:00
Thijs Wenker
1a9f7c6e21 Merge branch 'master' of https://github.com/worklist/hifi into 20176 2014-11-14 23:01:18 +01:00
Atlante45
0227bc742b Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-14 13:30:04 -08:00
Atlante45
cc35b83d31 update pieces id 2014-11-14 12:19:26 -08:00
Atlante45
a1bd5623e1 refactor + solved network issues 2014-11-14 12:04:49 -08:00
Thijs Wenker
fa4555a7a2 Merge branch 'master' of https://github.com/worklist/hifi into 20176
Conflicts:
	interface/src/ui/overlays/Grid3DOverlay.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
	interface/src/ui/overlays/Line3DOverlay.cpp
	interface/src/ui/overlays/LocalVoxelsOverlay.cpp
	interface/src/ui/overlays/LocalVoxelsOverlay.h
	interface/src/ui/overlays/Overlay.h
	interface/src/ui/overlays/Overlay2D.cpp
	interface/src/ui/overlays/Text3DOverlay.cpp
	interface/src/ui/overlays/TextOverlay.cpp
	interface/src/ui/overlays/TextOverlay.h
2014-11-14 20:09:27 +01:00
Philip Rosedale
752a255aee Merge branch 'master' of https://github.com/worklist/hifi 2014-11-14 10:57:11 -08:00
Ryan Huffman
28eebd3fa5 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties 2014-11-14 10:53:18 -08:00
David Rowe
20fdd6d811 Disable model overlay properties example
It causes intermittent crashes in
NetworkGeometry::setTextureWithNameToURL()
2014-11-14 10:31:30 -08:00
Atlante45
4afcf9b240 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-14 08:29:22 -08:00
Brad Hefta-Gaub
db2b5fc28d Merge pull request #3791 from ctrlaltdavid/20128
CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints
2014-11-13 20:44:43 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157
CR for Job #20157 - Enable "Get Overlay properties" from javascript
2014-11-13 20:43:38 -08:00
Ryan Huffman
3658d65028 Remove grid tool from menu 2014-11-13 20:02:19 -08:00
Ryan Huffman
a6f027e33a Fix entity edit grid not hiding when disabling tools 2014-11-13 18:31:32 -08:00
Atlante45
4c35f8e325 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 18:06:30 -08:00
Ryan Huffman
6b2a497810 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes 2014-11-13 17:48:17 -08:00
Ryan Huffman
55612cc596 Add title to WebWindowClass 2014-11-13 17:46:20 -08:00
Atlante45
ce73f75e7d Merge branch 'entities_userdata' into chessgame 2014-11-13 17:45:55 -08:00
Ryan Huffman
49563dbff7 Add entityProperties tool window 2014-11-13 17:41:51 -08:00
Ryan Huffman
4254d38cdd Update buttons to grid tool 2014-11-13 17:40:21 -08:00
Philip Rosedale
1ccd47fd1d Fix drumstick script 2014-11-13 17:27:16 -08:00
Chris Collins
c55f76d7ef Apply alpha to text from 0 - .9
Apply alpha to text from 0 - .9
2014-11-13 17:27:05 -08:00
Thijs Wenker
e964741e30 added OverlayPreloader and made a bunch of clones 2014-11-14 00:01:51 +01:00
Stephen Birarda
cfa2912877 use new SoundCache across scripts 2014-11-13 15:01:45 -08:00
Stephen Birarda
de5881818b update playSound to new sound interface 2014-11-13 14:54:48 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
2014-11-13 14:53:57 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
AndrewMeadows
b797c7b38c Merge pull request #3782 from ctrlaltdavid/20140
CR for Job #20140 - Add Overlays.getTextWidth
2014-11-13 13:52:53 -08:00
Thijs Wenker
388332966d Added cloning methods to Grid3DOverlay
Added example script for cloning overlays (TODO: SpriteBillboard fix cloning of in example)
2014-11-13 22:22:46 +01:00
Atlante45
a0afcdfe79 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 11:39:15 -08:00
Atlante45
ac34db14aa Send pieces ID 2014-11-13 11:35:14 -08:00
Atlante45
ce0cb9fdc7 Better move / start of auto move dead piece 2014-11-13 11:34:38 -08:00
Philip Rosedale
9cfc95bc6a Merge pull request #3786 from ZappoMan/animationUnification
Animation unification
2014-11-13 10:23:36 -08:00
Atlante45
2498fd11a3 Preload sounds / use hash injector options 2014-11-13 10:22:45 -08:00
Atlante45
bc4514649e Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 09:35:39 -08:00
Stephen Birarda
42a73e280e remove the concert camera scripts from examples 2014-11-13 09:29:37 -08:00
ZappoMan
55c177594b only set animationIsPlaying if it changed 2014-11-13 08:37:54 -08:00
ZappoMan
ea0022501b only set animation properties if they actually changed 2014-11-13 08:13:30 -08:00
David Rowe
9e19641a1d Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
ZappoMan
4077f6c2ab Merge branch 'master' of https://github.com/highfidelity/hifi into animationUnification 2014-11-12 20:39:39 -08:00
ZappoMan
8a2e3d5045 add animationSettings property to model entities 2014-11-12 17:41:55 -08:00
Atlante45
16e243aec5 typo 2014-11-12 17:19:16 -08:00
Atlante45
bada1d8e38 Cleaner code + metadata 2014-11-12 17:13:29 -08:00
Atlante45
7193fcc89d Metadata for pieces 2014-11-12 17:12:27 -08:00
David Rowe
725d56d41f Add property getting for all 2D overlays 2014-11-12 16:50:13 -08:00
Brad Hefta-Gaub
99dd20f828 Merge pull request #3780 from ctrlaltdavid/20182
CR for Job #20182 - Add ability to set alpha on text overlays
2014-11-12 16:26:59 -08:00
Brad Hefta-Gaub
70c463695a Merge pull request #3779 from PhilipRosedale/master
Remove buckyBalls and faceshift lean-to-drive
2014-11-12 16:26:50 -08:00
Atlante45
6f8b702334 New grid 2014-11-12 15:34:39 -08:00
Atlante45
76d45953fd switch to mesh board 2014-11-12 15:34:14 -08:00