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

2829 commits

Author SHA1 Message Date
Mike Moody
697830b80b Merge branch 'master' of git://github.com/highfidelity/hifi into 21374 2017-07-24 16:50:38 -07:00
Mike Moody
4c78fba2cc Removed line that caused colflict. 2017-07-24 16:50:33 -07:00
Chris Collins
8b978beb31 Merge pull request #11022 from 1P-Cusack/21463 
WL21463 - entitySelectionTool: use multiarg findRayIntersection inste…
 2017-07-24 15:13:21 -07:00
Mike Moody
7de164f1ab moved below a check that returns. 2017-07-24 15:06:45 -07:00
Zach Fox
223ed5b59a Hack to mod tablet orientation when clicking context overlay 2017-07-24 14:29:06 -07:00
Mike Moody
a4585b9400 Merge branch 'master' of git://github.com/highfidelity/hifi into 21374 2017-07-24 13:31:27 -07:00
milad
1ce1204a64 WORKLIST ISSUE # 21471 : FIX PARENT JOINT IN EDIT JS 
In entityPropeties.js
line #1079 says:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex'));

The problem should be fixed by changing it to:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex', 0));

createEmitNumberPropertyUpdateFunction() is parsing the value as a
float to a default decimal position of 4. Looks like it only accepts
integers. By adding in that 0 as a second argument, it should coerce the
value to one that will be recognized by the UI/backend.
 2017-07-24 10:06:44 -05:00
David Kelly
9c0026bf69 make sure context overlays are on after pal is dismissed 2017-07-21 08:40:12 -07:00
Leander Hasty
26cc8134eb WL21463 - entitySelectionTool: use multiarg findRayIntersection instead of editOverlay. 
We're seeing the ignoreRayIntersection flag not take effect before findRayIntersection calls.  This may be due to editOverlay and editOverlays becoming non-blocking in 1f7d2b2 .

This altered the flow in mousePressEvent significantly; the first block, intended to handle scale/clone only, started handling rotation (should have been second block) and sometimes selection (should have been third block).

Similarly, in the various rotate grabbers' onMove methods, the pickRay will no longer intersect anything other than rotateOverlayTarget; this avoids some awful behavior when scrubbing over the size and clone grabbers.

This also reverts unnecessary parts of the prior commits to keep the diff for this WL cleaner, and adds a few TODO comments to revisit about redundant statements and incorrect names.

In addition, we've noticed but not fixed herein:

* There is a minor edgecase near 0 and 180, where it's difficult to get within a degree or two of the poles occasionally.
* The scale/clone grabbers don't stay disappeared for rotation in some cases.  This doesn't impact usability anymore, but it'd be nice to determine why they come back when they hide briefly.
* The addGrabbers for yaw/pitch/roll could be deduplicated, and yaw has some multiselect "reposition" enable/disable logic that pitch and roll lack.

Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>
 2017-07-21 10:56:24 -04:00
David Kelly
5cd05da31e strict comparisons 2017-07-20 15:16:40 -07:00
SamGondelman
5de0970365 put back ignoredEntities functionality in teleport 2017-07-20 14:17:52 -07:00
SamGondelman
c7f0f03fce expanded RayPick JS API 2017-07-20 13:53:39 -07:00
Zach Fox
46d09a12fe Fix bug where overlay would get stuck 2017-07-20 13:26:43 -07:00
Zach Fox
e18fec140a Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2 2017-07-20 13:03:34 -07:00
David Kelly
f365ce8abd typo 2017-07-20 12:58:06 -07:00
SamGondelman
d156680bc8 ignore/include by ID, simplified caching logic 2017-07-20 12:15:06 -07:00
Zach Fox
f515a24568 UX improvements 2017-07-20 12:00:13 -07:00
David Kelly
b7be727b4c turn off ContextOverlay for pal, edit. Improve clicks too 2017-07-20 11:30:55 -07:00
Dante Ruiz
3805228b70 fixed grab the tablet in third person 2017-07-20 16:26:51 +01:00
SamGondelman
bf243d6025 lockEnd, editRenderState, and updated grab.js 2017-07-19 17:45:21 -07:00
Zach Fox
2dc3844116 Improve reliability of hand lasers; increase size of target 2017-07-19 17:07:57 -07:00
Zach Fox
c866bd814d Make clicks work right 2017-07-19 12:24:20 -07:00
SamGondelman
c6b3f69db0 teleport third eye laser on invalid hand pose 2017-07-19 11:51:31 -07:00
Zach Fox
1d26a268c1 Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay 2017-07-19 09:53:51 -07:00
Mike Moody
c56450b986 Moved function to a differnt location that handles both mouse and controller inputs. 2017-07-19 01:49:39 -07:00
Zach Fox
761d35d633 Getting there! 2017-07-18 17:10:23 -07:00
Zach Fox
82111a8f6a Timer for hand controller lasers 2017-07-18 16:40:18 -07:00
Zach Fox
8f6af3a1ab ContextOverlay 2017-07-18 16:28:24 -07:00
Zach Fox
265f978a06 It's working! 2017-07-18 15:57:26 -07:00
Dante Ruiz
b3ec306063 better version 2017-07-18 23:48:21 +01:00
Dante Ruiz
8cbe63f296 removed search laser in edit mode for 2d mode 2017-07-18 22:45:54 +01:00
Zach Fox
2b1a0921da Initial work on clickable overlays 2017-07-18 14:01:16 -07:00
Brad Hefta-Gaub
d94365cc44 Merge pull request #10979 from zfox23/hoverOverlay_lasers 
Create/Destroy Hover Overlays using hand controller lasers
 2017-07-18 08:44:48 -07:00
Zach Fox
67c8ddfd57 Merge in changes from laser PR 2017-07-17 17:09:40 -07:00
Dante Ruiz
f5abb4a090 trying new tablet position spwan 2017-07-17 23:18:16 +01:00
Zach Fox
a37f0137e7 Destroy overlays when trigger released 2017-07-17 14:29:43 -07:00
SamGondelman
197ba83b10 remove old_teleport 2017-07-17 13:46:23 -07:00
Zach Fox
974dff36b0 Make hover overlays work for hand controller lasers 2017-07-17 13:16:53 -07:00
SamGondelman
ae99be0350 added faceAvatar and centerEndY, working on updating teleport.js, style fixes 2017-07-17 13:07:42 -07:00
Andrew Meadows
9584035aa4 Merge pull request #10886 from 1P-Cusack/21420 
[Worklist #21420] Implement Create button disabled state (details below).
 2017-07-14 10:06:45 -07:00
Liv
62be0af32d string pass on Chat.js 2017-07-11 14:57:11 -07:00
jmo
a2b1b2e0f9 21356 - Reorder Edit.js 
Made changes to the 3 sub files for the properties tabs. Although
visually the exiting menu looked like it was in different sections,
structurally it was all just one run of item after item, with a fair
amount of div-itis. I added in fieldsets to provide true groups and
replaced much of the div-ities with aditional feidlsets as they are the
smeantic element to use here.
 2017-07-10 15:49:26 -06:00
Brad Hefta-Gaub
121cf76ee3 Merge pull request #10914 from sethalves/dont-think-during-mouse-move 
Dont think during mouse move
 2017-07-10 10:36:03 -07:00
LaShonda Hopper
3ee9d8b766 [Worklist #21420] Ran lint on edit script (details below). 
Prior to and after addressing Worklist Item #21420, it was observed that the
tool bar buttons popping in and out during load.  Taking a while to become visible.

Ran JSHint on the edit.js script to see if something stood out.

Testing with the various lint fixes the odd loading behavior wasn't observed locally any longer.
Pushing this up for testing.  This may be what @CainFoool was seeing regarding the create button
not appearing when testing a different PR as at times it took quite some time for the buttons
to load properly.

JSHint Issues Addressed:
* Resolved instance of \"Use the function form of \"use strict\"\"
** Moved use strict declaration to the file function level.
** This fixed various unknown or not defined errors.
* Resolved instances of \"\'const\' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).\"
** Switched const to var to avoid using keywords respected by only a subset of browsers.
* Resolved various multiply defined vars.
** Notable callouts being position var and properties var.
** This should fix issues where the same var was being used though the intent of use may have varied.
* Resolved instances of missing semi-colons

PreFix:  51 JSHint issues detected
PostFix: 0 JSHint issues detected.

Changes to be committed:
	modified:   scripts/system/edit.js
 2017-07-10 12:23:28 -04:00
Mike Moody
53f581c3d4 Fixed Icons not being selectable while not highlighted. 2017-07-08 02:52:27 -07:00
Andrew Meadows
57842ce5a5 Merge pull request #10878 from mnafees/21355 
CR for Job #21355 - Clean up and remove menu hotkeys
 2017-07-07 14:01:21 -07:00
Zach Fox
e222753aac Merge pull request #10911 from zfox23/PAL_adminFix2 
Set admin status even if QML can't find user in PAL
 2017-07-07 10:24:53 -07:00
Seth Alves
e4aa4823f9 Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move 2017-07-07 08:51:38 -07:00
Zach Fox
ea77557e38 Correctly close PAL when switching domains 2017-07-07 08:09:19 -07:00
Mike Moody
d9706452ac added ability to drag ParticleEffects and Light Entities around via Overlay Icon. 2017-07-06 23:32:22 -07:00
Mike Moody
be68d99bed added ability to drag ParticleEffects and Light Entities around via Overlay Icon. 2017-07-06 23:17:23 -07:00
Zach Fox
8945b75cda Merge pull request #10903 from zfox23/PAL_fixAdminColumn 
Ensure admins see PAL admin column
 2017-07-06 13:38:10 -07:00
LaShonda Hopper
85111131da [Worklist #21420] Resolves issue where domain changes didn't refresh the icon (details below). 
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.

Item Ticket Link: https://worklist.net/21420

Changes to be committed:
	modified:   interface/src/Application.cpp
	modified:   scripts/system/edit.js
 2017-07-06 15:27:15 -04:00
Zach Fox
a5c7324ec5 Ensure admins see PAL admin column 2017-07-06 12:15:44 -07:00
ZappoMan
c3c9df0cd0 restore old camera state 2017-07-06 10:41:46 -07:00
ZappoMan
10341af819 Merge branch 'master' of https://github.com/highfidelity/hifi into godview 2017-07-06 09:39:33 -07:00
LaShonda Hopper
9cae868492 [Worklist #21420] Implement Create button disabled state (details below). 
* The create button icon is set to its disabled resource when the user
enters a domain where they have _neither_ Rez or TempRez permissions.
** If the user has either of the Rez permission levels then the normal edit-i.svg
icon is used and the user is able to create items as before.

* When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG
is shown and creation menu is not shown.

* The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity.

Item Ticket Link: https://worklist.net/21420

Changes to be committed:
	new file:   interface/resources/icons/tablet-icons/edit-disabled.svg
	modified:   scripts/system/edit.js
 2017-07-06 10:53:46 -04:00
Seth Alves
55b7c2d767 avoid doing a lot of work during mouse-move event-handlers 2017-07-05 15:50:05 -07:00
Zach Fox
6f2e7f5b83 Tweak the Snapshot 'Share' button to make its purpose more clear 2017-07-05 12:39:15 -07:00
Seth Alves
d917878638 fix whitespace 2017-07-05 11:29:09 -07:00
Seth Alves
ab340530b8 don't do a lot of processing during the mouse-move event handler 2017-07-05 11:27:13 -07:00
Mohammed Nafees
eb354a4333 Cleanup menu shortcut keys 2017-07-05 14:50:48 +05:30
ZappoMan
d5acc8a6f9 Merge branch 'master' of https://github.com/highfidelity/hifi into godview 2017-07-03 12:21:29 -07:00
Brad Davis
31d2c9980e Merge pull request #10797 from ctrlaltdavid/21396 
Make Leap Motion a plugin
 2017-06-30 14:37:23 -07:00
Brad Davis
3f48c7aef5 Merge pull request #10855 from jherico/snapshot 
Fix snapshot connection errors
 2017-06-30 12:58:48 -07:00
utkarshgautamnyu
82597ac424 Update snapshot.js 2017-06-30 10:22:05 -07:00
Brad Davis
6e5eff9407 Fix snapshot connection errors 2017-06-29 10:01:48 -07:00
utkarshgautamnyu
e6be838e79 Update snapshot.js 2017-06-28 15:30:49 -07:00
Brad Davis
de88a34e97 Fix toolbar button activation states 2017-06-26 23:33:32 -07:00
Ryan Huffman
209a4f33b5 Merge pull request #10784 from huffman/feat/pal-replicated 
Disable silence + ban buttons for replicated users
 2017-06-26 12:50:23 -07:00
Brad Hefta-Gaub
a32f7b2395 Merge pull request #10743 from humbletim/21383 
CR 21383: Integrate attachments into doppleganger mirror
 2017-06-26 09:54:04 -07:00
David Rowe
bed0e8ef87 Merge branch 'master' into 21396 
# Conflicts:
#	interface/src/avatar/MySkeletonModel.cpp
 2017-06-26 12:07:25 +12:00
David Rowe
6543b74b52 Add beeps 2017-06-24 14:26:01 +12:00
Ryan Huffman
b56cfa56c7 Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated 2017-06-23 14:23:20 -07:00
David Rowe
9d0407cbdf Merge branch 'master' into 21396 2017-06-23 16:52:04 +12:00
Brad Hefta-Gaub
7668fbb7a0 Merge pull request #10755 from seefo/fb5278 
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
 2017-06-22 13:35:05 -07:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
Ryan Huffman
0e7ddfd29f Disable silence/ban buttons in PAL if avatar is replicated 2017-06-21 09:49:16 -07:00
Zach Pomerantz
8e1cf763e3 Merge pull request #10756 from zzmp/audio/input-level 
Update chrome for the audio input level meter
 2017-06-20 15:33:17 -07:00
Zach Pomerantz
c826858458 revamp tablet MicBar 2017-06-20 11:43:02 -07:00
seefo
00a3fc77a1 Fixed an issue where toolbar buttons duplicated themselves when reloading scripts 2017-06-20 11:18:22 -07:00
David Rowe
513e0cd232 Fix import of JSON with parent-child relationships 2017-06-20 16:44:25 +12:00
humbletim
89ebf4998f relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror 2017-06-19 10:28:56 -04:00
Stephen Birarda
39e8510ccb Merge pull request #10720 from seefo/fb5386 
Fixed a bug where you could not print polaroids if you took a gif
 2017-06-16 15:03:45 -07:00
seefo
a4d008eec9 Fixed a bug where you could not print polaroids if you took a gif 2017-06-16 08:57:27 -07:00
David Rowe
a8501a7ac6 Remove old Leap Motion code 2017-06-15 14:45:40 +12:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
e7da007acd only show Audio menu title when appropriate 2017-06-13 17:13:39 -04:00
Zach Pomerantz
20c0dac8e8 update QML with Audio.muted 2017-06-13 16:10:16 -04:00
Zach Pomerantz
337b6bca14 update JS with Audio.muted 2017-06-13 16:02:58 -04:00
Anthony Thibault
0d46b78bff Merge pull request #10541 from Menithal/21324 
Reworked Particle Editor UI
 2017-06-13 13:00:54 -07:00
Matti Lahtinen
35f83afd09 Removed unneccessary print 2017-06-13 20:43:14 +03:00
Menithal
c2c1e607c0 Formating 2017-06-13 20:31:41 +03:00
Menithal
395cc55fb2 Fixed formatting 2017-06-13 20:20:54 +03:00
Menithal
020760cc97 21324: Fixed accidental inccorect bracket 2017-06-13 20:16:56 +03:00
Menithal
00701eb5c7 Merge remote-tracking branch 'origin/master' into 21324 2017-06-13 19:08:37 +03:00
Menithal
0edb763dac 21324: Formatting and PR Feedback Changes 2017-06-13 19:06:47 +03:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Seth Alves
92fe8145be Merge pull request #10616 from vladest/create_button_sticked 
Set active button property isActive before Home menu redraw. Makes su…
 2017-06-11 13:43:41 -07:00
Seth Alves
eb049c8c6e Merge pull request #10624 from misslivirose/feat/add-primitive-shapes 
Add additional primitive shapes
 2017-06-09 19:02:54 -07:00
Clément Brisset
8e62bdea40 Merge pull request #10538 from ctrlaltdavid/21345 
Position tablet relative to hand
 2017-06-09 17:01:37 -07:00
David Rowe
fff8876b21 Code review 2017-06-10 09:33:45 +12:00
Seth Alves
759a87c27e Merge pull request #10647 from misslivirose/feat/move-chat-defaultscripts 
Move chat app to run with default scripts
 2017-06-08 20:26:34 -07:00
Liv Erickson
6657c4d997 Update chat.js 
remove stray semicolon
 2017-06-08 17:22:18 -07:00
Seth Alves
d87b858c0a Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue 
4869 entity resize issue
 2017-06-08 16:34:07 -07:00
Seth Alves
9fa74029c7 Merge pull request #10633 from mnafees/21299 
CR for Job #21299 - Save category on Marketplace when using back button
 2017-06-08 16:10:56 -07:00
Vladyslav Stelmakhovskyi
b7f8cc7f0b Fix intendantion 2017-06-08 22:58:40 +02:00
Liv
0e27ad767c Move chat app to be included as part of the default scripts 2017-06-08 13:07:01 -07:00
Vladyslav Stelmakhovskyi
dc2c79baab Merge with master 2017-06-08 21:10:30 +02:00
seefo
8d5b90afe7 Merge pull request #10600 from seefo/snapshot 
Added Polaroid Feature to Snapshot
 2017-06-07 17:05:29 -07:00
seefo
26bd6b67ae Final touches to polaroid feature 2017-06-07 16:52:16 -07:00
Mohammed Nafees
608becef7d Make the back button work again, uses the browser history directly now. 2017-06-07 15:52:06 +05:30
Andrew Meadows
f1dd5fbb14 Merge pull request #10613 from hyperlogic/bugfix/teleport-with-no-feet 
teleport.js should still function on avatars with no feet.
 2017-06-06 09:33:00 -07:00
Liv Erickson
6e5cb63d4f Add z-index fix for dropped down list 2017-06-06 09:15:41 -07:00
Anthony J. Thibault
90d241ca3c Account for avatar scale 2017-06-06 09:10:46 -07:00
seefo
b729707ce7 Removed old comments in SnapshotReview.js 2017-06-06 09:10:25 -07:00
Liv
e4963e076a Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 17:38:28 -07:00
Liv
9248715b21 Fixing z-index for Shape drop down 2017-06-05 17:37:32 -07:00
Seth Alves
dcbd279bd8 Merge pull request #10589 from vladest/create_in_landscape 
Implements landscape mode for tablet as rotation instead of stretching [DO NOT MERGE]
 2017-06-05 12:46:03 -07:00
Liv
6cecac36d5 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 12:23:23 -07:00
Andrew Meadows
85a1e1d691 Merge pull request #10608 from ctrlaltdavid/21379 
Fix icon for polylines in entities editor properties page
 2017-06-05 11:06:23 -07:00
NeetBhagat
2ce72d554b Resolve 2 issues: 
1) Entity can grow/shrink if it is grabbed by first right hand then left hand.
2) Stop unwanted grow/shrink of an entity.
 2017-06-05 14:13:51 +05:30
NeetBhagat
967c50ab93 Merge branch 'master' into 4869-Entity-resize-issue 2017-06-05 11:08:51 +05:30
Menithal
4842de8f07 Fixed issue with orientation 2017-06-04 00:03:14 +03:00
Vladyslav Stelmakhovskyi
4dbe646c17 Set ective button property isActive before Home menu redraw. Makes sure redraw will read proper value of isActive property 2017-06-03 15:40:25 +02:00
Anthony J. Thibault
7da73d0ff1 teleport.js should still function on avatars with no feet. 2017-06-02 18:01:40 -07:00
Clément Brisset
0a864a7ce9 Merge pull request #10570 from ctrlaltdavid/21376 
Move record script files to unpublishedScripts directory
 2017-06-02 16:25:56 -07:00
manapa01
8e1577d3d3 Merge pull request #10596 from manapa01/Snapshot-Sound 
Snapshot sound
 2017-06-02 16:07:05 -07:00
Patrick Manalich
0b2de18e8e Volume Change 2017-06-02 16:04:03 -07:00
Clément Brisset
5f91d2dcb7 Merge pull request #10569 from ctrlaltdavid/21312 
Improve positioning of assets when added / imported
 2017-06-02 15:45:18 -07:00
seefo
fa726f43a6 Fixed a bug in Polaroid canRez listener 2017-06-02 13:47:58 -07:00
seefo
7ade5b07a6 Final touches to Polaroids 2017-06-02 11:35:56 -07:00
David Rowe
58c4a2f12a Fix icon for polylines in entities editor properties page 2017-06-03 06:26:13 +12:00
seefo
655a411865 Cleaned up Polaroid code 2017-06-02 11:02:01 -07:00
Patrick Manalich
a705e722f1 Ctrl-S sound feature added 2017-06-02 10:35:57 -07:00
NeetBhagat
580c2548e9 Initial Commit : 
1) Resolve a bug when 2 different entity is grabbed in 2 hands. And move your left hand and entity of left hand grow/shrink when you move right/left hand.
2) Resolve right hand-left hand grow-shrink functionality
 2017-06-02 23:04:58 +05:30
ZappoMan
60048a231f god view controller 2017-06-02 10:26:54 -07:00
Patrick Manalich
0c71cf4bda Edit: Snapshot will make sound when initially clicked 2017-06-02 10:24:27 -07:00
Patrick Manalich
4e61db8263 Snapshot will make sound when initially clicked 2017-06-02 10:24:27 -07:00
Vladyslav Stelmakhovskyi
8068e7201d Fix position after rotation. May be fix rotation in HMD mode 2017-06-02 18:58:18 +02:00
David Kelly
70b6236890 Merge pull request #10605 from davidkelly/dk/analyticsForBubble 
Add UserActivity calls for bubble usage
 2017-06-02 09:48:15 -07:00
David Kelly
2feea16063 added comment 2017-06-02 09:47:03 -07:00
David Kelly
4dae77cd9d make sure we dont log the initial call to onBubbleToggled 2017-06-02 08:45:02 -07:00
Menithal
e76dfe4182 21324: Implementation of last feedback 
- If properties are expanded, the animation wrapper should now use the
values
- Decimal Values from filled in data now automatically get reduced the
1000th. The fields however will allow one to set smaller values and show
it, until the entity is selected again
- If particle is locked, keep fields locked.
 2017-06-02 06:59:23 +03:00
Brad Davis
9a80a81321 Merge pull request #10565 from vladest/fix_claraio_download_clones 
Make sure that there is only one connection created for web events, s…
 2017-06-01 20:42:50 -07:00
Menithal
bdcf9a0070 Merge remote-tracking branch 'upstream/master' into 21324 2017-06-02 06:39:55 +03:00
seefo
4e190434d1 Added polaroids to snapshots 2017-06-01 16:53:48 -07:00
David Kelly
37b738ff8b initial cut at some UserActivities for the bubble 2017-06-01 16:46:31 -07:00
Zach Fox
4e929f6d92 Merge pull request #10581 from zfox23/snapshot_fixForUrlShare 
Snapshots: Fix incorrect "for_url" share; ensure old snapshots don't get shared when they shouldn't
 2017-06-01 11:51:14 -07:00
Vladyslav Stelmakhovskyi
b0e4b752d5 Implements landscape mode for tablet as rotation instead of stretching 2017-06-01 19:07:17 +02:00
Vladyslav Stelmakhovskyi
30ab9771ef Merge branch 'master' into create_in_landscape 2017-06-01 16:06:15 +02:00
Zach Fox
53701371ab Fix some bugs :( 2017-05-31 16:43:21 -07:00
Liv
27d4edd2d0 Add circle and cone to entity shape list 2017-05-31 16:25:11 -07:00
Liv
f594fd6aa5 Merge branch 'feat/add-primitive-shapes' of https://github.com/misslivirose/hifi into feat/add-primitive-shapes 2017-05-31 15:14:04 -07:00
Zach Fox
70fdb4a168 Fix incorrectly sharing old snapshots 2017-05-31 14:47:07 -07:00
Zach Fox
fd92afff8c Ensure old snaps don't accidentally get shared for_url 2017-05-31 14:47:07 -07:00
David Rowe
f0c56dac3f Further files required for record script 2017-06-01 09:09:17 +12:00
David Kelly
e1700915f7 remove extra activity logger call 2017-05-31 13:28:57 -07:00
Seth Alves
e80704f3c9 Merge pull request #10578 from thoys/fix/grabableDynamic 
Edit.js: Fix hidden dynamic property while clone-able is active
 2017-05-31 12:54:36 -07:00
Thijs Wenker
5c5aaf3254 Fix hidden dynamic property whenever the item is clone-able / DRYing propertyUpdates 2017-05-31 20:18:42 +02:00
Zach Fox
0441d8c703 Add placeholder image when previous snapshot can't be loaded 2017-05-31 10:27:17 -07:00
David Rowe
d891c834ba Move record script files to unpublishedScripts directory 2017-05-31 09:06:11 +12:00
Vladyslav Stelmakhovskyi
0f80a8b7af On create button, switch Tablet to landscape mode 2017-05-30 16:51:04 +02:00
David Rowe
f5066aac51 Don't adjust position of imported entities of particular types 2017-05-30 15:53:03 +12:00
David Rowe
1e8698aee1 Snap imported JSON to grid 2017-05-30 15:23:18 +12:00
David Rowe
e02021bddf Tidying 2017-05-30 14:38:59 +12:00
David Rowe
b176dbe544 Refactoring 2017-05-30 14:35:59 +12:00
David Rowe
4c0296daaa Reposition imported JSON entities so that they start at import distance 2017-05-30 14:29:10 +12:00
David Rowe
18558dd795 Make JSON import distance 2m 2017-05-30 13:34:17 +12:00
David Rowe
31df18ff5b Fix snap-to-grid elevation 2017-05-29 18:43:49 +12:00
David Rowe
6c890d90ef Adjust position of model after its been resized 2017-05-29 17:48:01 +12:00
David Rowe
f0785cd39e Adjust creation position so that bounding box is creation distance away 2017-05-29 13:52:36 +12:00
David Rowe
9b679325ff Don't raise creation position if in independent or entity view mode 2017-05-29 13:35:54 +12:00
David Rowe
508dee4580 Increase entity creation distance to 2m 2017-05-29 13:35:18 +12:00
Vladyslav Stelmakhovskyi
bcee25acc7 Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated 2017-05-28 19:54:41 +02:00
Menithal
0e46c11a94 Fixed not being able to override slider sizes 2017-05-28 11:59:30 +03:00
David Rowe
367b3ec603 Handle nonvertical avatar orientation 2017-05-28 09:59:32 +12:00
Menithal
4e97f8ad9c Removed stray print 2017-05-27 16:21:25 +03:00
Menithal
26389be826 Minor tweaks to unselect behavior 2017-05-27 11:18:29 +03:00
Menithal
9201af96bd Added Changes from Alan's Feedback 2017-05-27 11:02:01 +03:00
Menithal
5500f8240d Merge remote-tracking branch 'upstream/master' into 21324 2017-05-27 09:55:56 +03:00
David Rowe
2a88f5cc79 Merge branch 'master' into 21345 2017-05-27 11:51:29 +12:00
Stephen Birarda
6c2758e4ea fix reference to pending transfer count for progress/stats 2017-05-26 14:37:24 -07:00
Liv
06a5467b50 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-05-26 09:10:50 -07:00
David Rowe
de4184e9fa Merge branch 'master' into 21345 2017-05-26 15:49:47 +12:00
Liv
d3e900e42f Adding first pass on cone shape 2017-05-25 12:54:49 -07:00
Liv
417d9ec80b Surface cylinder option for primitive shape to html 2017-05-25 11:04:25 -07:00
Seth Alves
de40604042 whitespace 2017-05-25 09:54:40 -07:00
Seth Alves
80e641b6d4 fix code that was using old raypickInfo.properties field 2017-05-25 09:47:02 -07:00
David Rowe
f1dca5019a Fix making the tablet horizontal 2017-05-25 11:48:28 +12:00
David Rowe
6452e92ac9 Hand controller data may not be valid 2017-05-25 11:28:26 +12:00
David Rowe
925cca97db Make the tablet horizontal 2017-05-25 09:16:17 +12:00
Menithal
a3fc87fb23 Removed straggling print 2017-05-24 21:27:47 +03:00
Menithal
3f9b306c7f Finalized UI changes doing final tests 2017-05-24 21:23:30 +03:00
Menithal
255540d0f8 Reverted a few files 2017-05-24 10:16:46 +03:00
Menithal
674f1f5f3a Trying to hunt down a specific issue 2017-05-24 09:53:01 +03:00
David Rowe
39654779fb Position tablet relative to hand 2017-05-24 13:35:00 +12:00
Menithal
9aa7e2e56d Adjusted values 2017-05-23 02:19:52 +03:00
Menithal
46acbe1aba Fixed typo 2017-05-22 11:27:32 +03:00