Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 02:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58840 commits 25 branches 0 tags 1.1 GiB
Commit graph

3852 commits

Author SHA1 Message Date
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
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
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
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
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
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -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
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Zach Fox
bddce9328b V1 2017-08-15 11:08:03 -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
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
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
David Rowe
71993972a2 Improve ungrouping behavior 2017-08-13 14:04:01 +12:00
David Rowe
bc00bcd02c For development testing, apply physics to the entity intersected 2017-08-12 16:59:28 +12:00
David Rowe
a5407398e7 Fix Group tool highlights not being cleared when switch to other tools 2017-08-12 16:21:55 +12:00
David Rowe
c281d5f94b Highlight and color single entities with Color tool 2017-08-12 15:46:53 +12:00
David Rowe
541402b559 Distinguish properly between intersected and root entities 2017-08-12 14:56:22 +12:00
Zach Fox
c38837c200 Remove fixmes 2017-08-11 16:21:39 -07:00
Zach Fox
a21ff75a49 Big progress! 2017-08-11 12:54:55 -07:00
Zach Fox
080c6da71a Get HFC balance from QmlCommerce API 2017-08-11 10:49:11 -07:00
Zach Fox
d2362e6329 addInventoryButton() under setting 2017-08-11 10:31:32 -07:00
Zach Fox
e1064938cd Add inventory; also fix some bugs 2017-08-11 10:31:32 -07:00
David Rowe
2bf0ea1dff Fix display artifact that occurs when overlay dimension is 0 2017-08-11 22:31:04 +12:00
David Rowe
a96d9ab85b Apply physics toggle button values 2017-08-11 22:11:34 +12:00
David Rowe
ee225e6a8d Implement toggle buttons 2017-08-11 18:23:20 +12:00
David Rowe
401a00441a Merge branch 'master' into vr-edit-a 2017-08-11 15:26:20 +12:00
David Rowe
c82a4d6d56 Layout mockup of Physics options 2017-08-11 13:15:07 +12:00
David Rowe
0b063926b6 Move image slider to Color options 2017-08-11 11:41:33 +12:00
Elisa Lupin-Jimenez
da5bb03187 Trying to add in a back button 2017-08-10 16:34:37 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
David Rowe
821f5de3e3 Further reduce number of Entites.getEntityProperties() calls 2017-08-11 10:20:36 +12:00
David Rowe
c34344161e Improve App object handling 2017-08-11 10:09:52 +12:00
David Rowe
37f57852da Set hand highlight sphere size from grab radius 2017-08-11 09:56:47 +12:00
David Rowe
badd57c165 Tidying 2017-08-11 09:26:05 +12:00
Elisa Lupin-Jimenez
28476960bb Moved Blocks to tablet app 2017-08-10 14:23:45 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -07:00
howard-stearns
ca13d58b0b blance and inventory stubs 2017-08-10 12:44:50 -07:00
David Rowe
6977c35b6e Reduce number of Entities.getEntityProperties() calls 2017-08-10 22:17:46 +12:00
David Rowe
6d61c188f8 Tighten up grabbing created entity 2017-08-10 21:22:11 +12:00
David Rowe
20c7e17fb6 Tidy up logging 2017-08-10 21:13:40 +12:00
David Rowe
b58cac1c56 Tidying 2017-08-10 17:28:43 +12:00
David Rowe
4b3f7d6614 Reorient Tools menu and slightly adjust Create palette position 2017-08-10 16:46:39 +12:00
David Rowe
a6af6e0bff Add extra color swatches for user tests 2017-08-10 16:27:19 +12:00
David Rowe
594d144210 Finesse sliders to produce values that fully got to 0.0 and 1.0 2017-08-10 15:45:05 +12:00
David Rowe
9442a667b4 Raise sliders on hover 2017-08-10 15:32:48 +12:00
David Rowe
cc64644946 Don't press sliders down when click on them 2017-08-10 15:02:19 +12:00
David Rowe
e1adb3a20e Add image slider (for H, S, V or similar values) 2017-08-10 12:44:30 +12:00
Elisa Lupin-Jimenez
d3c76c99c2 See all markets button working again 2017-08-09 17:28:05 -07:00
Elisa Lupin-Jimenez
69a13052ab commented out blocks injection 2017-08-09 17:23:08 -07:00
Zach Fox
2d256a62a9 Fix marketplaces message passing 2017-08-09 17:04:36 -07:00
Elisa Lupin-Jimenez
74c90d6323 minor typo 2017-08-09 16:08:47 -07:00
Elisa Lupin-Jimenez
a2e407f786 fixed merge conflicts in marketplacesInject.js 2017-08-09 15:59:20 -07:00
David Rowe
397527d3f3 Add image UI element 2017-08-10 10:23:13 +12:00
David Rowe
1aeaee8153 Rename slider to barSlider 2017-08-10 09:04:28 +12:00
Zach Fox
65f9b0052f Working buy button 2017-08-09 13:59:21 -07:00
Sam Gondelman
85c3f94976 Merge branch 'master' into sharks 2017-08-09 13:36:18 -07:00
Howard Stearns
cc634a2d1b Merge pull request #11148 from zfox23/commerce_singleSetting 
New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key
 2017-08-09 13:25:10 -07:00
SamGondelman
6157f4fa55 script fixes 2017-08-09 11:56:25 -07:00
howard-stearns
1cf81495ab basic commerce infrastructure 2017-08-09 11:50:52 -07:00
Zach Fox
33fa8c4f86 Fix bugs and also change to single setting 2017-08-09 11:44:09 -07:00
Zach Fox
61526256bc Remove personalized comment 2017-08-09 09:30:18 -07:00
LaShonda Hopper
48e327815d [Case 6491] Resolves arg order to centerToZero and centerToIntersection vectors. 
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-08-09 11:38:44 -04:00
David Rowe
1c2d3ced89 Add some further entities to the Create palette 2017-08-09 17:28:28 +12:00
David Rowe
c19ec58220 Halve hand highlight and grab sphere radius 2017-08-09 15:51:37 +12:00
David Rowe
938b09c1a4 Slider display per intersection value 2017-08-09 15:19:25 +12:00
David Rowe
3d4cec63cd Calculate slider value from laser intersection 2017-08-09 14:36:17 +12:00
Elisa Lupin-Jimenez
d599753771 Started blocks download catch, fixed a debug typo 2017-08-08 18:43:35 -07:00
Zach Fox
9d60d5153f Clarifying comment and turn setting off first 2017-08-08 18:00:17 -07:00
Zach Fox
4f85923517 Tons of fixes and improvements! 2017-08-08 17:58:41 -07:00
Zach Fox
b2c5a1f899 Fancy MutationObserver! 2017-08-08 17:12:06 -07:00
David Rowe
c79931106d Add basic element of slider 2017-08-09 12:06:35 +12:00
Elisa Lupin-Jimenez
efd25a5e70 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-08 16:55:10 -07:00
David Rowe
28f9f9e4d0 Add a "Physics" button and panel 2017-08-09 11:02:33 +12:00
Zach Fox
871a5ff1ab Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation 2017-08-08 15:53:22 -07:00
Zach Fox
69fc69cffb Comment fix and overlay click fix 2017-08-08 15:52:59 -07:00
Andrew Meadows
71ba6ba10a Merge pull request #10807 from jmo7/21356 
21356 - Reorder Edit.js
 2017-08-08 15:15:37 -07:00
Zach Fox
7d26d2d88b Switch and fix overlay clicks 2017-08-08 14:29:44 -07:00
David Rowe
22432671ca Fix newly created entity not being grabbed 2017-08-09 09:26:33 +12:00
Elisa Lupin-Jimenez
1102b27ba1 Fixed merge conflicts with master 2017-08-08 11:47:08 -07:00
SamGondelman
684001a756 workaround deadlock in editRenderState 2017-08-08 11:11:19 -07:00
David Rowe
046ce353fd Fix highlight overlay getting deleted 2017-08-08 21:56:01 +12:00
David Rowe
42284796a1 Remember swatch colors 2017-08-08 21:44:54 +12:00
David Rowe
0b8ea29193 Clear swatch with grip click 2017-08-08 20:37:41 +12:00
David Rowe
f88191b7b3 Merge branch 'master' into vr-edit-a 2017-08-08 16:43:20 +12:00
David Rowe
6621b43fae Make some swatches start with "no color"; color them when clicked 2017-08-08 16:34:45 +12:00
Zach Fox
1493a310af Beginning of stack stuff 2017-08-07 17:02:24 -07:00
Zach Fox
7e922cb2c2 Layout 2017-08-07 16:16:17 -07:00
Zach Fox
517128a939 More steps 2017-08-07 16:03:42 -07:00
Zach Fox
d7dd331685 Bugfixes 2017-08-07 14:39:31 -07:00
Zach Fox
7d4fd995f2 First steps 2017-08-07 14:29:47 -07:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Dante Ruiz
38db4a6f47 fixed create spinner not appearing 2017-08-07 20:03:55 +01:00
Chris Collins
4acccb6ace Merge pull request #11118 from cain-kilgore/chat-char-limit 
WL 21493 - Update the Chat.js to indicate when a message is too long
 2017-08-07 09:52:57 -07:00
Seth Alves
c570d483d8 Merge pull request #11113 from elisa-lj11/zip_drag 
Zip drag (needs review)
 2017-08-07 03:17:31 -07:00
David Rowe
1231491a72 Add color picker 2017-08-07 17:29:58 +12:00
Seth Alves
f898a05014 Merge pull request #11122 from ElderOrb/case6760 
fix for 6760: Create Mode turns to Portrait when Reopening tablet
 2017-08-06 19:02:47 -07:00
David Rowe
5d1732c5aa Merge branch 'master' into vr-edit-a 2017-08-05 20:45:12 +12:00
David Rowe
0f44e36128 Fix buttons sometimes staying pressed 2017-08-05 18:04:39 +12:00
David Rowe
4e87c13020 Tidy group buttons' enabling 2017-08-05 17:52:54 +12:00
David Rowe
bff3ad342d Tidy command and callback handling 2017-08-05 17:37:40 +12:00
David Rowe
e6456ca501 Tidy and fix options handling 2017-08-05 17:08:56 +12:00
SamGondelman
8b1c24e636 added setLockEndUUID, update handControllerGrab and grab 2017-08-04 18:26:11 -07:00
beholder
06c9378b03 fix for 6760: Create Mode turns to Portrait when Reopening tablet 2017-08-05 04:07:04 +03:00
anshuman64
22afb25d44 Capitalize "ENTER VR" 2017-08-04 17:19:26 -07:00
David Rowe
23fab65f27 Tidying 2017-08-05 12:08:36 +12:00
David Rowe
24f36c1ae5 Default current color and remember current color over tool/app toggles 2017-08-05 12:07:33 +12:00
Elisa Lupin-Jimenez
c2cb7573c5 Removed commented out blocks code 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
06ff766952 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
9d2be28a8a troubleshooting Blocks injection 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
ca6a323d54 Can drag blocks zip folder into hifi and upload the .obj 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
4570814145 Added Blocks to marketplace window 2017-08-04 16:56:30 -07:00
Elisa Lupin-Jimenez
a7dd6a5a41 Changed marketplaces message to be more discoverable 2017-08-04 16:56:30 -07:00
Cain Kilgore
f79a8b3cb5 Merge branch 'master' of https://github.com/highfidelity/hifi into chat-char-limit 2017-08-04 23:34:44 +01:00
Cain Kilgore
c8ebc299f5 Limited Max Length of the Chat Box to 256 - as this exceeds Message. max. 2017-08-04 23:25:26 +01:00
Brad Hefta-Gaub
8f98d0b7c8 Merge pull request #11114 from ElderOrb/case6677 
6677: Change "Desktop" App to Say "Exit VR"
 2017-08-04 13:09:47 -07:00
beholder
d05e1677c3 6677: Change "Desktop" App to Say "Exit VR" 2017-08-04 23:04:15 +03:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
David Rowe
ceba5769e0 Apply color to entities when click them 2017-08-04 18:07:42 +12:00
David Rowe
75b481adab Update icon color as current color is changed 2017-08-04 17:52:53 +12:00
David Rowe
d0143c2c19 Add color swatch buttons and "current color" circle 2017-08-04 17:33:00 +12:00
David Rowe
ed497afdc3 Add "Color" tool button, icon, and empty options panel 2017-08-04 14:08:57 +12:00