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

4009 commits

Author SHA1 Message Date
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
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
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
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
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
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
Seth Alves
327bc23b5c get ready for highlighting 2017-08-13 11:41:12 -07:00
David Rowe
71993972a2 Improve ungrouping behavior 2017-08-13 14:04:01 +12:00
Seth Alves
e7437d66ef if a raypick hits something that's very close, put it into the nearby-entities list 2017-08-12 17:49:02 -07:00
Seth Alves
ec93172676 far-search rays work, but nothing else about far-grab. 2017-08-12 17:27:48 -07:00
Seth Alves
505b564c62 sort plugins isReady calls by plugin priority. hook up pickrays in data-gathering phase 2017-08-12 13:14:00 -07:00
Seth Alves
92cb1c9bf2 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-12 12:40:18 -07:00
Seth Alves
9fb1835a26 grabbing overlays works, again 2017-08-12 12:38:36 -07:00
Seth Alves
7ae41064db tablet stylus works again 2017-08-12 11:19:39 -07: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
Seth Alves
b4a54b017a plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict 2017-08-11 12:15:41 -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
Seth Alves
128be5c2c1 Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1 2017-08-11 08:52:47 -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
Olivier Prat
1763ecd4c6 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-08-11 09:38:00 +02: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
Olivier Prat
a397138599 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-08-10 10:56:51 +02: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
Seth Alves
0d0f147056 port action-near-grab to dispatcher 2017-08-09 17:48:35 -07: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
Seth Alves
5e3b573d19 Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher 2017-08-09 14:08:07 -07:00
Seth Alves
2c8aac53cd Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher 2017-08-09 14:05:49 -07: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
Olivier Prat
392a99f038 Added some fill parameters. Still need to fix issues with blur changing with screen aspect ratio 2017-08-09 19:18:16 +02:00
Zach Fox
61526256bc Remove personalized comment 2017-08-09 09:30:18 -07:00
Olivier Prat
0f2c41b009 Added outline intensity 2017-08-09 18:27:39 +02:00
Olivier Prat
01a028cbb6 First alpha working version of outline 2017-08-09 18:03:52 +02: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
Menithal
982d4a451f Updated Protocol to add allowTranslation 
There still is a bug for the value no actually updating
 2017-08-08 23:47:37 +03: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
Olivier Prat
44ee7c4bf1 Renamed to OutlineEffect and working on debugging tool. Problems with outline framebuffer not complete 2017-08-08 18:41:57 +02: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
David Rowe
2237290b2e Add labels to buttons 2017-08-04 13:22:48 +12:00
anshuman64
83e50f894a Merge pull request #11106 from seefo/tracked-objects 
Added Vive pucks as an input channel and added new puck-attach script
 2017-08-03 17:03:45 -07:00
Howard Stearns
71ce5a6494 Merge pull request #11016 from highfidelity/context-overlays 
Context Overlays
 2017-08-03 16:28:14 -07:00
seefo
67b5921079 Changed puck-attach to make tracked entities collisionless 2017-08-03 16:01:12 -07:00
seefo
498ac5d0ab Updated version of puck-attach.js 2017-08-03 15:08:06 -07:00
David Rowe
4d8226ac02 Abstract out some common constants missing from the API 2017-08-04 09:23:40 +12:00
David Rowe
110355796c Add delete tool 2017-08-04 08:55:43 +12:00
David Rowe
e2dccc1420 Merge branch 'master' into vr-edit-a 2017-08-04 07:33:18 +12:00
Andrew Meadows
e465186511 Merge pull request #11048 from 1P-Cusack/21389 
WL21389 PR1:  Representation of collision shapes need updating (details below).
 2017-08-03 09:04:31 -07:00
David Kelly
4b7779f0f5 add flag to outline render flags, fix pal.js/edit.js interaction 2017-08-03 07:57:21 -07:00
David Rowe
e29bed7f07 Don't auto-grab if trigger fully pressed when laser starts intersecting 2017-08-03 20:26:21 +12:00
David Rowe
1ba658ee45 Implement grouping and ungrouping 2017-08-03 19:52:39 +12:00
Brad Hefta-Gaub
0f73496a44 Merge pull request #11055 from misslivirose/fix-chat-bubble-length 
Fix chat bubble length
 2017-08-02 23:29:09 -07:00
David Rowe
1e1cb3a02e Fix scale tool highlight color 2017-08-03 13:24:38 +12:00
David Rowe
1b866fdf9e Enable/disable grouping buttons depending on current group selection 2017-08-03 13:20:14 +12:00
David Rowe
c4eac1660c Fix app toggling and hand swapping issues 2017-08-03 11:46:05 +12:00
David Rowe
37c1060080 Fix button highlighting and clicking 2017-08-03 11:06:51 +12:00
VRCat\VRKitten
e4e4ead4af 'Untabified' files 2017-08-02 16:56:02 -06:00
seefo
82654c7cda Made requested changed to puck-attach.js 2017-08-02 15:28:26 -07:00
seefo
961f748d87 Fixed a potential bug with puck-attach parenting 2017-08-02 13:08:44 -07:00
seefo
620f1a65c0 New puck-attach script 2017-08-02 13:08:44 -07:00
seefo
106b0ad8bb Added Vive pucks as an input channel 2017-08-02 13:08:43 -07:00
vladest
638eeede43 Merge conflict 2017-08-02 20:07:06 +02:00
Elisa Lupin-Jimenez
c03c1c80e1 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-02 10:51:40 -07:00
Elisa Lupin-Jimenez
eb1fb1a1e1 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-02 08:28:55 -07:00
vladest
2d4396ac8e Merge branch 'master' into fix_toolbar_apps_switch 2017-08-02 16:34:49 +02:00
vladest
4330e31212 Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create 2017-08-02 16:32:09 +02:00
David Rowe
25bbdba987 Add Tool menu options panels, in particular grouping buttons 2017-08-02 22:17:02 +12:00
David Rowe
83f580c514 Generalize Tool menu UI 2017-08-02 19:07:11 +12:00
David Rowe
fb1284ad61 Clear grouping selection when choose another tool 2017-08-02 16:12:49 +12:00
David Rowe
53d755d8da Clear grouping selection when drop tool 2017-08-02 14:45:19 +12:00
David Rowe
26a14d0934 Swap button and tool icon colours to match grouping highlights 2017-08-02 14:41:42 +12:00
David Rowe
65e57a9262 Highlight grouping entities 2017-08-02 14:38:26 +12:00
Anthony J. Thibault
1b6feb63c8 Fix for crash when attempting to teleport while avatar was loading 
The fix had two parts.
  * Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe
  * Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.
 2017-08-01 18:40:43 -07:00
David Rowe
c686cef4a0 Collect grouping data 2017-08-02 13:15:53 +12:00
David Rowe
7e1584a43e Add grouping state 2017-08-02 12:27:02 +12:00
David Rowe
6d90b6d0fd Simplify trigger click usage 2017-08-02 11:49:10 +12:00
David Kelly
6ae516c46a Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 15:45:34 -07:00
Seth Alves
b9456ab7b6 Merge pull request #11081 from Menithal/21464 
Fixed Particle Editor Update event
 2017-08-01 15:11:33 -07:00
Seth Alves
184c3d855d Merge pull request #11061 from TurnMeUp-OG/21470 
Fix tablet focus issue when property menu is open and field is selected
 2017-08-01 15:10:26 -07:00
David Rowe
a94b2b367b Simplify grip click handling 2017-08-02 09:16:24 +12:00
David Rowe
12d911f290 Add "group" bool button and icon 2017-08-02 08:41:53 +12:00
humbletim
3a9b8c02a6 * disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" 
* restore access to "View > Mirror" from HMD mode
 2017-08-01 13:41:28 -04:00
David Rowe
f2cf2cab6e Generalize tool selected 2017-08-01 16:02:04 +12:00
David Rowe
ca7c747c96 Create entities at hand position rather than in front of avatar 2017-08-01 11:46:22 +12:00
David Rowe
59dc5ec3b8 Refactor tool buttons 2017-08-01 10:20:55 +12:00