Zach Fox
91f4e59f61
Misc fixes. Get started.
2017-08-29 12:33:44 -07:00
Dante Ruiz
4b592687b7
finished webEntityLaserInput, now working on cloning
2017-08-28 17:35:34 -07: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
Dante Ruiz
0eceb7b382
unviersial web3d vs laser
2017-08-25 17:40:30 -07:00
Zach Fox
a03f9592c1
Inventory to Purchases
2017-08-25 16:34:48 -07:00
Zach Fox
d19377d2d4
Saving
2017-08-25 15:56:30 -07: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
2017-08-25 11:45:37 -07:00
Zach Fox
453897b9e2
Huge cleanup!
2017-08-25 10:56:53 -07:00
Dante Ruiz
fa676aaadf
lasers on tablet working
2017-08-24 17:42:27 -07: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
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
Dante Ruiz
dbe8aa77d7
working on laser v tablet
2017-08-23 17:32:41 -07: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
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
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
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
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
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
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
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
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
Chris Collins
9c9bcd80b8
Merge pull request #11191 from SamGondelman/logging
...
Miscellaneous logging fixes
2017-08-16 15:46:32 -07: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
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
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
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
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
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
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
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
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
401a00441a
Merge branch 'master' into vr-edit-a
2017-08-11 15:26:20 +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
Elisa Lupin-Jimenez
28476960bb
Moved Blocks to tablet app
2017-08-10 14:23:45 -07:00
howard-stearns
ca13d58b0b
blance and inventory stubs
2017-08-10 12:44:50 -07:00
Seth Alves
0d0f147056
port action-near-grab to dispatcher
2017-08-09 17:48:35 -07: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
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
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
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
Elisa Lupin-Jimenez
efd25a5e70
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-08 16:55:10 -07: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
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
David Rowe
f88191b7b3
Merge branch 'master' into vr-edit-a
2017-08-08 16:43:20 +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
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
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
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
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
David Rowe
e2dccc1420
Merge branch 'master' into vr-edit-a
2017-08-04 07:33:18 +12:00
David Kelly
4b7779f0f5
add flag to outline render flags, fix pal.js/edit.js interaction
2017-08-03 07:57:21 -07: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
VRCat\VRKitten
e4e4ead4af
'Untabified' files
2017-08-02 16:56:02 -06: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
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 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
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 Kelly
bd7c4b3b26
Merge remote-tracking branch 'upstream/master' into context-overlays
2017-07-31 13:14:53 -07:00
Menithal
6020154867
Removed some whitespaces to trigger new build
2017-07-31 22:49:11 +03:00
Liv Erickson
ed9ea17917
remove semi-colon
2017-07-31 08:02:18 -07:00
Matti Lahtinen
5fab6c37a3
Removed stray variable test
2017-07-31 08:56:04 +03:00
Menithal
734330dc06
Fixed Particle Editor Update event
...
Particle Editor was agressively refreshing when ever a particle was be
ing up dated
Added a flag check to make sure the particle was always using the latest
version
2017-07-29 15:48:31 +03:00
Elisa Lupin-Jimenez
fcaebda04c
troubleshooting Blocks injection
2017-07-28 10:21:03 -07:00
Seth Alves
cfe3981bc2
cleanups
2017-07-27 18:22:17 -07:00
Seth Alves
fcf1dc839a
parenting near grab works
2017-07-27 17:52:23 -07:00
Seth Alves
f0c9f1d120
starting on controller-dispatcher experiment
2017-07-27 15:32:13 -07:00
jmo
003c483ec6
stray tabs changed to spaces, and long comment split to multiple lines
2017-07-27 15:21:58 -06:00
SamGondelman
e3288a9004
fix flicker, scissor warning, and handControllerGrab sphere size
2017-07-27 11:17:30 -07:00
Elisa Lupin-Jimenez
1c640cf37b
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-07-27 10:00:17 -07:00
David Rowe
52bb4a0f77
Merge branch 'master' into vr-edit-a
2017-07-27 20:37:46 +12:00
Chris Collins
ef67029837
Merge pull request #10912 from amvmoody/21374
...
WL 21374: Allow lights/particles to be dragged by icon
2017-07-26 22:07:36 -07:00
Sam Gondelman
fcaa39b245
Merge branch 'master' into sharks
2017-07-26 18:18:09 -07:00
SamGondelman
5e4a83dad9
defaultRenderStates, handControllerGrab.js, fix teleport.js a little
2017-07-26 17:58:39 -07:00
Zach Fox
8a7561d61b
IT'S WORKING SOB SOB SOB
2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357
WHYYYY DOESN'T THIS WORK
2017-07-26 16:14:35 -07:00
Elisa Lupin-Jimenez
9cfc4dc91b
Can drag blocks zip folder into hifi and upload the .obj
2017-07-26 15:21:39 -07:00
Zach Fox
1336a59b6c
Stupid bracket
2017-07-26 15:14:58 -07:00
Zach Fox
17c7e38fce
Bugfixes?
2017-07-26 15:02:52 -07:00
Zach Fox
3a05219c59
Closer still
2017-07-26 14:10:41 -07:00
Liv
256853f79b
syntax and clarification on magic number 2 as half height
2017-07-26 13:28:52 -07:00
Liv
5bd6dac66c
wrap text if longer than 1m text entity
2017-07-26 13:24:56 -07:00
Zach Fox
65c28ca821
Bugfixes
2017-07-26 13:17:51 -07:00
Zach Fox
9147bc21d0
Getting there.
2017-07-26 11:41:27 -07:00
utkarshgautamnyu
71ddf1e7c1
Removed Compound Collision type
2017-07-26 10:20:17 -07:00
scromie@turnmeupgames.com
33ff5917be
fix
2017-07-26 19:34:20 +03:00
Elisa Lupin-Jimenez
adda4f0598
Added Blocks to marketplace window
2017-07-25 18:36:39 -07:00
Zach Fox
9020607ccf
First pass
2017-07-25 17:54:46 -07:00
utkarshgautamnyu
65192aa620
added additional collision types to asset browser and new model dialog
2017-07-25 17:12:13 -07:00
Elisa Lupin-Jimenez
f128dce185
Changed marketplaces message to be more discoverable
2017-07-25 10:16:05 -07:00
Zach Fox
40038ce54b
Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays
2017-07-25 09:33:07 -07:00
SamGondelman
3c8b964cc9
replace setHandLasers with drawHUDLayer overlay property
2017-07-24 18:16:40 -07:00
David Rowe
450badf023
Merge branch 'master' into vr-edit-a
2017-07-25 12:21:49 +12:00
Mike Moody
036a16c0b3
readded line that caused colflict.
2017-07-24 16:51:23 -07:00
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
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
David Rowe
c57b51235e
Merge branch 'master' into vr-edit-a
...
# Conflicts:
# scripts/system/controllers/handControllerGrab.js
2017-07-19 18:56:04 +12: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
David Rowe
787815e939
Merge branch 'master' into vr-edit-a
2017-07-18 20:53:48 +12: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
David Rowe
283976fd87
Merge branch 'master' into vr-edit-a
2017-07-11 14:51:25 +12: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
David Rowe
a447e07ba5
Merge branch 'master' into vr-edit-a
2017-07-08 12:33:55 +12: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
David Rowe
732e3d224a
Merge branch 'master' into vr-edit-a
2017-07-06 15:46:31 +12: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
David Rowe
cadd4685ee
No haptic pulse in edit modes when hand enters near-grab distance
2017-07-04 15:59:04 +12:00
David Rowe
83a78aa407
No handControllerGrab.js lasers while in VR edit mode
2017-07-04 15:54:33 +12:00
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
David Rowe
a863e37eb5
Communicate VR edit enabled state to hand controller script
2017-06-30 12:11:06 +12: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
