Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-29 22:59:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 76 branches 59 tags 1.2 GiB
Commit graph

4725 commits

Author SHA1 Message Date
druiz17
76c1fe688c fix auto dropping 2017-09-26 14:52:01 -07:00
Anthony J. Thibault
a7cfb5d635 teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale 2017-09-26 14:21:25 -07:00
David Rowe
0f5adb488c Merge branch 'vr-edit-footer' into vr-edit-a 
# Conflicts:
#	scripts/vr-edit/modules/toolsMenu.js
 2017-09-27 10:04:31 +13:00
Anthony J. Thibault
c26d04dca1 Teleport.js: Fix message bugs, and made eslint clean 
* 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work
* 'Hifi-Teleport-Disabler' message should now work
 2017-09-26 13:58:00 -07:00
Seth Alves
a871a6db1d Merge pull request #11430 from sethalves/fix-parent-grab 
Fix parent grab
 2017-09-26 13:00:16 -07:00
David Rowe
8bd0e464aa Merge branch 'vr-edit-group-box' into vr-edit-a 2017-09-27 08:48:44 +13:00
beholder
24a12a2f8f 7722 Add onHover Outline to Tablet "X" Button 2017-09-26 22:31:56 +03:00
Seth Alves
81f74f9297 Merge pull request #11444 from druiz17/module-handcontrollerPointer 
Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet
 2017-09-26 12:21:03 -07:00
Seth Alves
91f5f61ea3 Merge pull request #11456 from druiz17/bugs-handControllerGrab 
Correctly grab tablet in 3rd person
 2017-09-26 12:19:20 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2 
Secondary IPD fixes
 2017-09-26 11:53:45 -07:00
Seth Alves
216888aa03 Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab 2017-09-26 11:08:40 -07:00
Seth Alves
737b583745 avoid unequipping things during a HMD snap-turn 2017-09-26 11:08:33 -07:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async 
Modal dialogs async
 2017-09-26 11:07:42 -07:00
druiz17
2cc8a55151 fix cloning equiping 2017-09-26 10:37:36 -07:00
Daniela
e264503b9f Merge remote-tracking branch 'upstream/master' 2017-09-26 17:49:15 +01:00
Daniela
179a426389 Address QA comments. 2017-09-26 17:44:46 +01:00
David Rowe
9b7197cf3f Don't highlight entity you're inside unless you laser it 2017-09-26 15:36:40 +13:00
Seth Alves
0b60928dd3 fix rollup-to-parent code to only roll up to entity parents 2017-09-25 19:07:40 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00
druiz17
6332a53ee2 able to grab tablet in 3rd person 2017-09-25 16:36:29 -07:00
Seth Alves
5da5b24894 unmangle merge 2017-09-25 15:18:22 -07:00
David Rowe
d64e3aca55 Polyvoxels don't have a color property 2017-09-26 11:10:05 +13:00
David Rowe
428efa571e Merge branch 'master' into vr-edit-a 2017-09-26 10:40:07 +13:00
druiz17
ec40df711d fix tablet grabbing and eslint changes 2017-09-25 14:31:13 -07:00
druiz17
b1b31444f0 fix mouse visiblity 2017-09-25 11:34:18 -07:00
druiz17
dda20c1ef5 fixing merge conflict 2017-09-25 09:45:29 -07:00
Nissim Hadar
27af4685e7 Added range and altitude to UI. 2017-09-25 09:32:52 -07:00
Seth Alves
5741782f45 merge from upstream 2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub
030da7d850 Merge pull request #11401 from druiz17/module-scale-entities 
ScaleEntity Module
 2017-09-25 09:10:32 -07:00
Seth Alves
90954a4e4f Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab 2017-09-25 09:09:58 -07:00
vladest
1a2d38e31f Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds 2017-09-25 17:11:44 +02:00
Nissim Hadar
1a9625d272 Merge branch 'master' into hazeZone 2017-09-24 18:27:36 -07:00
Nissim Hadar
6cbf087708 First version with combo for Haze Mode. 2017-09-24 15:08:22 -07:00
Andrew Meadows
cf0dd6f8c3 Merge pull request #11371 from cain-kilgore/21542 
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
 2017-09-23 22:20:52 -07:00
David Rowe
bbc6e5d1b5 Fix bounding box isn't cleared when exit tool with header or grip click 2017-09-24 17:06:42 +13:00
David Rowe
4e0efdaa1a Automatically add entities in bounding box to currently selected groups 2017-09-24 16:55:15 +13:00
David Rowe
2afc84cf0b Display bounding box of currently selected groups 2017-09-24 12:06:04 +13:00
David Rowe
8976befaeb Use emissive FBX model for highlighted Tools menu header 2017-09-23 14:20:53 +12:00
David Rowe
64acc0d0a3 Press undo/redo and menu buttons when click them 2017-09-23 13:01:38 +12:00
Zach Fox
921ebc221e Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled 
Enable Inspection Mode for all; change Commerce setting name
 2017-09-22 17:52:27 -07:00
druiz17
b8ee60a394 fix scripting error 2017-09-22 17:13:48 -07:00
David Rowe
bc5cd7415b Use emissive FBX models for header bars 2017-09-23 11:56:42 +12:00
David Rowe
f53f8c14fc Update wrist tool icon 2017-09-23 11:34:57 +12:00
druiz17
2c7b8cdb4f fixing script issues 2017-09-22 16:26:41 -07:00
druiz17
ee9ac3e7f9 undo unnessary changes 2017-09-22 15:38:39 -07:00
druiz17
28d8af0b44 Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer 2017-09-22 15:33:17 -07:00
druiz17
e965b7fff1 hand controller pointer 2017-09-22 15:32:40 -07:00
Zach Fox
0eafdeab14 Fix hover -> unhover overlay behavior 2017-09-22 13:32:11 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
Nissim Hadar
5e1d470553 WIP 2017-09-22 09:48:22 -07:00
David Rowe
edd6310a07 Move undo/redo buttons to footer area and make persistent 2017-09-22 21:46:33 +12:00
David Rowe
ca000acf2a Add space for a footer to put undo/redo buttons in 2017-09-22 17:40:34 +12:00
David Rowe
e0658c7a2f Merge branch 'master' into vr-edit-a 2017-09-22 15:18:14 +12:00
druiz17
53efe6bfb2 working on fix 2017-09-21 18:17:05 -07:00
David Rowe
959d497079 Change group tool's "Cancel" button to "Clear" 2017-09-22 12:00:12 +12:00
David Rowe
e4a126461b Add extra Create palette items 2017-09-22 10:53:06 +12:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
David Rowe
a757012c10 Change default color to 100% white 2017-09-22 08:17:35 +12:00
Seth Alves
fc3e259f6f remove debug prints 2017-09-21 11:42:30 -07:00
Seth Alves
3c22c9ea3a back out bad change 2017-09-21 11:39:14 -07:00
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
Seth Alves
24bfb3f3b9 oops 2017-09-21 11:16:00 -07:00
Seth Alves
363a2a3a7a merge from upstream 2017-09-21 11:08:29 -07:00
Seth Alves
473db92a8e fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped 2017-09-21 11:07:47 -07:00
Daniela
d054c6dc36 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-21 18:29:45 +01:00
Daniela
adde847798 Fix code standard. 2017-09-21 17:57:02 +01:00
Seth Alves
61efaf7fc2 Merge pull request #11420 from druiz17/fix-parenting-overlay-module 
nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another
 2017-09-21 09:44:07 -07:00
Daniela
9787c31d70 Fix protect color pick from wrong user input. 2017-09-21 17:17:36 +01:00
druiz17
65e0c99618 small change 2017-09-21 09:07:49 -07:00
druiz17
2d7d6f85ba fixing merge conflicts 2017-09-21 09:04:13 -07:00
Daniela
d960a7c42e Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-21 16:20:51 +01:00
Daniela
7ccfac0b3b Protect stroke width from wrong user input. Protect color pick from wrong user input. 2017-09-21 15:54:53 +01:00
beholder
8085d0292d 7723 Tablet Should Rotate Faster when using Create app 2017-09-21 16:26:54 +03:00
David Rowe
f58b2a3bed Add group selection logic 2017-09-21 21:59:19 +12:00
David Rowe
2f9a314aa9 Implement group selection box button states 2017-09-21 19:07:13 +12:00
David Rowe
a56a155cc3 Add group selection box buttons 2017-09-21 17:31:32 +12:00
David Rowe
906595e4fa Automatically return to Tools menu after grouping or ungrouping 2017-09-21 16:15:06 +12:00
David Rowe
c05ccd2ed5 Merge branch 'master' into vr-edit-a 2017-09-21 14:08:16 +12:00
Anthony Thibault
03e278c5ae Merge pull request #11416 from druiz17/stylus-pos 
Pull back the stylus position in hand.
 2017-09-20 17:40:22 -07:00
druiz17
2c55419c60 change tablet forward offset 2017-09-20 16:49:45 -07:00
Seth Alves
90c97319ea Merge pull request #11408 from druiz17/fix-tablet-input 
fixing/improving and cleanup tablet inputs
 2017-09-20 16:36:07 -07:00
druiz17
949c343604 fixing nearGrabParentModule switching grabbed overlays 2017-09-20 15:34:01 -07:00
Cain Kilgore
a4655b9c73 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-20 23:25:26 +01:00
Cain Kilgore
796e9e7ab3 Fixed things 2017-09-20 23:23:30 +01:00
Thijs Wenker
7ea1968b33 Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=) 2017-09-20 14:59:15 -07:00
Thijs Wenker
60a566768a removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script 2017-09-20 14:39:13 -07:00
druiz17
92f3dfe2ab move the stylus back a bit 2017-09-20 14:23:43 -07:00
druiz17
c20c5ee2b5 fixed tablet grabbing issue 2017-09-20 14:10:10 -07:00
druiz17
2ce6dcf89d fixing spelling error 2017-09-20 11:45:42 -07:00
druiz17
5d87036f32 make changes requests and slight fixes 2017-09-20 11:41:31 -07:00
vladest
c17ca955db Listener disconnects in C++ now 2017-09-20 20:03:53 +02:00
Daniela
8144841258 Add Edit.js Entities spawn up according to the orientation of the avatar. 2017-09-20 09:21:16 -07:00
Anthony J. Thibault
0873b88347 code review feedback 2017-09-20 09:21:15 -07:00
druiz17
e78d8bc132 tablet on wiki planet 2017-09-20 09:11:06 -07:00
druiz17
9c66a25d83 fixing and cleanup tablet inputs 2017-09-19 17:03:53 -07:00
David Rowe
41647305ed Rename selection manager object to avoid name clash with new API object 2017-09-20 11:11:18 +12:00
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +02:00
Daniela
1426e10024 Fix texture loading issue with upstream master. Tune amount of points. 2017-09-19 17:47:00 +01:00
druiz17
e2921661e9 scaling entities 2017-09-19 09:35:22 -07:00
David Rowe
c56fda88fa Merge branch 'master' into vr-edit-a 2017-09-19 16:17:04 +12:00
druiz17
9df3b6c211 change tablet spawn position 2017-09-18 13:29:05 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
vladest
5585265349 Merge branch 'master' into modal_dialogs_async 2017-09-16 22:06:49 +02:00
Seth Alves
765031bf89 Merge pull request #11377 from vladest/create_resize 
Add resizable flag. Use the flag for Create only
 2017-09-16 11:14:40 -07:00
Seth Alves
095cd03ee2 Merge pull request #11380 from ctrlaltdavid/fix-controller-typos 
Fix typos in controller modules disabler
 2017-09-16 11:13:15 -07:00
Seth Alves
4fcbaf6f4d Merge pull request #11374 from sethalves/fix-grab-entity-methods 
fix grab entity methods + jshint cleanups
 2017-09-16 11:11:13 -07:00
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
David Rowe
e788f691c4 Merge branch 'master' into vr-edit-a 2017-09-16 15:59:08 +12:00
David Rowe
6c5a1c0460 Address laser and controller interactions with HUD overlays and tablet 2017-09-16 15:45:44 +12:00
David Rowe
18b71f0c0f Fix typos in controller modules disabler 2017-09-16 15:34:53 +12:00
vladest
de4f34aacb Add resizable flag. Use the flag for Create only 2017-09-15 21:49:38 +02:00
Seth Alves
0816a8af27 fix grab entity methods 2017-09-15 12:07:50 -07:00
Seth Alves
b67c571aaa fix grab entity methods 2017-09-15 12:05:49 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
Artur Gomes
e37b98e0f5 Fix polyline optimization. 
Add more points to the polyline to check if the optimizations are
working.
 2017-09-15 19:20:33 +01:00
Seth Alves
df80b7ecfa stopNearTrigger, not end 2017-09-15 11:16:54 -07:00
Seth Alves
39e6605f6f fix grab entity methods + jshint cleanups 2017-09-15 10:50:46 -07:00
David Rowe
455db1ac82 Tighten up handle scaling to keep handle 1-1 with hand/laser 2017-09-15 19:11:04 +12:00
Cain Kilgore
794f3ca69f Indentation 2017-09-15 06:09:03 +01:00
Cain Kilgore
e86b37f949 Added script for testing 2017-09-15 06:07:50 +01:00
David Rowe
1f63425e9f Don't kick particle effects when apply physics 2017-09-15 13:58:58 +12:00
David Rowe
4b63d8b7d9 Don't kick polylines when apply physics 2017-09-15 13:48:01 +12:00
David Rowe
f02d057a83 Fix not kicking off physics if hand is inside entity 2017-09-15 13:43:53 +12:00
Anthony J. Thibault
f534ee5ad9 laser offset fix 2017-09-14 16:37:45 -07:00
David Rowe
9da3ed0ceb Emissive Create palette models 2017-09-15 11:24:33 +12:00
David Rowe
b0c951a2c4 Merge branch 'master' into vr-edit-a 2017-09-15 11:09:39 +12:00
David Rowe
c6af82dedc Increase maximum number of undo levels to 1000 2017-09-15 09:55:14 +12:00
David Rowe
f1572a165a Fix history crash 2017-09-15 09:54:55 +12:00
Thijs Wenker
af4bc59307 clone local avatar entities 2017-09-14 23:31:51 +02:00
David Rowe
378793d18e Proper color circle 2017-09-15 08:48:47 +12:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
Anthony J. Thibault
7959988622 Merge branch 'master' into feature/ant-man 2017-09-14 10:37:45 -07:00
Anthony J. Thibault
7c725756f1 IPD Fixes for controllerDispatcher and controllerModules 2017-09-14 10:36:05 -07:00
David Rowe
f22e2de525 Interim method for disabling controllerDispatcher lasers, grabbing, etc. 2017-09-14 17:21:45 +12:00
David Rowe
299a8078e3 Revert handControllerGrab.js related changes 2017-09-14 17:08:26 +12:00
Anthony J. Thibault
9a9f4a0d24 Fix controllerModules with appropriate IPD scale changes 2017-09-13 18:23:54 -07:00
Anthony J. Thibault
8fb69a9867 Merge branch 'master' into feature/ant-man 2017-09-13 18:23:11 -07:00
Anthony J. Thibault
745d2ff395 Remove handControllerGrab.js, see controllerDispatcher.js instead. 2017-09-13 17:36:56 -07:00
David Rowe
a4ecb69ea6 Merge branch 'master' into vr-edit-a 2017-09-14 12:26:20 +12:00
David Rowe
8e25ccac79 Tidying 2017-09-14 12:20:33 +12:00
David Rowe
6d42e82711 Condense create and clone to have one history entry 2017-09-14 11:52:36 +12:00
David Rowe
d501a8f7cc Fix scaling and changing hands history 2017-09-14 11:32:58 +12:00
druiz17
1b288ef860 make garbbing radius the same as master 2017-09-13 16:15:36 -07:00
David Rowe
1e2a3a13da Fix grip-delete entity history 2017-09-14 09:31:32 +12:00
Anthony J. Thibault
a505a16232 Don't rescale tablet, in desktop mode, when sensorToWorldScale changes. 2017-09-13 14:22:49 -07:00
Anthony J. Thibault
ae2d0e89b4 Fixes for desktop tablet 2017-09-13 14:18:00 -07:00
David Rowe
18ce5ba30f Add undo/redo for physics 2017-09-14 08:53:20 +12:00
Anthony J. Thibault
de5f0ad987 WebTablet.js: calcSpawnInfo works more consistently. 2017-09-13 12:01:41 -07:00
Anthony J. Thibault
9a1fa9b2f2 Fix for stylus intersection with tablet and home button for scaled tablets 2017-09-13 09:52:20 -07:00
Artur Gomes
b65520e788 Merge remote-tracking branch 'upstream/master' 2017-09-13 12:32:17 +01:00
David Rowe
709e7e7d90 Add undo/redo for clone 2017-09-13 15:25:40 +12:00
David Rowe
003c1c7bc5 Add undo/redo for group/ungroup 2017-09-13 15:16:16 +12:00
David Rowe
8c9026c892 Add undo/redo for scaling 2017-09-13 14:13:48 +12:00
David Rowe
97b2988005 Miscellaneous fixes 2017-09-13 14:13:23 +12:00
druiz17
b3ff5c86f7 fixed secondary triggers and chest lid 2017-09-12 14:43:06 -07:00
David Rowe
d718ea6928 Add undo/redo for move 2017-09-13 09:17:28 +12:00
Artur Gomes
6e5eb1d918 Made the number of points per line 70 again for test purposes. 2017-09-12 20:03:32 +01:00
Dante Ruiz
d90f6320a9 Merge pull request #8 from sethalves/controller-dispatcher-1 
Controller dispatcher 1
 2017-09-12 10:54:10 -07:00
druiz17
b634292261 fixing some small issues 2017-09-12 10:53:04 -07:00
Seth Alves
e9918ca599 add profiling to controller-dispatcher 2017-09-12 10:52:52 -07:00
Seth Alves
a9aa6df93e Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1 2017-09-12 10:44:29 -07:00
Seth Alves
315f874824 add profiling to controller-dispatcher 2017-09-12 10:44:09 -07:00
Seth Alves
2850029f26 add profiling to controller-dispatcher 2017-09-12 10:00:32 -07:00
David Rowe
922b712b35 Add undo/redo for coloring entities 2017-09-12 21:58:09 +12:00
David Rowe
93a5cae7d2 Add undo/redo for deleting entities 2017-09-12 21:39:30 +12:00
David Rowe
3bb3e57f71 Add undo/redo for creating entities 2017-09-12 20:59:03 +12:00
David Rowe
68c4a2f7f6 Add History object to handle history 2017-09-12 20:53:15 +12:00
David Rowe
afb47dcfb2 Add undo and redo buttons to Tools menu 2017-09-12 20:43:11 +12:00
Anthony J. Thibault
bb5e808051 Fix for some of tablet size issues, on switching domains. 2017-09-11 18:59:52 -07:00
Anthony J. Thibault
b81f85e1ae Merge branch 'master' into feature/ant-man 2017-09-11 15:14:03 -07:00
druiz17
684aef23dc Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-11 15:08:37 -07:00
druiz17
a46e41607c fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown 2017-09-11 15:07:14 -07:00
David Rowe
be049009c8 Improve sizing of scale handles 2017-09-11 17:51:58 +12:00
David Rowe
ec6cae4105 Fix physics "grabbable" setting being applied without gravity 2017-09-11 17:04:50 +12:00
David Rowe
acf6a433a9 Don't scale z-axis of text and Web entities 2017-09-11 16:38:06 +12:00
David Rowe
18f4a3bf35 Fix hiding UI when hand is inside entity that camera isn't 2017-09-11 15:43:19 +12:00
David Rowe
ce15d0ecd0 Fix color picker circle and slider images clipping at oblique angles 2017-09-11 15:18:42 +12:00
David Rowe
bd95274a72 Merge branch 'master' into vr-edit-a 2017-09-09 20:16:09 +12:00
David Rowe
6f4f8e583b Don't kick off physics for Text and Web entities 2017-09-09 20:15:15 +12:00
David Rowe
a7e04fcba6 Don't color particle effects 2017-09-09 20:14:09 +12:00
David Rowe
561c3e4653 Make polylines and polyvoxes able to be colored 2017-09-09 17:24:07 +12:00
Seth Alves
9c098f1a0c Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-08 17:10:02 -07:00
druiz17
405d8c3afc fixing cloning and laser 2017-09-08 17:07:27 -07:00
Seth Alves
a1ffc7abd0 distance from controller to object is sometimes decided by pickray 2017-09-08 17:04:09 -07:00
druiz17
42ef397b5e fixed include path 2017-09-08 15:13:19 -07:00
Anthony J. Thibault
72e0c844e4 Merge branch 'master' into feature/ant-man 2017-09-08 14:08:26 -07:00
druiz17
5d1a5eea4c added test file 2017-09-08 13:45:45 -07:00
druiz17
b3e2c7ac56 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 13:30:48 -07:00
druiz17
e33012e522 laser on tablet update 2017-09-08 13:30:30 -07:00
Sam Gateau
ed8aa8b74d Merge pull request #11160 from Zvork/outline 
Outline effect
 2017-09-08 12:32:01 -07:00
druiz17
dbb91e5953 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 11:50:43 -07:00
druiz17
f0c12e50dd some small bug fixes 2017-09-08 11:50:19 -07:00
Daniela
e453bf8d55 Refactoring. 2017-09-08 17:58:16 +01:00
Daniela
08688dc9ed Refactoring. 2017-09-08 17:56:11 +01:00
Daniela
758f049f30 Correct offset for teleport pad. 2017-09-08 14:02:26 +01:00
Daniela
10e29d1cf0 Decrease offset for teleport pad. Add Bubble orientation and scale correction. 2017-09-08 12:45:29 +01:00
David Rowe
03ddf04140 Merge branch 'master' into vr-edit-a 2017-09-08 16:51:12 +12:00
David Rowe
70581ebbc1 Fix handle scaling's scaling and positioning of entities 2017-09-08 10:43:43 +12:00
Anthony J. Thibault
d0f9a20a01 Fix for tablet grabbing at small scales 2017-09-07 15:10:15 -07:00
druiz17
ef050a09f9 made requested changes and also allow entities/overlays to be grabbed by the grip button 2017-09-07 14:42:46 -07:00
Brad Hefta-Gaub
b316f366fc Merge pull request #11198 from druiz17/oculus-tablet-position 
fixed tablet spawn position for oculus menu button
 2017-09-07 12:30:33 -07:00
Brad Hefta-Gaub
fce8715457 Merge pull request #11306 from ElderOrb/case7385 
7385 - Collect Stats on "Exit VR" button
 2017-09-07 10:18:58 -07:00
Olivier Prat
796c59b9c2 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-09-07 10:13:53 +02:00
David Rowe
8fdc2313cc Tidying 2017-09-07 18:36:01 +12:00
druiz17
636e906191 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-06 17:15:18 -07:00
druiz17
cc7a222374 fixing Hifi-Hand-Drop for equipEntity 2017-09-06 17:15:05 -07:00
David Rowe
83a8cb5fe0 Merge branch 'master' into vr-edit-a 2017-09-07 10:53:41 +12:00
David Rowe
e94d2034c7 Don't grab entity behind entity just created and grip-click-deleted 2017-09-07 10:44:03 +12:00
David Rowe
8ca97d91c5 Make able to pick color from locked entities 2017-09-07 10:26:12 +12:00
druiz17
0d66bfca05 added far trigger 2017-09-06 14:58:04 -07:00
David Rowe
2661fb6647 Tidying 2017-09-07 08:48:03 +12:00
Daniela
0ac7e00612 Add Avatar resize compatible teleport.js pad scale 2017-09-06 19:45:03 +01:00
Olivier Prat
17e992bd14 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-09-06 19:08:37 +02:00
Olivier Prat
fe357671e1 Removed qmlc files 2017-09-06 19:06:40 +02:00
Olivier Prat
25ff132fc7 Debugging scripts working again with correct occlusion management 2017-09-06 19:05:15 +02:00
Dante Ruiz
a5553d5e1c fixed text scale for notifications 2017-09-06 09:26:48 -07:00
Dante Ruiz
b4f7cb961a Merge branch 'feature/ant-man' of github.com:hyperlogic/hifi into feature/ant-man 2017-09-06 08:38:08 -07:00
Dante Ruiz
15c853567d Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-06 08:34:28 -07:00
David Rowe
3cc0db8b40 Fix app icon occasionally being disabled at Interface start 2017-09-06 23:38:38 +12:00
David Rowe
808f37a824 Prevent entities from jittering or drifting when grab a moving set 2017-09-06 22:54:51 +12:00
David Rowe
6c35a008f1 Fix scaling entities that have physics 2017-09-06 22:32:22 +12:00
David Rowe
7b19b39bce Make physics work with multiple entities per HiFi's current capabilities 2017-09-06 18:36:06 +12:00
David Rowe
52bf8ac9a1 Merge branch 'master' into vr-edit-a 2017-09-06 13:33:33 +12:00
David Rowe
6838461b07 Display notification message when don't have rez permissions 2017-09-06 12:44:57 +12:00
Anthony J. Thibault
af8b147321 away.js - works better with sensor scale. 2017-09-05 17:34:35 -07:00
David Rowe
61fc32714a Handle domain and permission changes; disable app icon appropriately 2017-09-06 12:23:36 +12:00
Dante Ruiz
a34dae4aad adding scale to notifications 2017-09-05 17:12:40 -07:00
David Kelly
1fd30b1e0f fix passphrase reset 2017-09-05 17:03:11 -07:00
Anthony J. Thibault
74f974c68f Merge branch 'master' into feature/ant-man 2017-09-05 16:27:41 -07:00
Dante Ruiz
fec8482b69 Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man 2017-09-05 16:26:51 -07:00
Anthony J. Thibault
3d3bb2853a Updated naturalDimensiosn for touch controller config 
Totally untested! I don't have an oculus.  I'm sure it will work tho. ;)
 2017-09-05 15:39:35 -07:00
Anthony J. Thibault
23ff1b9ead Fixes for scaling controller display 
Adds MyAvatar.sensorToWorldScaleChanged signal.
 2017-09-05 15:03:41 -07:00
David Kelly
4bdfe092cf Regression in injection script 2017-09-05 12:28:31 -07:00
Dante Ruiz
cefa65de5e some more small changes 2017-09-05 12:06:32 -07:00
Dante Ruiz
28694dcf8a small change to contextOVerlays in farActionGrab 2017-09-05 11:46:06 -07:00
beholder
c0e7e5a8b2 7385 - Collect Stats on "Exit VR" button 2017-09-05 21:26:35 +03:00
Olivier Prat
b619b2311d Merged with master 2017-09-05 10:27:53 +02:00
David Rowe
310750fc0f Close the app when the user changes avatars 2017-09-04 13:30:51 +12:00
David Rowe
2cd6f7fd54 Fix cursor not working when change dominant hand 2017-09-04 12:59:05 +12:00
David Rowe
44b365df6d Merge branch 'master' into vr-edit-a 2017-09-03 10:57:32 +12:00
David Rowe
1cbc807016 Further haptic and audio tweaks 2017-09-02 21:23:30 +12:00
David Rowe
c93acbecaa Move hover haptic pulses to dominant hand 2017-09-02 21:23:13 +12:00
David Rowe
039ceed74c Modify equip and create sounds 2017-09-02 21:01:37 +12:00
David Rowe
5408daea73 Increase drop tool haptic pulse and decress hover haptic pulses 2017-09-02 20:49:50 +12:00
David Rowe
c7461a9646 Fix hover colors of menu buttons and header "back" icon 2017-09-02 20:36:22 +12:00
David Rowe
939b2ef11a Fix laser enabling / disabling while inside an entity 2017-09-02 19:39:37 +12:00
David Rowe
d3819cfee3 Better names for overlay methods 2017-09-02 19:24:37 +12:00
David Rowe
9f9a0b0c58 Hide UI if hand is inside entity that camera is outside of 2017-09-02 19:09:36 +12:00
David Rowe
296d270098 Enable entities inside an entity to be manipulated 2017-09-02 19:06:43 +12:00
David Kelly
8723ff2df2 Merge pull request #11294 from zfox23/commerce_walletPassphraseModal 
Commerce: Wallet Passphrase Input Modal
 2017-09-01 17:46:09 -07:00
Dante Ruiz
3b357ad61e finshed handControllerGrab refactoring 2017-09-01 17:07:26 -07:00
Seth Alves
8ccacf34f4 Merge pull request #11290 from Menithal/21484 
WL21484 - Add an additional parameter for entity animations to "allow translation"
 2017-09-01 15:34:07 -07:00
Zach Fox
3cf0df518f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal 2017-09-01 11:53:47 -07:00
Anthony J. Thibault
26e9e6e580 Fixes for stylus ranges and grab radii 2017-09-01 11:19:51 -07:00
Dante Ruiz
9bd368c0a9 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-01 08:27:09 -07:00
vladest
681fc529dc Merge branch 'master' into modal_dialogs_async 2017-09-01 13:31:15 +02:00
druiz17
2948061904 code cleanup 2017-08-31 22:30:30 -07:00
David Rowe
269f1769be Merge branch 'master' into vr-edit-a 2017-09-01 14:45:59 +12:00
David Rowe
110413b025 Fix action after color picker failure 2017-09-01 14:36:44 +12:00
David Rowe
734ce66df3 Add audio and haptic feedback 2017-09-01 14:30:22 +12:00
Anthony J. Thibault
6618ba12e9 Merge branch 'master' into feature/ant-man 2017-08-31 18:10:39 -07:00
Dante Ruiz
7cf27c18d3 code cleanup and fix broken features 2017-08-31 18:06:55 -07:00
Anthony J. Thibault
a1b94fd9d2 Bug fixes for laser offset and avatar hold action 2017-08-31 17:26:00 -07:00
Zach Fox
fa25c434ca Messages to marketplaces.js 2017-08-31 15:50:42 -07:00
Brad Davis
65b49a958f Merge branch 'master' into 21484 2017-08-31 14:59:30 -07:00
Anthony J. Thibault
98c89cbe78 Fixes for stylus size and offset 2017-08-31 14:45:59 -07:00
Zach Fox
ce32d2d420 Checkout and Purchases 2017-08-31 14:12:05 -07:00
David Kelly
de2ce1cd5f warning 2017-08-31 13:23:38 -07:00
Anthony J. Thibault
a0eb8152a6 fix for tablet spawn position 2017-08-31 13:15:46 -07:00
Anthony J. Thibault
1a01209020 Fixes for scaling tablet at high frame rates 2017-08-31 13:02:31 -07:00
druiz17
98b1fe6138 Merge pull request #11266 from ElderOrb/case6819 
6819 - Create button not disabled
 2017-08-31 12:36:08 -07:00
David Kelly
396f108182 forgot this the first time 2017-08-31 12:18:46 -07:00
Zach Fox
914a6bae00 Commerce: Wallet Passphrase Modal 2017-08-31 12:18:38 -07:00
vladest
1b5e6fd5f8 Merge branch 'master' into modal_dialogs_async 2017-08-31 20:39:48 +02:00
Anthony J. Thibault
9c6b8a6826 Fixes for scaling tablet 2017-08-31 11:28:05 -07:00
Zach Fox
164eeaae64 Fix the duplicated buy buttons for admins on Marketplace 2017-08-31 10:41:44 -07:00
Daniela
42be6434af Merge branch 'master' of https://github.com/highfidelity/hifi 2017-08-31 18:03:39 +01:00
David Rowe
8205b0d9d2 Merge branch 'master' into vr-edit-a 2017-08-31 15:45:15 +12:00
David Rowe
652fbaa9b7 Refactoring 2017-08-31 15:30:04 +12:00
David Rowe
3dacd1fcda Tidy options settings code 2017-08-31 13:55:00 +12:00
David Rowe
5299596254 Code tidying 2017-08-31 13:36:48 +12:00
Anthony J. Thibault
6e6687c3a6 Change tablet dimensions as sensorToWorldScale changes 2017-08-30 18:21:25 -07:00
David Rowe
3f0872465f Rename new code items 2017-08-31 13:20:37 +12:00
David Rowe
c6f987c00c Remove old code 2017-08-31 13:05:50 +12:00
Dante Ruiz
47699d4439 fixed edit.js 2017-08-30 16:52:59 -07:00
David Rowe
63074ad928 Fix button press distance 2017-08-31 11:44:52 +12:00
David Rowe
e8af4bdb2d Fix up hover state of toggle button after pressing 2017-08-31 10:54:20 +12:00
David Kelly
988ee8c8d1 fix image provider, couple other things 2017-08-30 15:23:54 -07:00
Dante Ruiz
3960ec7d5a finish main handControllerGrab refactoring 2017-08-30 15:20:03 -07:00
David Rowe
59505b4334 Fix up colors and highlighting of group/ungroup and toggle buttons 2017-08-31 09:30:11 +12:00
David Rowe
db27b97ec7 Add zero indicators to Physics options' sliders 2017-08-31 08:24:38 +12:00
Zach Fox
f366743be7 Login; punctuationMode; new images 2017-08-30 11:07:03 -07:00
Zach Fox
1b48319a3f Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 
Commerce: Zachs Punchlist 01
 2017-08-30 10:10:56 -07:00
Anthony J. Thibault
9cd8b6991e Merge branch 'master' into feature/ant-man 2017-08-30 08:58:55 -07:00
Dante Ruiz
ff134b338b Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-30 08:25:53 -07:00
David Rowe
13ac963bcc Default collisions to on 2017-08-30 20:51:25 +12:00
David Rowe
5cf40fd208 Style Physics options toggle buttons 2017-08-30 20:47:33 +12:00
David Rowe
42d2045bae Style Physics options presets pick list 2017-08-30 17:20:32 +12:00
howard-stearns
5b264a867a fix wallet login (and share code with snapshot login) 2017-08-29 16:05:01 -07:00
Zach Fox
a9c99854f9 Haven't purchased anything yet UI 2017-08-29 15:39:07 -07:00
Dante Ruiz
49608f1253 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-29 15:19:16 -07:00
Dante Ruiz
ed52136fc5 finished equiping locked clone-able entities 2017-08-29 15:18:28 -07:00
Zach Fox
50241078ae Buncha punchlist items checked off 2017-08-29 14:30:00 -07:00
David Rowe
e18e11a07b Style Physics options sliders 2017-08-30 09:01:46 +12:00
beholder
180acbc188 6819 - Create button not disabled 2017-08-29 23:49:44 +03:00
Zach Fox
91f4e59f61 Misc fixes. Get started. 2017-08-29 12:33:44 -07:00
David Rowe
33765e14fa Update general layout of Physics options 2017-08-29 21:06:29 +12:00
David Rowe
666c163637 Fix Color tool's "Swatches" label 2017-08-29 20:30:04 +12:00
David Rowe
758442999d When picking a color highlight only single entity in a group 2017-08-29 18:03:31 +12:00
David Rowe
78876d39b4 Make all buttons raise when hovered 2017-08-29 17:58:37 +12:00
David Rowe
04a545da37 Style color slider 2017-08-29 16:54:45 +12:00
David Rowe
62e3c211eb Style color circle 2017-08-29 15:46:43 +12:00
Dante Ruiz
4b592687b7 finished webEntityLaserInput, now working on cloning 2017-08-28 17:35:34 -07:00
David Rowe
67eb92da8f Style color swatches 2017-08-29 10:51:36 +12:00
Zach Fox
22d3857501 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-28 15:10:17 -07:00
Anthony J. Thibault
573985c7c9 Merge branch 'master' into feature/ant-man 2017-08-28 09:27:04 -07:00
Sam Gateau
a98d861600 Merge pull request #11242 from SamGondelman/tabletLayer2 
Web overlays and entities are always non anti-aliased
 2017-08-28 09:10:14 -07:00
vladest
38295ab73f Merge conflicts 2017-08-28 16:58:30 +02:00
David Rowe
9abcf9525c Use Settings values to determine whether or not swatches are populated 2017-08-28 15:51:11 +12:00
David Rowe
8dd06bc270 Style color picker button 2017-08-28 12:06:26 +12:00
David Rowe
c8381f32bb Style current color indicator 2017-08-27 21:15:27 +12:00
David Rowe
64821ccd76 Update general Color options layout 2017-08-26 17:09:04 +12:00
David Rowe
b0ef570ce0 Style Group options 2017-08-26 14:20:37 +12:00
Dante Ruiz
0eceb7b382 unviersial web3d vs laser 2017-08-25 17:40:30 -07:00
David Rowe
c29a900588 Fix button hovering and pressing problems 2017-08-26 12:08:37 +12:00
Zach Fox
a03f9592c1 Inventory to Purchases 2017-08-25 16:34:48 -07:00
David Rowe
2899d51835 Fix "Finish" buttons not clearing tool action 2017-08-26 11:18:25 +12:00
Zach Fox
d19377d2d4 Saving 2017-08-25 15:56:30 -07:00
David Rowe
73a6f1f278 Style Delete options 2017-08-26 10:47:41 +12:00
David Rowe
7e817652a7 Style Clone options 2017-08-26 09:51:51 +12:00
Dante Ruiz
a5508c9f75 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-25 14:21:01 -07:00
Dante Ruiz
b3ffa7b6b4 Working laser vs tablet 2017-08-25 14:20:31 -07:00
Zach Fox
e606e3dfb3 Squashed commit of the following: 
commit 453897b9e2
Author: Zach Fox <fox@highfidelity.io>
Date:   Fri Aug 25 10:56:53 2017 -0700

    Huge cleanup!
 2017-08-25 11:45:37 -07:00
Zach Fox
453897b9e2 Huge cleanup! 2017-08-25 10:56:53 -07:00
David Rowe
71c3a58e88 Style Stretch options 2017-08-25 20:50:12 +12:00
David Rowe
eda513caf0 Display appropriate icon and label on tool icon per current tool 2017-08-25 14:58:05 +12:00
David Rowe
850efec97b Display tool icon on dominant hand when tool is active 2017-08-25 14:07:41 +12:00
Dante Ruiz
fa676aaadf lasers on tablet working 2017-08-24 17:42:27 -07:00
David Rowe
3b299fc34d Fix Tools menu displaying on right hand 2017-08-25 12:05:24 +12:00
Zach Fox
3980a478d9 Only show 'buy' on costed items' 2017-08-24 16:38:44 -07:00
Zach Fox
e2c74d8b88 Initial progress 2017-08-24 15:22:30 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -07:00
David Rowe
5fec240ea6 Move Tools and Create panels closer together 2017-08-25 09:20:00 +12:00
Dante Ruiz
eb6248400c Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-24 13:41:54 -07:00
David Rowe
2159d309e2 Merge branch 'master' into vr-edit-a 2017-08-25 08:36:22 +12:00
David Kelly
eb9436ba96 Merge pull request #11235 from davidkelly/dk/encryptFile 
Initial wallet app plus some encryption of security image
 2017-08-24 13:17:14 -07:00
Menithal
e47dfeaeab Merge remote-tracking branch 'upstream/stable' into 21484 2017-08-24 21:37:20 +03:00
Brad Hefta-Gaub
5c832eae9c Merge pull request #11226 from SamGondelman/miceWithLasers 
EntityTreeRender uses RayPick API with precision picking
 2017-08-24 08:10:21 -07:00
David Rowe
9858c05bdb Pressing header in Tools options takes user back to Tools menu 2017-08-24 21:22:05 +12:00
David Rowe
24202b7fa5 Simplify deleting overlays 2017-08-24 15:26:26 +12:00
David Rowe
a33dbfe9b3 Change Tools menu header content per current tool 2017-08-24 14:30:05 +12:00
Dante Ruiz
dbe8aa77d7 working on laser v tablet 2017-08-23 17:32:41 -07:00
David Rowe
e8a1614499 Remove setting tool icon color 2017-08-24 11:10:41 +12:00
Zach Fox
e815946744 Merge pull request #11231 from ElderOrb/Case5830 
5830: Go-To menu shows up blank except for address bar
 2017-08-23 14:33:04 -07:00
David Rowe
5a1b2babde Add further items to Create palette 2017-08-24 09:21:54 +12:00
beholder
9cd784990c 5830: Go-To menu shows up blank except for address bar 2017-08-23 23:27:02 +03:00
Zach Fox
a489267cec Hide behind switch and remove dead code 2017-08-23 10:48:47 -07:00
David Rowe
2a2f058898 Fix Tools menu header underline color 2017-08-23 21:59:55 +12:00
David Rowe
be45f600d4 Style Create palette items 2017-08-23 21:56:59 +12:00
David Rowe
1aba95ecb8 Style Tools menu buttons 2017-08-23 18:20:51 +12:00
SamGondelman
d7b3686364 include noncollidable entities 2017-08-22 17:37:51 -07:00
Dante Ruiz
dc8d0c9604 disable far grab when on hud 2017-08-22 16:51:13 -07:00
David Rowe
0ef03eb52a Remove extraneous panels 2017-08-23 10:42:24 +12:00
David Rowe
7051ff8f1f Rename "tool menu" to "tools menu" 2017-08-23 09:41:46 +12:00
David Rowe
d6a23abb7c Tools menu header and panel 2017-08-23 09:30:19 +12:00
Zach Fox
4d8980b538 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-22 12:30:24 -07:00
Zach Fox
f1da7a6381 Checkpoint 2017-08-22 11:53:37 -07:00
Anthony J. Thibault
d62a0ea8ff Correct controller offsets with sensor scaling 2017-08-22 11:43:39 -07:00
vladest
b7a048c6ea Adopt clonable settings to new styling 2017-08-22 11:23:55 -07:00
Dante Ruiz
cdd184e32d intergradted teleport 2017-08-22 11:06:11 -07:00
David Rowe
44778e791f Fix entity creation position 2017-08-22 22:55:43 +12:00
David Rowe
f542c54e6c Lay out Create palette entity items 2017-08-22 22:40:38 +12:00
David Rowe
5a4ebbd54d Style Create palette header and panel 2017-08-22 21:59:31 +12:00
David Rowe
bb7e4fa302 Revise coordinate system 2017-08-22 16:02:24 +12:00
David Rowe
79056c385f Fix options buttons not pressing 2017-08-22 14:57:17 +12:00
David Rowe
c953df0040 Fix "Finish" buttons not clearing tool properly 2017-08-22 14:35:56 +12:00
Dante Ruiz
f6151fae85 slowly intergrating teleport.js 2017-08-21 16:53:28 -07:00
Dante Ruiz
94dc942d79 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-21 16:34:10 -07:00
Chris Collins
a85022bb93 Merge pull request #11216 from MidnightRift/emitterShouldTrail 
Change emitShouldTrail to emitterShouldTrail.
 2017-08-21 15:29:05 -07:00
David Rowe
cc0b95c70a Lint 2017-08-21 17:32:40 +12:00
David Rowe
fcf4831a3b Center Tools menu and options UI 2017-08-21 17:26:03 +12:00
David Rowe
0064c51610 Add "Finish" buttons for scale, clone, and delete tools 2017-08-21 16:24:55 +12:00
David Rowe
ca3eadb82f Don't display menu buttons when tool options panel open, and vice versa 2017-08-21 16:04:34 +12:00
David Rowe
e34e8ff2c0 Fix color circle and slider changes not being applied when coloring 2017-08-21 13:24:07 +12:00
David Rowe
cddb054066 Merge branch 'master' into vr-edit-h 
# Conflicts:
#	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
#	scripts/system/controllers/handControllerGrab.js
 2017-08-20 18:41:29 +12:00
David Rowe
9434ef44c3 Delay physics kick in order to avoid some erratic behavior 2017-08-20 14:15:34 +12:00
Zach Fox
512a08f67f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-18 17:05:56 -07:00
Howard Stearns
188cbee781 Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 
Asynchronous Ledger Interactions with Server
 2017-08-18 15:40:24 -07:00
anshuman64
a7090c7e07 Merge pull request #11211 from vladest/edit_clonable_lost 
Adopt cloneable settings to new styling
 2017-08-18 15:37:37 -07:00
Midnight
5f162c0352 Change emitShouldTrail to emitterShouldTrail. 2017-08-18 15:10:58 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks 
Adding Blocks Tablet App to Marketplace
 2017-08-18 15:06:18 -07:00
Zach Fox
9636fad679 Updates from wireframes 2017-08-18 13:45:30 -07:00
Dante Ruiz
8d04047d8a starting to integrate teleport.js 2017-08-18 13:23:44 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
vladest
d29d4b5016 Adopt clonable settings to new styling 2017-08-18 21:44:44 +02:00
SamGondelman
c9f4958925 handControllerGrab fix, maybe, hopefully 2017-08-18 10:39:40 -07:00
howard-stearns
6e34ab45d6 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2 2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
David Rowe
c3f96b6727 Fix damping property name 2017-08-18 13:27:38 +12:00
Zach Fox
d052b49a54 Login and picture selection done 2017-08-17 16:34:33 -07:00
Zach Fox
5f69f30551 MOAR PROGRESS 2017-08-17 16:20:50 -07:00
Zach Fox
9135e37078 Go go go go gog o 2017-08-17 15:20:17 -07:00
Zach Fox
eab16fc28c Initial progress 2017-08-17 15:01:25 -07:00
David Rowe
5dd74d71fb Activate the color picker 2017-08-18 09:55:09 +12:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
Elisa Lupin-Jimenez
4b1498f727 moved blocksApp.js to unpublished scripts, added icon 2017-08-17 10:18:29 -07:00
Artur Gomes
e8fea16449 Fix for line points disappearing on second client (trying new value to 
see if the line replicates correctly)
 2017-08-17 17:19:13 +01:00
Artur Gomes
e59ff51cdd Fixed two icons showing up when picking a color from the color table or 
from the custom colors.
 2017-08-17 16:25:33 +01:00
Artur Gomes
321742a865 Fix for points disappearing on second client (the one that's not 
drawing) (trying to limit it a bit more to see if it results in no loss
at all)
 2017-08-17 16:01:53 +01:00
Artur Gomes
2835130515 Fix dynamic hue not cycling through all the 360 hue values when drawing 
the line due to the change in the max size of the line.
 2017-08-17 15:53:13 +01:00
Artur Gomes
4f5bfcbc2b Merge remote-tracking branch 'upstream/master' 2017-08-17 14:57:31 +01:00
Artur Gomes
be35734074 Fix tablet not reopening after removing headset and putting it back on. 2017-08-17 14:56:29 +01:00
Artur Gomes
5e6e675f62 Replace stars brush. 2017-08-17 09:45:54 +01:00
Olivier Prat
1e4cf5d797 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-08-17 09:46:49 +02:00
David Rowe
32113e84e4 Move color circle crosshairs witih laser 2017-08-17 14:45:47 +12:00
David Rowe
069102f68b Initial color circle UI elements 2017-08-17 13:59:56 +12:00
Chris Collins
9c9bcd80b8 Merge pull request #11191 from SamGondelman/logging 
Miscellaneous logging fixes
 2017-08-16 15:46:32 -07:00
David Rowe
35d06c0244 Make space for color circle 2017-08-17 10:12:28 +12:00
vladest
15f8bc0141 Keep old function names for compatibility 2017-08-16 22:17:34 +02:00
druiz17
8eabf46a30 Merge pull request #11165 from 1P-Cusack/FogBugz/Case_6491_Part1 
[Case 6491] Part 1 of entitySelectionTool clean up
 2017-08-16 13:05:27 -07:00
Artur Gomes
8ef8e974b6 Merge remote-tracking branch 'upstream/master' 2017-08-16 21:00:29 +01:00
Artur Gomes
030877457b Fix tablet not opening. 
Fix headers not showing correctly since changes in editProperties page.
 2017-08-16 20:59:09 +01:00
vladest
4e5c650621 Modified some usecases for async dialogs 2017-08-16 21:41:18 +02:00
LaShonda Hopper
cc2ff565ac [Case 6491] Ran lint on entitySelectionTool.js (details below). 
Prior Issue Count: 35
Current Issue Count: 3

Resolved:
* 17 used out of scope issues.
* 11 already defined issues.
* 2 missing semicolon issues.
* 1 implicit comparison against null issue.
* 1 readability warning.

Remaining Issues as of this commit:
* scripts/system/libraries/entitySelectionTool.js: line 17, col 1, Read only.
** HIFI_PUBLIC_BUCKET assignment
* scripts/system/libraries/entitySelectionTool.js: line 19, col 1, Read only.
** SPACE_WORLD assignment
* scripts/system/libraries/entitySelectionTool.js: line 30, col 1, Read only.
** SelectionManager assignment

One notable item was a chunk of code from makeStretchTool's onMove
function which wasn't in scope of the vars being utilized.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-08-16 15:21:30 -04:00
Artur Gomes
9d87954d71 Merge branch 'master' of github.com:CraftsmanMG/hifi 2017-08-16 18:52:39 +01:00
Artur Gomes
d4255928c7 Add sections to brushes tab. 
Add preview of special effects.
Fix polyline poinst disappearing (using 48 points for now as a quick
fix)
Fix dynamic saturation and brightness effect being to strong.
 2017-08-16 18:35:23 +01:00
Artur Gomes
3ddddf4ad6 Fix animated hue not working even though the checkbox was checked after 
restarting the interface.
 2017-08-16 18:35:23 +01:00
Artur Gomes
270d41fabf Fix animation flickering caused on multiplayer because both users 
where using the script to update the color and the color was also being
replicated.
 2017-08-16 18:35:23 +01:00
Artur Gomes
ca37c5ee94 Fix desktop drawing mode creating more than one entity in an unusual way. 2017-08-16 18:35:22 +01:00
Artur Gomes
fb696bcbac Fix settings not being correctly restored when reloading tablet (when 
using desktop mode and right clicking over the tablet + refresh)
Remove postMessage in favour of emitWebEvent to communicate between the
tabs and the main script.
 2017-08-16 18:35:22 +01:00
Artur Gomes
b41ef08428 Fix tablet loosing focus (from the drawing hand) when switching hands. 2017-08-16 18:35:22 +01:00
Artur Gomes
482924266c Fix brush texture stretching at start. 
Add some code refactoring.
 2017-08-16 18:35:21 +01:00
Artur Gomes
07416951e5 Did clean up of the code and unused files. 2017-08-16 18:35:21 +01:00
Artur Gomes
83cdd1739d Add hue, saturation and brightness dynamic brushes. 
Add continuous drawing mode.
Add new brushes.
Remove some brushes.
Fix animation play distance for when painting in Desktop mode.
Fix Hue animation not starting from the chosen color (would always start
from red).
Fix multiple color polyline.
 2017-08-16 18:35:15 +01:00
Artur Gomes
03b70ed492 Do not test! 
Add color qvector to polyline entity to allow for multiple colors
through the line.
Add some new icons to the tabs of the app.
 2017-08-16 18:32:17 +01:00
Artur Gomes
108c02d05e Fix Desktop painting weird behaviour when painting (painting surface not 
always facing the user, this happened because of the change of the
paint surface direction on the last commit)

Fix brush tint (was just changing color in the last commit, now is
blending with the brush, using a kind of luminance blend effect)

Remove unecessary files.
 2017-08-16 18:28:59 +01:00
Artur Gomes
2d2efab5ed Fix paint surface always facing the HMD instead of rotating with the 
brush/hand;
 2017-08-16 18:28:58 +01:00
Artur Gomes
6e4ad996af Make savedSettings variable null after it is used, since it is probably 
a cause for a big memory leak.
 2017-08-16 18:28:58 +01:00
Artur Gomes
130ed238a5 Add restore tablet state after removing and putting back the headset. 
Update max line width;
Remove erase tab in favor of a single undo button in the tabs bar;
Add background color to brushes (using the same as the stroke color so
the user can preview the stroke with the color);
Add padding between custom color picker and preset colors table.
 2017-08-16 18:28:58 +01:00
Artur Gomes
c477b50272 Fix brush weird behaviour when starting with clean settings (brush would 
be black and filled instead of appliying the correct texture with color)
 2017-08-16 18:28:57 +01:00
Artur Gomes
ae078f4689 Add Avatar dominant hand as default hand the first time the user starts 
fingerpaint app or when the settings for the app are deleted.
Add some checks to fix an non critical error (when trying to reset the
left/right hands and they were not yet initialized)
 2017-08-16 18:28:57 +01:00
Artur Gomes
c65010669b Move line width widget from the palette tab to the brushes tab. 2017-08-16 18:28:57 +01:00
Artur Gomes
91a6f2c8d9 Add undo for created Entities in order to be able to remove entities 
when drawing in desktop mode.
Fix keyboard not showing.
Fix app button not being deactivated when switching to another app.
 2017-08-16 18:28:56 +01:00
Artur Gomes
c94774ec18 Add Keyboard when input fields get focus in the palette tab. 
Add feedback when user picks a color from the table or from the set
custom colors.
Fix hand hovering tablet when entering the app (stopped working after
restoring brush values).
 2017-08-16 18:28:56 +01:00
Artur Gomes
5c40a6810e Add drawing in Desktop mode. 
Remove dynamic rotation and translation brushes since the movement would
be unsynced after a while, resulting in a poor user experience.
Fix restoring last used settings taking to long, which caused the user
to see the values to change after the tablet application was open.
Fix using a different brush after restarting the app, if drawing before
the brush was reset.
 2017-08-16 18:28:55 +01:00
Artur Gomes
dffbc442be Add new Interface (more similar to the ui used on other apps) 
Fix brush on repeat mode (keeps the the aspect ratio of the texture)
 2017-08-16 18:28:55 +01:00
Artur Gomes
9d35cdcda3 Add save and restore last user settings; 
Fix multiple dynamic brushes not working in some cases (mixing axis
would not work neither for rotation nor for translation);
Fix tablet hovering detection only working for right hand;
 2017-08-16 18:28:55 +01:00
Artur Gomes
c8d475dff1 Add new dynamic and colored brushes. 
- Add dynamic hue brush;
- Add dynamic (animated) rotation and translation brush;
- Add colored brushes that already have the colors set (user can't
change it);
 2017-08-16 18:25:03 +01:00
Artur Gomes
b6ccce3904 Add new brushes (In progress) 2017-08-16 18:25:03 +01:00
Artur Gomes
69a532ea45 Fix application button not resetting state after exiting the app. 
Fix hovering tablet detection not working before unhovering the tablet.
Fix finger closing and opening while hovering the tablet and drawing.
 2017-08-16 18:25:02 +01:00
Artur Gomes
b6beb2033f Switch between stylus and fingerpaint mode when not painting and hand 
hovers the tablet.
Replace OK button in color picker with Add button (allows user to add custom
colors, and enables user to pick color just by pressing on top of the
color picker);
 2017-08-16 18:25:02 +01:00
Artur Gomes
9309f5137a Add tablet application to replicate the existing overlay interface that 
uses qml.
Add last user picked colors using the custom color picker so that users can easily reuse that color.
 2017-08-16 18:25:02 +01:00
Delanir
3d8951a5e0 Replace Paint Source Entity by Overlay 2017-08-16 18:25:01 +01:00
Delanir
066598fe3f Add Support to different UV modes in the finger paint script and deactivate "paint hand" 2017-08-16 18:25:01 +01:00
Delanir
faf57f068c Override hand animation for finger paint. 
Paint hand stays in a pointing position while in paint mode.
 2017-08-16 18:25:00 +01:00
Delanir
59719a13b6 Move fingerPaint folder into "scripts/system" and add fingerPaint script to DEFAULT_SCRIPTS_SEPARATE 2017-08-16 18:23:04 +01:00
Artur Gomes
f794079c62 Merge remote-tracking branch 'upstream/master' 2017-08-16 17:54:35 +01:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
Artur Gomes
07a16d658b Add sections to brushes tab. 
Add preview of special effects.
Fix polyline poinst disappearing (using 48 points for now as a quick
fix)
Fix dynamic saturation and brightness effect being to strong.
 2017-08-16 17:21:19 +01:00
Dante Ruiz
e48c14ec23 fixed tablet spawn position for oculus menu button 2017-08-16 09:08:55 -07:00
David Rowe
f1fe3be1f4 Merge branch 'master' into vr-edit-a 2017-08-17 00:13:08 +12:00
David Rowe
90c2036be7 Fix physics options labels being displayed when options pane opens 2017-08-17 00:08:09 +12:00
David Rowe
2287e16ea7 Set physics values per picklist items 2017-08-17 00:04:14 +12:00
David Rowe
2c2f866c82 Close picklist if click elsewhere 2017-08-16 21:33:34 +12:00
David Rowe
f9de451b30 Make picklist label display "CUSTOM" when slider value is changed 2017-08-16 21:11:10 +12:00
David Rowe
30e9b8ea45 Update picklist label when item is picked 2017-08-16 20:56:08 +12:00
David Rowe
bfaae7c220 Add picklist options 2017-08-16 20:22:24 +12:00
David Rowe
c705bb7fad Add picklist button 2017-08-16 14:55:44 +12:00
David Rowe
cca862b6ba Apply physics to just the root entity 2017-08-16 13:47:14 +12:00
David Rowe
b1938bafea Apply slider values to entities 2017-08-16 13:40:06 +12:00
Seth Alves
3082c357f9 cloning sort-of works... cloning an equipable doesn't 2017-08-15 17:54:04 -07:00
Seth Alves
4bfbab294d near-trigger works? 2017-08-15 14:53:58 -07:00
Seth Alves
03977334a0 near-trigger works? 2017-08-15 14:50:39 -07:00
Seth Alves
3b61e8518f near-trigger works? equip calls its entity methods now 2017-08-15 14:46:48 -07:00
Seth Alves
ddca25672f trying to get near-triggering working 2017-08-15 14:14:28 -07:00
vladest
273261ee57 Reworked WindowScriptingInterface browse method for async methods 2017-08-15 23:12:35 +02:00
vladest
8afdb27c1b Reworked WindowScriptingInterface save method for async methods 2017-08-15 22:55:44 +02:00
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Seth Alves
1d24523be9 equip drop gesture works 2017-08-15 13:09:17 -07:00
Seth Alves
e6ac07d43d equipping mostly works 2017-08-15 11:45:45 -07:00
Zach Fox
bddce9328b V1 2017-08-15 11:08:03 -07:00
Seth Alves
b2d7eefc97 equip highlight works now 2017-08-15 10:30:47 -07:00
Elisa Lupin-Jimenez
072f3dfb03 removed commented out code, removed blocks from default scripts 2017-08-15 10:25:14 -07:00
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
Seth Alves
774cb33303 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-15 09:17:52 -07:00
vladest
e9ed05c3ba Reimplement snapshot dir browser for async 2017-08-15 15:55:36 +02:00
David Rowe
cb53ad43e0 Tidying 2017-08-15 18:16:21 +12:00
David Rowe
8d01c02c29 Tidy clearing color swatches 2017-08-15 17:54:21 +12:00
David Rowe
8cf18c1b03 Tidy applying color swatches 2017-08-15 17:47:59 +12:00
David Rowe
3a1fc1f11c Remember Physics slider values 2017-08-15 17:44:42 +12:00
Seth Alves
b52a406ff1 trying to get equipping working 2017-08-14 18:25:57 -07:00
SamGondelman
1c27335193 a couple logging fixes 2017-08-14 17:34:32 -07:00
David Rowe
504857a1b8 Set up Physics sliders 2017-08-15 10:23:36 +12:00
David Rowe
441ba15708 Fix swatch colors 2017-08-14 17:23:02 +12:00
Seth Alves
13424eb792 kinematic-grab defaults to true 2017-08-13 17:42:08 -07:00
Seth Alves
9015d69c71 fix pop at start of far-grab 2017-08-13 17:21:55 -07:00
Seth Alves
f10dc7cbd5 allow far to near-grab transition 2017-08-13 16:54:37 -07:00
Seth Alves
58b199e9f9 far-grab sort-of works 2017-08-13 15:54:03 -07:00
Seth Alves
c2861d29d2 trying to get highlighting to work 2017-08-13 13:49:17 -07:00