Anthony J. Thibault
6e10a6fc60
Merge branch 'master' into feature/puck-attach
2017-06-22 11:32:59 -07:00
David Rowe
6ff8aed5e3
Merge branch 'master' into 21396
2017-06-22 23:54:15 +12:00
Brad Hefta-Gaub
4f632005b6
Merge pull request #10372 from rabelaiis/21300
...
Add entity script for balloon spawner and sample json entity with us…
2017-06-21 12:50:52 -07:00
Ryan Huffman
0e7ddfd29f
Disable silence/ban buttons in PAL if avatar is replicated
2017-06-21 09:49:16 -07:00
Sam Cake
1e168a5f6d
Remove extra logging
2017-06-21 00:23:24 -07:00
Sam Cake
a78018345b
Fixing the last scripts maybe
2017-06-21 00:15:29 -07:00
Sam Cake
189ad9c706
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-20 22:42:40 -07:00
samcake
d853a76376
Fixing the scripts and investigating the scripting
2017-06-20 17:23:44 -07:00
Anthony J. Thibault
b78e278102
adjusted print statements
2017-06-20 17:19:57 -07:00
Anthony J. Thibault
e84d0358cc
updated images
2017-06-20 17:18:35 -07:00
Anthony J. Thibault
287dc3e1b8
updated license and button name
2017-06-20 17:10:53 -07:00
Anthony J. Thibault
cd1beceb75
Added script that will attach an entity to a vive sensor.
2017-06-20 17:02:50 -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
Thijs Wenker
b22b45461f
Merge pull request #10754 from ctrlaltdavid/21405
...
Fix import of JSON with parent-child relationships
2017-06-20 20:48:01 +02: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
Brad Hefta-Gaub
cbded766b1
Merge pull request #10676 from NeetBhagat/21369
...
WL 21369 - Implement parts of the JS "console" object
2017-06-20 11:06:34 -07:00
Sam Cake
5b6f6ab84f
Trying to fix the getCOnfig from QML...
2017-06-20 00:25:51 -07:00
David Rowe
513e0cd232
Fix import of JSON with parent-child relationships
2017-06-20 16:44:25 +12:00
samcake
ba9dbbb4d4
Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me...
2017-06-19 17:34:50 -07: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
NeetBhagat
2909aa9ac8
Resolve comments of @zappoman.
...
-- Rename "asserts" to "assert"
-- Log printing methods will accept lists of objects or strings.
2017-06-17 01:00:32 +05:30
Chris Collins
f160034bf0
Merge pull request #10681 from zzmp/audio/parity
...
Revamp audio device selection
2017-06-16 10:31:55 -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
Burt Sloane
4f7a1a6e2e
got rid of tabs
2017-06-15 16:35:53 -07:00
Burt Sloane
7022c4009f
midi in and out
2017-06-15 15:18:06 -07:00
Zach Pomerantz
3093a73ce1
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-15 15:04:06 -04:00
Seth Alves
023ca85623
remove chat from default scripts
2017-06-15 09:27:43 -07:00
NeetBhagat
a6b1b17d45
Merge branch 'master' into 21369
2017-06-15 11:04:22 +05:30
David Rowe
a8501a7ac6
Remove old Leap Motion code
2017-06-15 14:45:40 +12:00
David Rowe
16bebdd409
Rename identifiers
2017-06-15 09:20:55 +12:00
David Rowe
e3b4e4aa20
Disable print statements
2017-06-14 15:37:36 +12:00
David Rowe
395d40f0f9
Fix script default to match C++ default
2017-06-14 12:21:19 +12:00
David Rowe
05f19d54f4
Add HMD roll control JavaScript API
2017-06-14 11:55:04 +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
NeetBhagat
9646eba873
Complete console.trace and added a testcases for all 13 functions.
2017-06-13 23:52:48 +05:30
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
NeetBhagat
b0e9c62c12
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-13 10:10:44 +05:30
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
Andrew Meadows
321e307c9f
Merge pull request #10609 from 1P-Cusack/21317
...
WL21317 helper functions for getting into avatar coordinate space
2017-06-12 11:18:29 -07:00
NeetBhagat
e6a5930365
Merge branch 'master' into 21369
2017-06-12 11:17:26 +05:30
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
Chris Howe
08d93173f0
Minor code feedback changes, moving test scripts to developer/tests.
2017-06-09 11:07:56 -04:00
NeetBhagat
c5d8268007
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-09 18:04:34 +05:30
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
03edb06ecb
change design to run chat separately so it can be removed if users prefer to not use it
2017-06-08 13:46:33 -07: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
NeetBhagat
ead0d42cf3
Merge branch 'master' into 21369
...
# Conflicts:
# libraries/gl/src/gl/OffscreenQmlSurface.cpp
# libraries/gl/src/gl/OffscreenQmlSurface.h
2017-06-07 15:47:19 +05:30
NeetBhagat
904e25c9e3
intial commit #21369 Working on clear method of console
2017-06-07 14:37:18 +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
Chris Howe
8166fec0e0
Minor changes based on code review feedback
...
See https://worklist.net/21317 ,
https://github.com/highfidelity/hifi/pull/10609 and
https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197
2017-06-06 12:11:57 -04: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
NeetBhagat
e79fd9c5cb
Merge branch 'master' into 21369
2017-06-06 15:26:40 +05:30
NeetBhagat
0f9cd5d0c7
intial commit hifi: #21369 Implement parts of the JS "console" object
2017-06-06 15:20:08 +05:30
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
Chris Howe
6edc6b2756
WL21317
...
New MyAvatar functions to support converting from avatar joint space to
world space and vice versa. Added some tests to support these functions.
2017-05-31 15:05:43 -04: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
samcake
882df7391b
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-26 16:47:49 -07: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
