Seth Alves
095cd03ee2
Merge pull request #11380 from ctrlaltdavid/fix-controller-typos
...
Fix typos in controller modules disabler
2017-09-16 11:13:15 -07:00
vladest
5b033e021a
Merge branch 'master' into modal_dialogs_async
2017-09-16 12:30:07 +02:00
David Rowe
e788f691c4
Merge branch 'master' into vr-edit-a
2017-09-16 15:59:08 +12:00
David Rowe
6c5a1c0460
Address laser and controller interactions with HUD overlays and tablet
2017-09-16 15:45:44 +12:00
David Rowe
18b71f0c0f
Fix typos in controller modules disabler
2017-09-16 15:34:53 +12:00
vladest
de4f34aacb
Add resizable flag. Use the flag for Create only
2017-09-15 21:49:38 +02:00
Seth Alves
0816a8af27
fix grab entity methods
2017-09-15 12:07:50 -07:00
Seth Alves
b67c571aaa
fix grab entity methods
2017-09-15 12:05:49 -07:00
Artur Gomes
e37b98e0f5
Fix polyline optimization.
...
Add more points to the polyline to check if the optimizations are
working.
2017-09-15 19:20:33 +01:00
Seth Alves
df80b7ecfa
stopNearTrigger, not end
2017-09-15 11:16:54 -07:00
Seth Alves
39e6605f6f
fix grab entity methods + jshint cleanups
2017-09-15 10:50:46 -07:00
Anthony J. Thibault
f534ee5ad9
laser offset fix
2017-09-14 16:37:45 -07:00
David Rowe
b0c951a2c4
Merge branch 'master' into vr-edit-a
2017-09-15 11:09:39 +12:00
Thijs Wenker
af4bc59307
clone local avatar entities
2017-09-14 23:31:51 +02:00
vladest
0bfa29d0d4
Merge branch 'master' into modal_dialogs_async
2017-09-14 20:21:29 +02:00
Anthony J. Thibault
7959988622
Merge branch 'master' into feature/ant-man
2017-09-14 10:37:45 -07:00
Anthony J. Thibault
7c725756f1
IPD Fixes for controllerDispatcher and controllerModules
2017-09-14 10:36:05 -07:00
David Rowe
299a8078e3
Revert handControllerGrab.js related changes
2017-09-14 17:08:26 +12:00
Anthony J. Thibault
9a9f4a0d24
Fix controllerModules with appropriate IPD scale changes
2017-09-13 18:23:54 -07:00
Anthony J. Thibault
8fb69a9867
Merge branch 'master' into feature/ant-man
2017-09-13 18:23:11 -07:00
Anthony J. Thibault
745d2ff395
Remove handControllerGrab.js, see controllerDispatcher.js instead.
2017-09-13 17:36:56 -07:00
David Rowe
a4ecb69ea6
Merge branch 'master' into vr-edit-a
2017-09-14 12:26:20 +12:00
druiz17
1b288ef860
make garbbing radius the same as master
2017-09-13 16:15:36 -07:00
Anthony J. Thibault
a505a16232
Don't rescale tablet, in desktop mode, when sensorToWorldScale changes.
2017-09-13 14:22:49 -07:00
Anthony J. Thibault
ae2d0e89b4
Fixes for desktop tablet
2017-09-13 14:18:00 -07:00
Anthony J. Thibault
de5f0ad987
WebTablet.js: calcSpawnInfo works more consistently.
2017-09-13 12:01:41 -07:00
Anthony J. Thibault
9a1fa9b2f2
Fix for stylus intersection with tablet and home button for scaled tablets
2017-09-13 09:52:20 -07:00
Artur Gomes
b65520e788
Merge remote-tracking branch 'upstream/master'
2017-09-13 12:32:17 +01:00
druiz17
b3ff5c86f7
fixed secondary triggers and chest lid
2017-09-12 14:43:06 -07:00
Artur Gomes
6e5eb1d918
Made the number of points per line 70 again for test purposes.
2017-09-12 20:03:32 +01:00
Dante Ruiz
d90f6320a9
Merge pull request #8 from sethalves/controller-dispatcher-1
...
Controller dispatcher 1
2017-09-12 10:54:10 -07:00
druiz17
b634292261
fixing some small issues
2017-09-12 10:53:04 -07:00
Seth Alves
e9918ca599
add profiling to controller-dispatcher
2017-09-12 10:52:52 -07:00
Seth Alves
a9aa6df93e
Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1
2017-09-12 10:44:29 -07:00
Seth Alves
315f874824
add profiling to controller-dispatcher
2017-09-12 10:44:09 -07:00
Seth Alves
2850029f26
add profiling to controller-dispatcher
2017-09-12 10:00:32 -07:00
Anthony J. Thibault
bb5e808051
Fix for some of tablet size issues, on switching domains.
2017-09-11 18:59:52 -07:00
druiz17
684aef23dc
Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1
2017-09-11 15:08:37 -07:00
druiz17
a46e41607c
fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown
2017-09-11 15:07:14 -07:00
Seth Alves
9c098f1a0c
Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1
2017-09-08 17:10:02 -07:00
druiz17
405d8c3afc
fixing cloning and laser
2017-09-08 17:07:27 -07:00
Seth Alves
a1ffc7abd0
distance from controller to object is sometimes decided by pickray
2017-09-08 17:04:09 -07:00
druiz17
42ef397b5e
fixed include path
2017-09-08 15:13:19 -07:00
Anthony J. Thibault
72e0c844e4
Merge branch 'master' into feature/ant-man
2017-09-08 14:08:26 -07:00
druiz17
e33012e522
laser on tablet update
2017-09-08 13:30:30 -07:00
druiz17
dbb91e5953
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-08 11:50:43 -07:00
druiz17
f0c12e50dd
some small bug fixes
2017-09-08 11:50:19 -07:00
Daniela
e453bf8d55
Refactoring.
2017-09-08 17:58:16 +01:00
Daniela
08688dc9ed
Refactoring.
2017-09-08 17:56:11 +01:00
Daniela
758f049f30
Correct offset for teleport pad.
2017-09-08 14:02:26 +01:00
Daniela
10e29d1cf0
Decrease offset for teleport pad. Add Bubble orientation and scale correction.
2017-09-08 12:45:29 +01:00
David Rowe
03ddf04140
Merge branch 'master' into vr-edit-a
2017-09-08 16:51:12 +12:00
Anthony J. Thibault
d0f9a20a01
Fix for tablet grabbing at small scales
2017-09-07 15:10:15 -07:00
druiz17
ef050a09f9
made requested changes and also allow entities/overlays to be grabbed by the grip button
2017-09-07 14:42:46 -07:00
Brad Hefta-Gaub
b316f366fc
Merge pull request #11198 from druiz17/oculus-tablet-position
...
fixed tablet spawn position for oculus menu button
2017-09-07 12:30:33 -07:00
Brad Hefta-Gaub
fce8715457
Merge pull request #11306 from ElderOrb/case7385
...
7385 - Collect Stats on "Exit VR" button
2017-09-07 10:18:58 -07:00
druiz17
636e906191
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-06 17:15:18 -07:00
druiz17
cc7a222374
fixing Hifi-Hand-Drop for equipEntity
2017-09-06 17:15:05 -07:00
David Rowe
83a8cb5fe0
Merge branch 'master' into vr-edit-a
2017-09-07 10:53:41 +12:00
druiz17
0d66bfca05
added far trigger
2017-09-06 14:58:04 -07:00
Daniela
0ac7e00612
Add Avatar resize compatible teleport.js pad scale
2017-09-06 19:45:03 +01:00
Dante Ruiz
a5553d5e1c
fixed text scale for notifications
2017-09-06 09:26:48 -07:00
Dante Ruiz
b4f7cb961a
Merge branch 'feature/ant-man' of github.com:hyperlogic/hifi into feature/ant-man
2017-09-06 08:38:08 -07:00
Dante Ruiz
15c853567d
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-06 08:34:28 -07:00
David Rowe
52bf8ac9a1
Merge branch 'master' into vr-edit-a
2017-09-06 13:33:33 +12:00
David Rowe
6838461b07
Display notification message when don't have rez permissions
2017-09-06 12:44:57 +12:00
Anthony J. Thibault
af8b147321
away.js - works better with sensor scale.
2017-09-05 17:34:35 -07:00
Dante Ruiz
a34dae4aad
adding scale to notifications
2017-09-05 17:12:40 -07:00
David Kelly
1fd30b1e0f
fix passphrase reset
2017-09-05 17:03:11 -07:00
Anthony J. Thibault
74f974c68f
Merge branch 'master' into feature/ant-man
2017-09-05 16:27:41 -07:00
Dante Ruiz
fec8482b69
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
2017-09-05 16:26:51 -07:00
Anthony J. Thibault
3d3bb2853a
Updated naturalDimensiosn for touch controller config
...
Totally untested! I don't have an oculus. I'm sure it will work tho. ;)
2017-09-05 15:39:35 -07:00
Anthony J. Thibault
23ff1b9ead
Fixes for scaling controller display
...
Adds MyAvatar.sensorToWorldScaleChanged signal.
2017-09-05 15:03:41 -07:00
David Kelly
4bdfe092cf
Regression in injection script
2017-09-05 12:28:31 -07:00
Dante Ruiz
cefa65de5e
some more small changes
2017-09-05 12:06:32 -07:00
Dante Ruiz
28694dcf8a
small change to contextOVerlays in farActionGrab
2017-09-05 11:46:06 -07:00
beholder
c0e7e5a8b2
7385 - Collect Stats on "Exit VR" button
2017-09-05 21:26:35 +03:00
David Rowe
44b365df6d
Merge branch 'master' into vr-edit-a
2017-09-03 10:57:32 +12:00
David Kelly
8723ff2df2
Merge pull request #11294 from zfox23/commerce_walletPassphraseModal
...
Commerce: Wallet Passphrase Input Modal
2017-09-01 17:46:09 -07:00
Dante Ruiz
3b357ad61e
finshed handControllerGrab refactoring
2017-09-01 17:07:26 -07:00
Seth Alves
8ccacf34f4
Merge pull request #11290 from Menithal/21484
...
WL21484 - Add an additional parameter for entity animations to "allow translation"
2017-09-01 15:34:07 -07:00
Zach Fox
3cf0df518f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal
2017-09-01 11:53:47 -07:00
Anthony J. Thibault
26e9e6e580
Fixes for stylus ranges and grab radii
2017-09-01 11:19:51 -07:00
Dante Ruiz
9bd368c0a9
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-01 08:27:09 -07:00
vladest
681fc529dc
Merge branch 'master' into modal_dialogs_async
2017-09-01 13:31:15 +02:00
druiz17
2948061904
code cleanup
2017-08-31 22:30:30 -07:00
David Rowe
269f1769be
Merge branch 'master' into vr-edit-a
2017-09-01 14:45:59 +12:00
Anthony J. Thibault
6618ba12e9
Merge branch 'master' into feature/ant-man
2017-08-31 18:10:39 -07:00
Dante Ruiz
7cf27c18d3
code cleanup and fix broken features
2017-08-31 18:06:55 -07:00
Anthony J. Thibault
a1b94fd9d2
Bug fixes for laser offset and avatar hold action
2017-08-31 17:26:00 -07:00
Zach Fox
fa25c434ca
Messages to marketplaces.js
2017-08-31 15:50:42 -07:00
Brad Davis
65b49a958f
Merge branch 'master' into 21484
2017-08-31 14:59:30 -07:00
Anthony J. Thibault
98c89cbe78
Fixes for stylus size and offset
2017-08-31 14:45:59 -07:00
Zach Fox
ce32d2d420
Checkout and Purchases
2017-08-31 14:12:05 -07:00
David Kelly
de2ce1cd5f
warning
2017-08-31 13:23:38 -07:00
Anthony J. Thibault
a0eb8152a6
fix for tablet spawn position
2017-08-31 13:15:46 -07:00
Anthony J. Thibault
1a01209020
Fixes for scaling tablet at high frame rates
2017-08-31 13:02:31 -07:00
druiz17
98b1fe6138
Merge pull request #11266 from ElderOrb/case6819
...
6819 - Create button not disabled
2017-08-31 12:36:08 -07:00
David Kelly
396f108182
forgot this the first time
2017-08-31 12:18:46 -07:00
Zach Fox
914a6bae00
Commerce: Wallet Passphrase Modal
2017-08-31 12:18:38 -07:00
vladest
1b5e6fd5f8
Merge branch 'master' into modal_dialogs_async
2017-08-31 20:39:48 +02:00
Anthony J. Thibault
9c6b8a6826
Fixes for scaling tablet
2017-08-31 11:28:05 -07:00
Zach Fox
164eeaae64
Fix the duplicated buy buttons for admins on Marketplace
2017-08-31 10:41:44 -07:00
Daniela
42be6434af
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-08-31 18:03:39 +01:00
David Rowe
8205b0d9d2
Merge branch 'master' into vr-edit-a
2017-08-31 15:45:15 +12:00
Anthony J. Thibault
6e6687c3a6
Change tablet dimensions as sensorToWorldScale changes
2017-08-30 18:21:25 -07:00
Dante Ruiz
47699d4439
fixed edit.js
2017-08-30 16:52:59 -07:00
David Kelly
988ee8c8d1
fix image provider, couple other things
2017-08-30 15:23:54 -07:00
Dante Ruiz
3960ec7d5a
finish main handControllerGrab refactoring
2017-08-30 15:20:03 -07:00
Zach Fox
f366743be7
Login; punctuationMode; new images
2017-08-30 11:07:03 -07:00
Zach Fox
1b48319a3f
Merge pull request #11267 from zfox23/commerce_zachsPunchlist1
...
Commerce: Zachs Punchlist 01
2017-08-30 10:10:56 -07:00
Anthony J. Thibault
9cd8b6991e
Merge branch 'master' into feature/ant-man
2017-08-30 08:58:55 -07:00
Dante Ruiz
ff134b338b
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-30 08:25:53 -07:00
howard-stearns
5b264a867a
fix wallet login (and share code with snapshot login)
2017-08-29 16:05:01 -07:00
Zach Fox
a9c99854f9
Haven't purchased anything yet UI
2017-08-29 15:39:07 -07:00
Dante Ruiz
49608f1253
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-29 15:19:16 -07:00
Dante Ruiz
ed52136fc5
finished equiping locked clone-able entities
2017-08-29 15:18:28 -07:00
Zach Fox
50241078ae
Buncha punchlist items checked off
2017-08-29 14:30:00 -07:00
beholder
180acbc188
6819 - Create button not disabled
2017-08-29 23:49:44 +03:00
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
Artur Gomes
e8fea16449
Fix for line points disappearing on second client (trying new value to
...
see if the line replicates correctly)
2017-08-17 17:19:13 +01:00
Artur Gomes
e59ff51cdd
Fixed two icons showing up when picking a color from the color table or
...
from the custom colors.
2017-08-17 16:25:33 +01:00
Artur Gomes
321742a865
Fix for points disappearing on second client (the one that's not
...
drawing) (trying to limit it a bit more to see if it results in no loss
at all)
2017-08-17 16:01:53 +01:00
Artur Gomes
2835130515
Fix dynamic hue not cycling through all the 360 hue values when drawing
...
the line due to the change in the max size of the line.
2017-08-17 15:53:13 +01:00
Artur Gomes
4f5bfcbc2b
Merge remote-tracking branch 'upstream/master'
2017-08-17 14:57:31 +01:00
Artur Gomes
be35734074
Fix tablet not reopening after removing headset and putting it back on.
2017-08-17 14:56:29 +01:00
Artur Gomes
5e6e675f62
Replace stars brush.
2017-08-17 09:45:54 +01: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
Artur Gomes
8ef8e974b6
Merge remote-tracking branch 'upstream/master'
2017-08-16 21:00:29 +01:00
Artur Gomes
030877457b
Fix tablet not opening.
...
Fix headers not showing correctly since changes in editProperties page.
2017-08-16 20:59:09 +01: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
Artur Gomes
d4255928c7
Add sections to brushes tab.
...
Add preview of special effects.
Fix polyline poinst disappearing (using 48 points for now as a quick
fix)
Fix dynamic saturation and brightness effect being to strong.
2017-08-16 18:35:23 +01:00
Artur Gomes
3ddddf4ad6
Fix animated hue not working even though the checkbox was checked after
...
restarting the interface.
2017-08-16 18:35:23 +01:00
Artur Gomes
270d41fabf
Fix animation flickering caused on multiplayer because both users
...
where using the script to update the color and the color was also being
replicated.
2017-08-16 18:35:23 +01:00
Artur Gomes
ca37c5ee94
Fix desktop drawing mode creating more than one entity in an unusual way.
2017-08-16 18:35:22 +01:00
Artur Gomes
fb696bcbac
Fix settings not being correctly restored when reloading tablet (when
...
using desktop mode and right clicking over the tablet + refresh)
Remove postMessage in favour of emitWebEvent to communicate between the
tabs and the main script.
2017-08-16 18:35:22 +01:00
Artur Gomes
b41ef08428
Fix tablet loosing focus (from the drawing hand) when switching hands.
2017-08-16 18:35:22 +01:00
Artur Gomes
482924266c
Fix brush texture stretching at start.
...
Add some code refactoring.
2017-08-16 18:35:21 +01:00
Artur Gomes
07416951e5
Did clean up of the code and unused files.
2017-08-16 18:35:21 +01:00
Artur Gomes
83cdd1739d
Add hue, saturation and brightness dynamic brushes.
...
Add continuous drawing mode.
Add new brushes.
Remove some brushes.
Fix animation play distance for when painting in Desktop mode.
Fix Hue animation not starting from the chosen color (would always start
from red).
Fix multiple color polyline.
2017-08-16 18:35:15 +01:00
Artur Gomes
03b70ed492
Do not test!
...
Add color qvector to polyline entity to allow for multiple colors
through the line.
Add some new icons to the tabs of the app.
2017-08-16 18:32:17 +01:00
Artur Gomes
108c02d05e
Fix Desktop painting weird behaviour when painting (painting surface not
...
always facing the user, this happened because of the change of the
paint surface direction on the last commit)
Fix brush tint (was just changing color in the last commit, now is
blending with the brush, using a kind of luminance blend effect)
Remove unecessary files.
2017-08-16 18:28:59 +01:00
Artur Gomes
2d2efab5ed
Fix paint surface always facing the HMD instead of rotating with the
...
brush/hand;
2017-08-16 18:28:58 +01:00
Artur Gomes
6e4ad996af
Make savedSettings variable null after it is used, since it is probably
...
a cause for a big memory leak.
2017-08-16 18:28:58 +01:00
Artur Gomes
130ed238a5
Add restore tablet state after removing and putting back the headset.
...
Update max line width;
Remove erase tab in favor of a single undo button in the tabs bar;
Add background color to brushes (using the same as the stroke color so
the user can preview the stroke with the color);
Add padding between custom color picker and preset colors table.
2017-08-16 18:28:58 +01:00
Artur Gomes
c477b50272
Fix brush weird behaviour when starting with clean settings (brush would
...
be black and filled instead of appliying the correct texture with color)
2017-08-16 18:28:57 +01:00
Artur Gomes
ae078f4689
Add Avatar dominant hand as default hand the first time the user starts
...
fingerpaint app or when the settings for the app are deleted.
Add some checks to fix an non critical error (when trying to reset the
left/right hands and they were not yet initialized)
2017-08-16 18:28:57 +01:00
Artur Gomes
c65010669b
Move line width widget from the palette tab to the brushes tab.
2017-08-16 18:28:57 +01:00
Artur Gomes
91a6f2c8d9
Add undo for created Entities in order to be able to remove entities
...
when drawing in desktop mode.
Fix keyboard not showing.
Fix app button not being deactivated when switching to another app.
2017-08-16 18:28:56 +01:00
Artur Gomes
c94774ec18
Add Keyboard when input fields get focus in the palette tab.
...
Add feedback when user picks a color from the table or from the set
custom colors.
Fix hand hovering tablet when entering the app (stopped working after
restoring brush values).
2017-08-16 18:28:56 +01:00
Artur Gomes
5c40a6810e
Add drawing in Desktop mode.
...
Remove dynamic rotation and translation brushes since the movement would
be unsynced after a while, resulting in a poor user experience.
Fix restoring last used settings taking to long, which caused the user
to see the values to change after the tablet application was open.
Fix using a different brush after restarting the app, if drawing before
the brush was reset.
2017-08-16 18:28:55 +01:00
Artur Gomes
dffbc442be
Add new Interface (more similar to the ui used on other apps)
...
Fix brush on repeat mode (keeps the the aspect ratio of the texture)
2017-08-16 18:28:55 +01:00
Artur Gomes
9d35cdcda3
Add save and restore last user settings;
...
Fix multiple dynamic brushes not working in some cases (mixing axis
would not work neither for rotation nor for translation);
Fix tablet hovering detection only working for right hand;
2017-08-16 18:28:55 +01:00
Artur Gomes
c8d475dff1
Add new dynamic and colored brushes.
...
- Add dynamic hue brush;
- Add dynamic (animated) rotation and translation brush;
- Add colored brushes that already have the colors set (user can't
change it);
2017-08-16 18:25:03 +01:00
Artur Gomes
b6ccce3904
Add new brushes (In progress)
2017-08-16 18:25:03 +01:00
Artur Gomes
69a532ea45
Fix application button not resetting state after exiting the app.
...
Fix hovering tablet detection not working before unhovering the tablet.
Fix finger closing and opening while hovering the tablet and drawing.
2017-08-16 18:25:02 +01:00
Artur Gomes
b6beb2033f
Switch between stylus and fingerpaint mode when not painting and hand
...
hovers the tablet.
Replace OK button in color picker with Add button (allows user to add custom
colors, and enables user to pick color just by pressing on top of the
color picker);
2017-08-16 18:25:02 +01:00
Artur Gomes
9309f5137a
Add tablet application to replicate the existing overlay interface that
...
uses qml.
Add last user picked colors using the custom color picker so that users can easily reuse that color.
2017-08-16 18:25:02 +01:00
Delanir
3d8951a5e0
Replace Paint Source Entity by Overlay
2017-08-16 18:25:01 +01:00
Delanir
066598fe3f
Add Support to different UV modes in the finger paint script and deactivate "paint hand"
2017-08-16 18:25:01 +01:00
Delanir
faf57f068c
Override hand animation for finger paint.
...
Paint hand stays in a pointing position while in paint mode.
2017-08-16 18:25:00 +01:00
Delanir
59719a13b6
Move fingerPaint folder into "scripts/system" and add fingerPaint script to DEFAULT_SCRIPTS_SEPARATE
2017-08-16 18:23:04 +01: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
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
Menithal
d5b7a4e36b
Doing some one-way binding for now.
...
- Oddly, there is still an issue with the webview occasionally not
appearing when a particle is selected, and appearing inthe wrong time.
Investigate.
2017-05-22 02:45:24 +03:00
Menithal
b8695e2509
Returned undescore, is smaller overally actually
2017-05-22 01:14:51 +03:00
Menithal
c6a22bcfa3
Majority of the Bindings complete
2017-05-21 20:49:07 +03:00
Menithal
4269fcf69c
Lots of Groundwork for UI Building
...
- Changed underscore to lodash for smaller file size / faster loading
- Removed dat.gui dependency, as we now have a completely custom
solution
- Started to use some more modern convensions which Qt Supports
2017-05-21 19:42:14 +03:00
Menithal
42bb5fa8e9
Part. Tab now only appears if selected
...
- Particle Tab now only appears if a Particle Entity is selected
2017-05-20 13:47:24 +03:00
Zach Fox
6765451cc8
Ensure snapshots without story_ids get uploaded
2017-05-19 10:36:31 -07:00
Zach Fox
8efac1e7f1
Prevent another GIF from being captured while one is processing
2017-05-18 14:30:08 -07:00
Thijs Wenker
2d6c6af37f
Merge pull request #10381 from Triplelexx/21297
...
DNM 21297 - Edit.js: Make the default particle system attractive
2017-05-17 15:55:40 +02:00
Triplelexx
c678fd67ed
change default particle texture to production
2017-05-17 14:52:11 +01:00
Brad Hefta-Gaub
b0d2de7bc0
Merge pull request #10427 from ctrlaltdavid/21334
...
Fix erroneous "did not start playing recording" messages
2017-05-16 20:54:27 -07:00
Brad Hefta-Gaub
b759a148f3
Merge pull request #10480 from ctrlaltdavid/21360
...
Add domain to record script user activity logging
2017-05-16 20:48:27 -07:00
Seth Alves
36f8d08b32
Merge pull request #10450 from hiflex/patch-1
...
Fix the Face Camera checkbox on the text entity properties tab.
2017-05-16 20:31:56 -07:00
David Rowe
04fcdfc4a2
Add domain to record script user activity logging
2017-05-17 12:23:53 +12:00
Triplelexx
5a742002e2
change default particle values
2017-05-16 23:39:38 +01:00
Zach Fox
aa0394c2ef
Fix case when user stories would be incorrectly deleted
2017-05-16 11:07:03 -07:00
David Rowe
0cd5fe35da
Lint
2017-05-16 15:54:55 +12:00
David Rowe
8ab261d1b0
Work around Script.clearTimeout() occasionally failing
2017-05-16 15:52:34 +12:00
David Rowe
4b175e98e9
Delete persistence entity if recording fails to load for manual playback
2017-05-16 15:30:30 +12:00
David Rowe
6d9bf2b33e
Typos
2017-05-16 13:58:42 +12:00
David Rowe
6bdd498ecf
Cancel autoplay when manually playing
2017-05-16 10:47:52 +12:00
David Rowe
5c5eb298f5
Better error message
2017-05-16 09:20:58 +12:00
David Rowe
8480a8e7d5
Merge branch 'master' into 21334
2017-05-16 08:52:31 +12:00
Philip Rosedale
6e82343b29
Merge pull request #10406 from amvmoody/21289
...
21289 - Edit: Add the ability to duplicate an object with hand controller
2017-05-13 20:43:52 -07:00
Zach Fox
d189f3f110
Fix the twitter mention
2017-05-12 12:39:10 -07:00
David Rowe
2bed69cfea
Display playback errors only for user that initiated playback
2017-05-12 15:18:25 +12:00
David Rowe
acd71caae2
Inform user when an AC error prevents a recording from playing
2017-05-12 14:53:38 +12:00
David Rowe
42aacb07ff
Remove check that recording has started playing
2017-05-12 14:14:24 +12:00
David Rowe
26672b475f
Clear timer value when timer stopped
2017-05-12 14:13:32 +12:00
hiflex
a4406906f3
Fix the Face Camera checkbox on the text entity properties tab.
...
The checkbox appeared unchecked even if the underlying property was true.
2017-05-11 20:12:10 -05:00
David Rowe
d7a4396daa
Improve log messages
2017-05-12 11:45:11 +12:00
David Rowe
f74e29e4b0
Code review
2017-05-12 11:43:12 +12:00
David Rowe
021c3dff32
Merge branch 'master' into 21334
2017-05-12 10:34:16 +12:00
David Kelly
52c288bfed
Desktop users of different height can shake hands
2017-05-11 14:20:42 -07:00
Seth Alves
9d63113e62
Merge pull request #10337 from vladest/audio-source-sync
...
Audio source sync
2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi
bd6ac7a39e
Code style fixes
2017-05-11 20:38:09 +02:00
David Kelly
0ea5bf7834
Merge pull request #10440 from davidkelly/dk/fixSettingsDialog
...
Fix for multiple settings dialogs
2017-05-11 08:11:16 -07:00
Vladyslav Stelmakhovskyi
f963233a7b
Merge branch 'master' into audio-source-sync
2017-05-11 15:25:24 +02:00
Thijs Wenker
0a3a2705af
Merge pull request #10426 from huffman/fix/tablet-invisible-by-default
...
Fix tablet showing up for a short period of time on launch
2017-05-11 15:03:52 +02:00
Mike Moody
89d93ee56d
Updated HMD grab Clone to work with all entity types.
2017-05-11 04:16:22 -07:00
Philip Rosedale
f9567d0330
Merge pull request #10182 from CraftsmanMG/master
...
hifi: #21216 - Resize entities with hand controllers while editing
2017-05-10 22:03:35 -07:00
David Kelly
4cc0aaf102
Fix for multiple settings dialogs
2017-05-10 18:31:57 -07:00
Triplelexx
7edda87330
change default particle to wispy smoke
2017-05-11 01:21:42 +01:00
Howard Stearns
3c652a52d8
Merge pull request #10431 from davidkelly/dk/messageLoggedInStatus
...
minor handshake script update
2017-05-10 13:54:21 -07:00
Vladyslav Stelmakhovskyi
2328da3c48
Merge branch 'master' into audio-source-sync
2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi
2d46f9d30e
Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum
2017-05-10 21:21:39 +02:00
Chris Collins
3b5b567578
Merge pull request #10409 from hyperlogic/bugfix/hand-lasers-in-third-person-view
...
Hand controller lasers work better in thirdPerson camera mode.
2017-05-10 10:35:35 -07:00
David Kelly
4536d3c484
cr feedback
2017-05-10 10:09:45 -07:00
David Kelly
a45dc673be
minor handshake script update
2017-05-09 17:33:33 -07:00
Zach Fox
8c2851b996
Merge pull request #10425 from zfox23/PAL_FixConnectionsDrift
...
Enable the PAL to update data about a single connection
2017-05-09 16:01:45 -07:00
David Rowe
c2d22a1246
Log stopping playing recording
2017-05-10 10:57:53 +12:00
David Rowe
771b76690c
Clear timeout that checks recording started when stop recording
2017-05-10 10:56:23 +12:00
David Rowe
a7cc582459
Don't multiply heartbeats
2017-05-10 10:32:43 +12:00
Ryan Huffman
51db0cef98
Fix tablet showing up for a short time on launch
2017-05-09 15:12:12 -07:00
Zach Fox
cf3c10c5b1
Fix the bugs, add the feature
2017-05-09 14:40:41 -07:00
David Kelly
5b33e0233c
fix typo in handshake script
2017-05-09 13:27:42 -07:00
Howard Stearns
713ddd5cef
Merge pull request #10408 from davidkelly/dk/updatePalForProfileUrl
...
Use new images in api/v1/users response json
2017-05-09 12:01:47 -07:00
David Kelly
d40984b475
Merge pull request #10384 from davidkelly/dk/minorHandshakeImprovement
...
Some minor handshake improvements
2017-05-09 09:14:31 -07:00
Anthony J. Thibault
b276970258
Hand controller lasers work better in thirdPerson camera mode.
2017-05-08 14:32:50 -07:00
David Kelly
7d0494dd56
use new images in api/v1/users response json
2017-05-08 12:15:03 -07:00
Mike Moody
dae652d3db
v1 HMD duplication overlay.
2017-05-08 11:25:24 -07:00
Vladyslav Stelmakhovskyi
d0111ac0bb
Merge branch 'master' into audio-source-sync
2017-05-08 20:09:34 +02:00
Mike Moody
03490c81da
v1 with bug, looking into.
2017-05-06 15:36:18 -07:00
Triplelexx
fae51c5c46
change default particle texture to production
2017-05-06 20:12:09 +01:00
Seth Alves
9e0845f17e
Merge pull request #10387 from vladest/tablet-performance
...
Decrease CPU usage in tabletUI periodical updates
2017-05-06 07:07:29 -07:00
Vladyslav Stelmakhovskyi
b2be22f0e0
Maerge broke the logic. Fixed now
2017-05-06 10:28:57 +02:00
Vladyslav Stelmakhovskyi
e395a51c60
Merge with master
2017-05-05 07:05:16 +02:00
Seth Alves
9ee6badc86
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 19:06:13 -07:00
Seth Alves
92966377fb
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 19:05:57 -07:00
Seth Alves
900fae30fd
avoid calling editEntity on overlays
2017-05-04 19:05:52 -07:00
Seth Alves
70efe4aa4f
avoid calling editEntity on overlays
2017-05-04 18:52:17 -07:00
Howard Stearns
d9540d7ece
Merge pull request #10390 from zfox23/newSnapshotReview_Improvements3
...
Lots of Snapshot app improvements, Round Three
2017-05-04 17:05:37 -07:00
Seth Alves
960bab6e4e
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 16:42:57 -07:00
David Kelly
a4125c1507
logic tweak
2017-05-04 16:33:50 -07:00
Howard Stearns
fc9e9e1d28
Merge pull request #10374 from howard-stearns/notification-circumstances
...
Notification circumstances
2017-05-04 16:18:58 -07:00
Zach Fox
6a33ef49c2
New language for unshareable snaps
2017-05-04 16:17:33 -07:00
Zach Fox
2ad3346697
Are there bugs?
2017-05-04 16:05:20 -07:00
Zach Fox
946c5e7662
Almost finished with not-logged-in and not-shareable
2017-05-04 15:24:51 -07:00
howard-stearns
25ab8e7e94
debugging on call, but mostly, specify json headers, etc.
2017-05-04 14:45:58 -07:00
Anthony Thibault
7006fa6da4
Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update
...
grab is driven by timer rather than update, load tablet model with high priority
2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi
ba5a371da1
Decrease CPU usage in tabletUI periodical updates
2017-05-04 22:54:41 +02:00
David Kelly
5b56956637
Some minor handshake improvements
2017-05-04 12:38:17 -07:00
Triplelexx
0d21d7108e
change default particle properties
2017-05-04 19:27:43 +01:00
Zach Fox
b08d23924a
Keep hover status of both images in sync
2017-05-04 11:00:13 -07:00
Zach Fox
b01bff061e
Hover lock when uploading
2017-05-04 10:06:52 -07:00
Zach Fox
c7f5115e26
Move help text to above buttons
2017-05-04 10:06:52 -07:00
Seth Alves
9ab2a61a4b
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 10:04:18 -07:00
howard-stearns
a7e3fad23e
Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances
2017-05-04 10:03:57 -07:00
Seth Alves
ecd690e5e9
Merge pull request #10348 from ctrlaltdavid/21311
...
Don't sort recordings
2017-05-04 09:59:12 -07:00
Seth Alves
006c5a3c20
Merge pull request #10347 from ctrlaltdavid/21310
...
Don't warn that recording didn't start playing if you stop it
2017-05-04 09:58:25 -07:00
Seth Alves
ed09dcbdc9
don't call editEntity on overlays
2017-05-03 21:32:06 -07:00
howard-stearns
3e57e80465
use new request module.
2017-05-03 16:39:34 -07:00
howard-stearns
aa74dda9f3
cleanup
2017-05-03 16:29:37 -07:00
howard-stearns
a007c1fe4b
Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances
2017-05-03 13:46:00 -07:00
howard-stearns
42887d41c4
debugging
2017-05-03 13:45:48 -07:00
Howard Stearns
fb8cfd720e
Merge pull request #10362 from cfresquet/requestModuleRefactor
...
Request module refactor
2017-05-03 11:57:23 -07:00
Zach Fox
ae72b9b73d
Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2
...
Lots of Snapshot app improvements, Round Two
2017-05-03 11:44:40 -07:00
howard-stearns
33356b94d1
Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances
2017-05-03 11:43:18 -07:00
Zach Fox
c82a07016d
New Preparing text; Better disabled behavior
2017-05-03 11:30:44 -07:00
Zach Fox
09488c4987
Disabled state for share butotns
2017-05-03 11:02:44 -07:00
CFresquet
afa72210e0
requested tweaks to makeUserConnection.js
2017-05-03 10:28:44 -07:00
CFresquet
28b166c51f
further request fiddling
2017-05-03 07:51:49 -07:00
CFresquet
b54ea63af7
incremental request module fixes
2017-05-03 07:35:30 -07:00
Zach Fox
ff3a76f716
No magic numbers!
2017-05-02 18:23:15 -07:00
Zach Fox
653dda7000
Fix pausing after snapshot in HMD
2017-05-02 17:21:50 -07:00
Zach Fox
aa46534b60
Whoops.
2017-05-02 17:10:57 -07:00
Zach Fox
964e79ce14
It's working!
2017-05-02 16:58:33 -07:00
Zach Fox
68fa8e06ef
Super amped about this. Only need to add disabled state?
2017-05-02 16:38:16 -07:00
Seth Alves
0cd0e46ca5
make clone work again
2017-05-02 16:20:59 -07:00
howard-stearns
6f52bb4b37
Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances
2017-05-02 16:16:27 -07:00
Zach Fox
5d38cd543d
Yet another checkpoint
2017-05-02 16:06:13 -07:00
Zach Fox
7817c72ea1
Another checkpoint
2017-05-02 15:58:43 -07:00
Seth Alves
f1170dc17d
AvatarList not AvatarManager
2017-05-02 15:48:12 -07:00
Seth Alves
eed4da3570
some cleanups, delete far-grabs during transition to near-grab rather than set ttl to zero
2017-05-02 15:36:38 -07:00
Zach Fox
0beceae59b
Checkpoint
2017-05-02 15:19:20 -07:00
Zach Fox
1067d1e0f6
Don't let user blast in certain cases
2017-05-02 14:43:16 -07:00
Zach Fox
d8095c5ea5
New setup instructions; new 'blank snapshot' text
2017-05-02 14:20:27 -07:00
Zach Fox
d1dff7606c
Lint cleanup; Immediate share button visibility;
2017-05-02 14:10:24 -07:00
Zach Fox
5302110e7b
Merge pull request #10346 from zfox23/newSnapshotReview_Improvements
...
Lots of Snapshot app improvements, Round One
2017-05-02 13:00:08 -07:00
Vladyslav Stelmakhovskyi
e789b69a8e
Merge branch 'master' into audio-source-sync
2017-05-02 20:57:01 +02:00
howard-stearns
9b117165bd
expire our announcements when we leave, and turn off messagesWaiting when
...
everything is expired.
2017-05-02 11:44:16 -07:00
Howard Stearns
3a36feacad
On touch, grip is a trigger, not a button, so it can have lots of callbacks with slightly different values that we ignore. In that case, don't update hand/joint.
2017-05-02 11:29:51 -07:00
Zach Fox
c9e0679b70
Subscribe to changes to snapshotsLocation setter for better UX
2017-05-02 10:55:57 -07:00
Zach Fox
f453df36cf
Prevent cursor appearance in snaps
2017-05-02 10:11:54 -07:00
Zach Fox
a754c4d6cc
Still image on top
2017-05-02 10:11:54 -07:00
Zach Fox
0ead9e5a24
Visual fixes; Select only 1 image at a time
2017-05-02 10:11:53 -07:00
Zach Fox
d295b5a69d
ShareBarHeight-= 5px; Remove test call
2017-05-02 10:11:53 -07:00
Zach Fox
5b168301bc
Update some typefaces; Add margins to pics
2017-05-02 10:11:53 -07:00
Zach Fox
ac86c13477
Fix sharing; disable HiFi buttons independently
2017-05-02 10:11:53 -07:00
Seth Alves
dc569051f9
Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update
2017-05-02 09:50:13 -07:00
David Rowe
cb8f75394d
Don't sort recordings
2017-05-02 12:08:39 +12:00
David Rowe
dd739d73a0
Don't warn that recording didn't start playing if you stop it
2017-05-02 12:01:55 +12:00
CFresquet
55fdf35c4a
merge of Request module
2017-05-01 13:02:18 -07:00
Howard Stearns
9fab66b66a
Merge pull request #10328 from howard-stearns/tablet-discovery-events
...
fix announcement suggestions
2017-05-01 11:28:45 -07:00
Howard Stearns
0146d7550e
Merge pull request #10333 from howard-stearns/handshake-cleanup-2
...
Handshake cleanup
2017-05-01 11:15:54 -07:00
Clément Brisset
5c46d1e3ff
Merge pull request #10316 from sethalves/fix-stray-edit-laser
...
fix -- show hand lasers when edit is enabled, but not if there are not hand-controllers
2017-05-01 10:48:59 -07:00
Vladyslav Stelmakhovskyi
dde363ef3d
Merge branch 'master' into audio-source-sync
2017-05-01 18:42:53 +02:00
Vladyslav Stelmakhovskyi
28447cde0b
Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items
2017-05-01 18:41:38 +02:00
CFresquet
72a6403eb0
Merge remote-tracking branch 'upstream/master'
2017-05-01 08:11:26 -07:00
CFresquet
28aaa545d8
Created RequestModule
2017-05-01 08:07:16 -07:00
Howard Stearns
f980d6f435
Merge branch 'master' of https://github.com/highfidelity/hifi into handshake-cleanup-2
2017-04-30 15:51:12 -07:00
Howard Stearns
e740fb67f4
convert foreign handString to jointIndex once, not often
2017-04-30 15:50:30 -07:00
Howard Stearns
bc9049cb42
remove extra joint search
2017-04-30 14:19:33 -07:00
Howard Stearns
292065a918
It may be possible to switch hands without endHandshake, and thus not reset currentHandJointIndex on updateTrigger. That was filled in later by startHanshake ONLY if there was already waiting avatars so that we didn't have wait. As a result, our distance measure would be from hips instead of hand. This changes it to always compute currentHandJointIndex on updateTriggers (and not elsewhere).
2017-04-30 13:32:21 -07:00
Howard Stearns
eca7292651
check your own location data on failure, and notify if it is wrong
2017-04-30 09:44:34 -07:00
Howard Stearns
92481bf475
standardize data init/clear
2017-04-30 08:04:46 -07:00
Vladyslav Stelmakhovskyi
3fe8675b0c
Sync Tablet Audio and Desktop Audio menus
2017-04-30 12:39:36 +02:00
Howard Stearns
d41a911fd2
setupCandidate
2017-04-29 19:39:50 -07:00
Howard Stearns
18dbe3568c
clarify names, particularly hand vs handString
2017-04-29 18:25:33 -07:00
Howard Stearns
9c83e21e17
fix that
2017-04-29 15:50:04 -07:00
Howard Stearns
d7a2e571a7
simplify animation load and code
2017-04-29 14:39:35 -07:00
Howard Stearns
274cc5b555
unique message for exceeding poll limit
2017-04-29 14:29:43 -07:00
Howard Stearns
84ac863a32
lint
2017-04-29 13:58:20 -07:00
Howard Stearns
b6ae0a5bde
add nextTick, and cleanup
2017-04-28 20:06:13 -07:00
howard-stearns
f9debf1388
checkpoint
2017-04-28 16:53:08 -07:00
David Kelly
168cfa9b5d
upping polling time plus min grip
2017-04-28 16:39:58 -07:00
David Kelly
a99c242646
increase minimum grip pressure to initiate handshake
2017-04-28 15:52:32 -07:00
Vladyslav Stelmakhovskyi
368334e07e
Merge branch 'master' into audio-source-sync
2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi
d18ac6dd49
Reimplemented Tablet Audio screen using C++ model
2017-04-28 23:02:28 +02:00
Seth Alves
4b0e7ceef5
show hand lasers when edit is enabled, but not if there are not hand-controllers
2017-04-28 10:24:04 -07:00
Howard Stearns
a2721d21ef
Merge pull request #10278 from zfox23/newSnapshotReview
...
New Snapshot Review Dialog
2017-04-28 07:25:47 -07:00
Zach Fox
3f146fca9d
Fix announcement audience; Fix disabled buttons
2017-04-27 15:36:59 -07:00
Seth Alves
2c2f51689a
Merge pull request #10300 from vladest/tablet-edit-tocreate
...
Renamed EDIT to CREATE
2017-04-27 15:31:14 -07:00
Zach Fox
4152e44d2c
Click anywhere on the image except the bottom to toggle share buttons
2017-04-27 14:01:08 -07:00
Zach Fox
3ce81844da
Snapshot JS interface for better Settings handling
2017-04-27 14:01:08 -07:00
Zach Fox
794751abfa
Nested objects aren't REAL!
2017-04-27 14:01:08 -07:00
Zach Fox
832e16ef86
Visual tweaks; fix active share buttons; comment out tests
2017-04-27 14:01:07 -07:00
Zach Fox
7297355183
Open ShareBar on P0 by default
2017-04-27 14:01:07 -07:00
Zach Fox
0ac660d4ab
Cleanup
2017-04-27 14:01:07 -07:00
Zach Fox
b6601feb1d
It's 5 already?
2017-04-27 14:01:07 -07:00
Zach Fox
a24a48843f
Checkpoint
2017-04-27 14:01:07 -07:00
Zach Fox
b26f31704b
Fix button state; use request()
2017-04-27 14:01:07 -07:00
Zach Fox
6711e8cbc2
Remove duplicate setting; Make settings page open; button state
2017-04-27 14:01:07 -07:00
Zach Fox
3221214283
New Snap FTUE flow
2017-04-27 14:01:07 -07:00
Zach Fox
92187e2424
Making progress towards file chooser dialog
2017-04-27 14:01:07 -07:00
Zach Fox
8c9cd0fad0
Custom social buttons; better testing functionality
2017-04-27 14:01:07 -07:00
Zach Fox
d461723012
Thanks to Jess, slightly different Tweet language
2017-04-27 14:01:07 -07:00
Zach Fox
d7348aabc8
Quick comment updates
2017-04-27 14:01:07 -07:00
Zach Fox
ef2e5f78ff
Startings of needsLogin support
2017-04-27 14:01:07 -07:00
Zach Fox
e1789996fb
Add announcements support
2017-04-27 14:01:06 -07:00
Zach Fox
f838e87f48
Pretty stable...
2017-04-27 14:01:06 -07:00
Zach Fox
7c5de1e60b
Getting closer
2017-04-27 14:01:06 -07:00
Zach Fox
fad470eeea
Checkpoint (this is complicated)
2017-04-27 14:01:06 -07:00
Zach Fox
eaa699bbfd
Wow, it's really coming together!
2017-04-27 14:01:06 -07:00
Zach Fox
880bcf3b1e
Checkpoint
2017-04-27 14:01:06 -07:00
Zach Fox
c08b40b950
Initial sharing code hooked up
2017-04-27 14:01:06 -07:00
Zach Fox
01e78612c7
Soooo much progress today
2017-04-27 14:01:06 -07:00
Zach Fox
16b4af8a9d
Rearchitecture
2017-04-27 14:01:06 -07:00
Zach Fox
2880b22f9f
External share buttons!
2017-04-27 14:01:06 -07:00
Zach Fox
4270086a22
Support 1 and 2 images
2017-04-27 14:01:06 -07:00
Zach Fox
0b4cd41d75
More and more progress!
2017-04-27 14:01:06 -07:00
Zach Fox
a4f428a6e6
Lots of progress
2017-04-27 14:01:06 -07:00
Zach Fox
7acdc86644
Progress
2017-04-27 14:01:05 -07:00
Zach Fox
0860352caa
Checkpoint before switching to crash duty
2017-04-27 14:01:05 -07:00
Howard Stearns
88c3b4d9d3
Merge pull request #10258 from howard-stearns/watch-for-announcements
...
watch for announcements
2017-04-27 14:00:39 -07:00
Seth Alves
467505e421
Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update
2017-04-27 10:33:04 -07:00
Delanir
27029eb8db
Fix Code Standard
...
Fix indent lines 2799-2800
Fix one line that had more than 128 columns wide
2017-04-27 18:24:49 +01:00
Seth Alves
93f9716557
merge from upstream
2017-04-27 10:17:00 -07:00
Seth Alves
15661987be
load tablet overlay models with higher priority
2017-04-27 10:16:08 -07:00
Vladyslav Stelmakhovskyi
1916eafc41
Trigger rebuild
2017-04-27 16:02:47 +02:00
Vladyslav Stelmakhovskyi
0d53b82326
Renamed EDIT to CREATE
2017-04-27 09:30:00 +02:00
volansystech
87ceebca82
Merge branch 'master' of https://github.com/highfidelity/hifi into 21200
...
# Conflicts:
# scripts/system/controllers/handControllerGrab.js
2017-04-27 12:58:18 +05:30
Seth Alves
60453f8748
Merge pull request #10294 from ctrlaltdavid/record-for-marketplace
...
Make record script able to be put on the marketplace
2017-04-26 19:34:39 -07:00
David Rowe
9c7353deb2
Make record script able to be put on the marketplace
2017-04-27 11:22:25 +12:00
anshuman64
c088bd6891
Merge pull request #10271 from humbletim/21281
...
CR Job #21281 -- Doppleganger Mirror
2017-04-26 16:18:14 -07:00
Howard Stearns
7654823775
Merge pull request #10292 from thoys/make-connection-fix
...
makeUserConnection.js Fix for alternative skeletons
2017-04-26 16:02:16 -07:00
Zach Fox
9ace7a7488
Merge pull request #10279 from andrewd440/21174
...
21174 Make the Particle Emitter Easier to Use
2017-04-26 15:35:29 -07:00
humbletim
6e07933356
uncomment UserActivityLogger.logAction
2017-04-26 18:28:54 -04:00
humbletim
f8bbd9174c
Merge remote-tracking branch 'upstream/master' into 21281
2017-04-26 18:26:15 -04:00
anshuman64
5bd9b2e631
Merge pull request #10130 from ctrlaltdavid/21249
...
New avatar record and playback script
2017-04-26 15:18:30 -07:00
humbletim
cabeced66e
* changes per feedback and testing
...
* add support for UserActivityLogger.logAction (commented-out, pending #10130 )
* autodisable doppleganger when avatar changes model
* autodisable doppleganger when user moves to a different domain
* use ModelCache.prefetch for detecting model load status
* expose new signals to help keep activity logging and debugging decoupled
2017-04-26 17:51:21 -04:00
Thijs Wenker
26173700b8
Merge pull request #10267 from Triplelexx/21287
...
21287 - Newly created entities in Edit.js should be grabbable
2017-04-26 23:16:04 +02:00
Thijs Wenker
bf81ae78b9
Merge branch 'master' of https://github.com/highfidelity/hifi into make-connection-fix
...
# Conflicts:
# scripts/system/makeUserConnection.js
2017-04-26 22:52:57 +02:00
David Rowe
a68ee02e8d
Log script start-up
2017-04-27 08:41:29 +12:00
Triplelexx
e295ab2778
change location of menu item Create Entities As Grabbable
2017-04-26 21:13:39 +01:00
Thijs Wenker
d05229d3b4
fix conversion
2017-04-26 22:11:56 +02:00
Thijs Wenker
20a9b60e7b
this might make it work
2017-04-26 21:42:36 +02:00
Triplelexx
06b3b84145
changes from CR
2017-04-26 18:50:15 +01:00
Seth Alves
aeaa95b7a0
Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update
2017-04-26 10:23:27 -07:00
Seth Alves
186b86e3d4
load stylus model before it's needed so that it will appear quickly
2017-04-26 10:23:20 -07:00
Seth Alves
37233b9fdb
avoid a rare script-crash
2017-04-26 10:19:50 -07:00
Thijs Wenker
0363e96f34
Allow skeletons with different bone structures to become friends (still requires hands)
2017-04-26 18:55:50 +02:00
Thijs Wenker
a25584c90f
ESLINT, style and spelling fixes
2017-04-26 18:51:55 +02:00
Zach Fox
3e24296996
Swap the two lines
2017-04-26 09:10:05 -07:00
Howard Stearns
0f8ee7051c
lint
2017-04-26 08:20:12 -07:00
David Rowe
4581b9a0df
Refresh countdown number upon reopening dialog
2017-04-26 20:13:21 +12:00
Triplelexx
01b11022e3
add menu item to control grabbable setting on newly created entites
2017-04-26 07:26:00 +01:00
humbletim
84c8b2945a
detect and update doppleganger when user changes skeletonModelURLs; cleanup
2017-04-26 01:58:51 -04:00
David Rowe
06f56f024b
Increase delay of checking a recording loaded to reduce false positives
2017-04-26 15:55:59 +12:00
David Rowe
c5f384d8fb
Don't fade playback avatar when approaches observer
2017-04-26 14:02:45 +12:00
David Rowe
4a5f84f4b9
Merge branch 'master' into 21249
...
# Conflicts:
# libraries/audio-client/src/AudioClient.cpp
2017-04-26 13:24:18 +12:00
David Rowe
c83f82f5da
Delay start of recording until after beep finishes
2017-04-26 08:59:50 +12:00
Brad Hefta-Gaub
1962a49f3b
Merge pull request #10225 from sethalves/bullet-constraints-1
...
Bullet constraints + far-grab bootstrap fix
2017-04-25 13:36:47 -07:00
humbletim
a833912399
cleanup and documentation
2017-04-25 16:30:05 -04:00
howard-stearns
ee9b953b1c
typo
2017-04-25 12:12:26 -07:00
David Rowe
79346673ed
Log user activity events in record and playback scripts
2017-04-25 13:43:28 +12:00
Andrew Lowry
5ffb8eba86
Initialize background color for color picker correctly.
2017-04-24 20:37:43 -04:00
humbletim
6f178ee1ec
initial checkin of doppleganger module and tablet app scripts
2017-04-24 19:28:03 -04:00
Triplelexx
d689a43678
changes from CR
2017-04-24 22:07:51 +01:00
David Rowe
c0a258f9b3
Disable "load" button while making a recording
2017-04-25 09:04:26 +12:00
Triplelexx
d63c4d11c7
enable grabbable property for all newly created entities
2017-04-24 21:33:08 +01:00
David Rowe
d73fd6e08d
Update AC script URL in info
2017-04-25 07:42:21 +12:00
Andrew Lowry
6a218eaca9
Embeds colpick color picker in dat.GUI for particle explorer.
...
Cleans up eslint for particleExplorer.js.
2017-04-24 13:35:37 -04:00
Andrew Lowry
aea89824c5
Switches tablet edit tab to particle explorer when particle entities are
...
selected or created.
2017-04-24 13:35:37 -04:00
Andrew Lowry
ecf3826050
Always show hand lasers when in edit mode.
2017-04-24 13:35:37 -04:00
Andrew Lowry
8479d835b2
Adds laser selection of particle systems while in edit mode in HMD.
2017-04-24 13:35:37 -04:00
volansystech
1abbca6737
Merge branch 'master' into 21200
2017-04-24 19:09:02 +05:30
howard-stearns
fac40f51d9
message waiting art
2017-04-21 16:00:23 -07:00
David Rowe
7fe0ba19b5
Don't display the "Record" button as pressed while recording
2017-04-22 10:05:02 +12:00
howard-stearns
ce7f3197f6
watch for announcements
2017-04-21 14:27:38 -07:00
Seth Alves
ec687bdb4b
cleanups
2017-04-21 11:03:43 -07:00
Seth Alves
1e6b2682c9
use timers rather than relying on update calls
2017-04-21 10:17:57 -07:00
David Rowe
ce86ce4530
Red buttons to unload recordings
2017-04-21 19:45:14 +12:00
David Rowe
8060e98bd5
Right-align "i" icon and update info text
2017-04-21 17:46:30 +12:00
David Rowe
d064511121
Rearrange dialog controls
2017-04-21 17:01:29 +12:00
David Rowe
1aa6e20791
Change "Record" button to "Stop" while recording
2017-04-21 16:15:49 +12:00
David Rowe
477237cca2
Red "recording" ring animation with countdown numbers inside
2017-04-21 16:07:50 +12:00
David Rowe
aaf9b40bb3
New app icon
2017-04-21 15:20:08 +12:00
David Rowe
daedb94b04
Merge branch 'master' into 21249
2017-04-21 14:50:28 +12:00
David Rowe
076bf0943e
Attach HMD "recording" indicator to camera
2017-04-21 10:33:24 +12:00
Stephen Birarda
3452dd0251
increment colspan count in table footer
2017-04-20 15:20:48 -07:00
Stephen Birarda
924624b127
add new glyphs with check, reference in entityList
2017-04-20 14:21:13 -07:00
Stephen Birarda
f64efe18c0
add an isBaked column to edit.js
2017-04-20 14:21:13 -07:00
volansystech
9e2899678a
Resolving conflicts of #21206
2017-04-20 23:54:41 +05:30
volansystech
abc87c0338
Increased accuracy for converting far-grab to near-grab for every object
...
Near-grab radius reduced to its default = 0.3
2017-04-20 23:37:16 +05:30
Seth Alves
f7378abb08
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-20 02:40:10 -07:00
David Rowe
43619d1db1
Finish with TODOs
2017-04-20 14:22:54 +12:00
David Rowe
0da4e3e3c4
Display scrollbar in recordings table when needed
2017-04-20 14:19:25 +12:00
Brad Hefta-Gaub
a555846d5d
Merge pull request #10235 from volansystech/21206
...
21206 Far grab improvement to draw held entity toward yourself
2017-04-19 14:33:09 -07:00
David Rowe
2108300272
Merge branch 'master' into 21249
2017-04-20 08:43:00 +12:00
Delanir
956d1e9d95
Fix Code Standard
2017-04-19 16:30:49 +01:00
volansystech
b194ddeb66
Resolve Comments of @sethalves
2017-04-19 16:39:23 +05:30
David Rowe
f7d87c4c28
Tweak start-up delay
2017-04-19 16:32:46 +12:00
David Rowe
00b6b2a2c0
Implement desktop recordings browser dialog
2017-04-19 12:34:59 +12:00
howard-stearns
3113dced7b
Be sure to callback even on profile failure.
2017-04-18 12:06:44 -07:00
volansystech
e5c7587ad8
Improve far grabbing based on timescale.
2017-04-18 20:01:02 +05:30
David Rowe
dae6d6fb69
Stub desktop dialog to select recording to play from ATP assets
2017-04-18 11:43:42 +12:00
David Rowe
f920192244
Fix up script tear-down
2017-04-18 08:22:29 +12:00
volansystech
7e0efed062
Improve speed of grabbing.
2017-04-18 00:54:01 +05:30
David Rowe
7dcda47f95
Fix recording GIF still displaying when reopen tablet to stop recording
2017-04-16 12:57:37 +12:00
Seth Alves
db98020974
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-15 07:22:16 -07:00
David Rowe
15128faa49
Fix (work around) tablet access at Interface start-up crashing Interface
2017-04-15 17:11:03 +12:00
David Rowe
ef8f36026c
Improve speed of starting playing animations at server start-up
2017-04-15 13:20:42 +12:00
David Rowe
e91cf4a4e8
Use "i" circle for info button
2017-04-15 12:50:00 +12:00
David Rowe
e7fb268843
Update to use modified Recording API
2017-04-15 12:18:50 +12:00
Seth Alves
371118a6c0
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 16:26:30 -07:00
Zach Fox
b410399a16
Resolve your paths, silly!
2017-04-14 16:26:29 -07:00
Zach Fox
85e5173abe
Fix embedded location
2017-04-14 16:11:37 -07:00
Zach Fox
f81dce5e70
Fix the bug
2017-04-14 15:42:19 -07:00
Chris Collins
6a6800b8c3
Merge pull request #10222 from sethalves/fix-late-touch-cant-grab-tablet
...
fix can't grab tablet
2017-04-14 14:57:06 -07:00
David Rowe
2731c13a5c
Merge remote-tracking branch 'upstream/master' into 21249
2017-04-15 09:51:16 +12:00
Andrew Meadows
45bb639ef5
Merge pull request #10128 from kunalgosar/fingerpainting
...
Make it easier to exit FingerPaint
2017-04-14 14:34:57 -07:00
Seth Alves
110cfb47d1
turn off handControllerGrab debug prints
2017-04-14 14:23:27 -07:00
Seth Alves
6420ddd038
grab script checks for touch devices continually, rather than just when the script starts
2017-04-14 14:20:04 -07:00
kunalgosar
891d52909e
fixed typo in comments
2017-04-14 14:10:19 -07:00
Seth Alves
d17d12446b
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 12:49:03 -07:00
Seth Alves
1009182c06
grab and handControllerGrab use new far-grab action
2017-04-14 11:52:07 -07:00
Seth Alves
af5a352f02
turn on handControllerGrab debug prints
2017-04-14 08:10:31 -07:00
David Rowe
f715850766
Display animated GIF while recording
2017-04-14 16:13:45 +12:00
David Rowe
08f4fc2cf9
Remove hover highlight from "x"s
2017-04-14 15:51:59 +12:00
David Rowe
c2d8755b15
Merge branch 'master' into 21249
2017-04-14 15:32:45 +12:00
David Rowe
11a2559df9
Use HiFi glyph for delete "x"s
2017-04-14 15:30:28 +12:00
David Rowe
5f333ee02c
Style "i" button and info text
2017-04-14 15:14:39 +12:00
David Rowe
1d43e5a992
Style overall dialog layout
2017-04-14 15:12:36 +12:00
David Rowe
fd919f0db7
Play sounds during countdown and beep when recording starts and finishes
2017-04-14 10:34:15 +12:00
David Rowe
072e06123f
Fix recording just made not being played
2017-04-14 10:02:15 +12:00
volansystech
70855b1c53
Improve the accuracy of Far to near Equip State.
2017-04-13 19:24:47 +05:30
David Rowe
75e4fb3820
On tablet with option enabled recording ends when open tablet or dialog
2017-04-13 19:28:40 +12:00
David Rowe
8f3789421f
Show "busy" spinner when counting down or recording
2017-04-13 19:23:22 +12:00
David Rowe
9638b093d8
Fix number of available player instances being wrong on tablet
2017-04-13 18:55:02 +12:00
David Rowe
ff42715a15
Retain "Record" button's pressed state when close and reopen dialog
2017-04-13 18:41:55 +12:00
David Rowe
45ca8438fa
Persist finish-on-open checkbox value to settings
2017-04-13 18:29:39 +12:00
David Rowe
b508d6882f
Add checkbox that stops countdown/finishes recording when reopen dialog
2017-04-13 17:59:28 +12:00
David Rowe
84cfe1cb75
Don't close dialog when start recording; press "Record" again to finish
2017-04-13 17:00:35 +12:00
David Rowe
c369b1314a
Remove countdown overlays
2017-04-13 16:32:03 +12:00
David Rowe
afd82f09c0
Provide instructions on running the AC player script
2017-04-13 15:18:04 +12:00
David Rowe
e21e15c064
Update warning dialog to refer to player "instance"
2017-04-13 14:01:37 +12:00
David Rowe
5ad44b6caf
Display empty rows for unused players
2017-04-13 13:50:26 +12:00
David Rowe
24a68ea685
Report the numnber of free players rather than total number
2017-04-13 13:40:52 +12:00
David Rowe
464bc17491
Column heading for "unload" buttons
2017-04-13 13:40:20 +12:00
David Rowe
8bbce53f74
Reset player details when domain restarts or user teleports
2017-04-13 12:23:10 +12:00
Seth Alves
0dab94fada
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:34:46 -07:00
Seth Alves
0eb9507a10
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:25:50 -07:00
Zach Fox
3f91fb8e55
Remove unnecessary comment
2017-04-12 14:45:57 -07:00
Zach Fox
c724c2e50b
New loading icon
2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a
New loading icon
2017-04-12 14:45:57 -07:00
Zach Fox
75f1168b19
Clearer function names
2017-04-12 14:45:57 -07:00
Zach Fox
7b92989b1d
Fix it
2017-04-12 14:45:57 -07:00
Zach Fox
2579ac1baa
It's working!
2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b
Checkpoint!
2017-04-12 14:45:56 -07:00
volansystech
7bc3435cfa
Initial Commit..
...
If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x.
This will help user to grab the entity in lesser time.
2017-04-13 02:51:30 +05:30
David Rowe
7dddd266ba
Merge branch 'master' into 21249
2017-04-13 08:39:32 +12:00
Seth Alves
026dde2e68
allow kinematic near-grab to be turned on or off for a given entity
2017-04-12 10:14:16 -07:00
volansystech
5639a3f92a
Far to near grab: If the object is capable of being equipped, transfer from far-grab to an equipped state.
2017-04-12 20:08:26 +05:30
David Rowe
50a06db1b9
Display "REC" indicator when recording
2017-04-12 15:56:59 +12:00
David Rowe
f30dc4b560
Add a "record" button to initiate recording
2017-04-12 15:04:29 +12:00
David Rowe
905560b96d
Remove checkbox and record-on-close functionality
2017-04-12 14:48:15 +12:00
Thijs Wenker
695c55bc3d
fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes
2017-04-12 03:44:24 +02:00
David Rowe
3ae388bded
Rework auto-playback
2017-04-12 13:32:34 +12:00
David Rowe
0d9e0ebfec
Merge branch 'master' into 21249
2017-04-12 08:45:01 +12:00
Chris Collins
b07ed13023
Merge pull request #10184 from druiz17/snapshot-fix
...
snapshot bug fixes
2017-04-11 13:00:46 -07:00
volansystech
99af493ac8
Resolved the issue from the Initial commit - "grabbedEntity" stays into that grabbed position for a few seconds (hanging into mid of air) before dropping down automatically.
...
Successfully converted far grab into near grab when entity is closer to the Avatar.
When Trigger is released after converted far grab into near grab far, the obect is dropped successfully.
2017-04-11 21:57:01 +05:30
David Rowe
86baf785aa
Add "Load" button
2017-04-11 15:23:09 +12:00
Dante Ruiz
daf25c1fe8
fix crashes when clicking in the homebutton
2017-04-11 00:25:08 +01:00
David Rowe
559fba39ab
Remove avatar after stopping recording
2017-04-11 10:17:52 +12:00
David Rowe
9a9bcaf2ae
Stop button stops playing recording
2017-04-11 09:37:57 +12:00
Dante Ruiz
382204a9a9
open feed after logging in
2017-04-10 22:33:07 +01:00
Delanir
fcde85e51b
Fix Style
...
- Replace tabs by 4 spaces;
- Add indents and spaces;
- Formated multi/line statement
- Removed out-of-scope comments.
2017-04-10 22:16:56 +01:00
Dante Ruiz
df6498c67c
fix snapshot login for toolbar-mode
2017-04-10 21:59:37 +01:00
Dante Ruiz
6922ba5c77
removed unnessary prints
2017-04-10 21:08:40 +01:00
Dante Ruiz
e0f19944bc
Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix
2017-04-10 20:58:46 +01:00
Dante Ruiz
4e94aaa9e8
finished allowing to go back to previous app
2017-04-10 20:58:10 +01:00
Delanir
19de579057
Merge branch 'master' of https://github.com/CraftsmanMG/hifi
2017-04-10 20:37:51 +01:00
Delanir
25a89a631b
hifi: #21216 - Resize entities with hand controllers while editing
...
hifi: #21216 - Resize entities with hand controllers while editing
Modified StretchTool to allow for movement in 3D
- uses data from motion controller (position and rotation) to
stretch/resize the entities/primitives in 3D.
- the range of the resize depends on distance to the object.
2017-04-10 20:25:30 +01:00
David Rowe
bd63960876
Add table of recordings currently being played
2017-04-11 07:23:52 +12:00
David Rowe
0a19b502fd
Merge branch 'master' into 21249
2017-04-11 07:04:05 +12:00
David Rowe
9495bf6a47
Fix auto-playback logic
2017-04-10 19:56:46 +12:00
David Rowe
8e3bc31c36
Fix persisting new recording
2017-04-10 19:28:21 +12:00
David Rowe
b5bf7dc12f
Tidying
2017-04-10 16:47:35 +12:00
David Rowe
6a88398e8e
Handle AC script not being able to create an entity
2017-04-10 15:55:05 +12:00
David Rowe
1cc215e14b
Fix test that recording just made started playing
2017-04-10 15:31:38 +12:00
David Rowe
3b32a4f74f
Address AC scripts claiming same entity to play
2017-04-10 15:04:54 +12:00
Anthony Thibault
746b7aadbd
Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped
...
Fix teleport when something equipped
2017-04-09 19:00:21 -07:00
David Rowe
6896fe3ac6
Merge branch 'master' into 21249
2017-04-10 09:05:57 +12:00
David Rowe
d60d4d0755
Auto-play recording at start-up
2017-04-09 15:52:56 +12:00
David Rowe
adabcab888
Add invisible entity to persist playback of recording
2017-04-08 16:24:58 +12:00
David Rowe
d1e49cd926
Add and stub out stop, autoplay, and persistence to AC script
2017-04-08 14:57:37 +12:00
Dante Ruiz
86c67a3017
tablet pages
2017-04-08 02:01:21 +01:00
Chris Collins
8e12f62cbb
Merge pull request #10153 from druiz17/goto-fix
...
Ability to toggle goto with the crt-l and enter keys
2017-04-07 16:36:41 -07:00
David Rowe
ef4f3368f9
Play recording just made from original start position and orientation
2017-04-08 11:06:34 +12:00
David Rowe
ebe3561582
Merge branch 'master' into 21249
2017-04-08 10:46:16 +12:00
volansystech
e0b08a5e4e
Initial Commit of far to near grab conversion. Works only if object drawn at chest level And Object is near by to hand.
2017-04-07 21:55:26 +05:30
Howard Stearns
5d341778c5
fix notification word wrapping
2017-04-07 07:08:19 -07:00
David Rowe
1ef5f048a3
Inform user if recording failed to start
2017-04-07 18:53:20 +12:00
David Rowe
ce898ae42a
Play recording
2017-04-07 18:38:55 +12:00
David Rowe
75d970f5d5
Remove unresponsive players from list
2017-04-07 17:30:03 +12:00
David Rowe
81d8d238de
Refactor log and error messages
2017-04-07 17:13:23 +12:00
David Rowe
5e55233934
Assignment client player script receives "play" command from recorder
2017-04-07 17:04:24 +12:00
David Rowe
506a414762
Lint fix
2017-04-07 14:06:16 +12:00
David Rowe
858e9650a3
Encapsulate recording methods in Recorder object
2017-04-07 14:03:08 +12:00
howard-stearns
b089fd03b8
make connection messaging when not logged in
2017-04-06 16:48:11 -07:00
David Rowe
68901c8af5
Merge branch 'master' into 21249
2017-04-07 11:04:43 +12:00
David Rowe
49907970fb
Fix countdown showing if restart with dialog open and recording enabled
2017-04-07 11:01:11 +12:00
David Rowe
f164fe7532
Improve error handling
2017-04-07 10:46:40 +12:00
Dante Ruiz
a89081601c
fix merge issues
2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d
toggle goto in tablet
2017-04-06 22:27:37 +01:00
Howard Stearns
f7ef587c61
Merge pull request #10138 from davidkelly/dk/3935
...
Now you can forget connections
2017-04-06 14:05:25 -07:00
David Kelly
34a2cefb98
Merge pull request #10132 from davidkelly/dk/analyticsForConnections
...
initial analytics for connections
2017-04-06 10:45:39 -07:00
David Kelly
a92162dea9
no mo useless debug statements
2017-04-06 08:50:22 -07:00
David Rowe
23c937e55d
Make avatar recording and upload to asset server
2017-04-06 18:50:47 +12:00
David Rowe
a9f5b60319
Fix recording starting on tablet when close dialog rather than tablet
2017-04-06 15:32:42 +12:00
David Rowe
982c0ec559
Display countdown in overlay
2017-04-06 15:01:53 +12:00
David Kelly
61ece265f4
now you can forget connections
2017-04-05 18:16:16 -07:00
David Rowe
4580b89aa6
Add countdown delay before starting recording
2017-04-06 12:08:27 +12:00
David Rowe
096909d423
Close dialog if open when stop script
2017-04-06 10:10:07 +12:00
David Rowe
b8de31db12
Make toolbar icon close dialog if it's open
2017-04-06 10:09:41 +12:00
David Rowe
813a5684e3
Display instruction text only if recording is enabled
2017-04-06 09:22:01 +12:00
Seth Alves
2e4e10759f
teleport raypick now ignores equipped or grabbed entities
2017-04-05 13:17:03 -07:00
David Kelly
1b6bf90843
initial analytics for connections
2017-04-05 11:10:06 -07:00
David Rowe
b29bfd4bb4
Dialog instructions refer to tablet or window as appropriate
2017-04-05 17:49:13 +12:00
David Rowe
54a0bea8c0
Toolbar icon state and start/stop recording with window closing/opening
2017-04-05 17:48:35 +12:00
David Rowe
a625fd4523
Add dialog with "Enable recording" checkbox
2017-04-05 16:20:04 +12:00
David Rowe
d748068373
Stub new avatar recording script that records when tablet is hidden
2017-04-05 13:19:46 +12:00
Anthony J. Thibault
c33f10ca1b
Recenter body on teleport, also it works more consistently.
...
If your avatar happens to be squatting, your body will stand up straight after you teleport.
Also, setting MyAvatar.position can sometimes fail due to the multi-threaded nature of scripting.
Instead, teleport.js uses goToPosition to move the avatar, as a result teleport feels much more responsive now.
2017-04-04 18:05:46 -07:00
kunalgosar
a5b10cc51e
alert window to give directions
2017-04-04 15:35:38 -07:00
kunalgosar
b8500e45ad
added tutorial
2017-04-04 15:35:38 -07:00
kunalgosar
d66038fff2
press B to exit finger painting
2017-04-04 15:35:38 -07:00
Seth Alves
b0b214012c
Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts
...
Fix broken eventBridge on tablet after Reload All Scripts.
2017-04-04 10:45:08 -07:00
Anthony J. Thibault
8ff457a1b6
Fix broken eventBridge on tablet after Reload All Scripts.
...
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
2017-04-03 16:03:55 -07:00
Anthony Thibault
999bd0d339
Merge pull request #10075 from sethalves/tablet-ui
...
Tablet ui -- misc changes + landscape mode
2017-04-03 10:43:34 -07:00
Seth Alves
b9e84691ad
Merge pull request #10092 from ctrlaltdavid/dead-code
...
Remove some dead code in edit.js
2017-04-03 09:40:30 -07:00
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
Chris Collins
3c62826ef9
Merge pull request #10091 from ctrlaltdavid/21248
...
Fix HTML controls not working properly in the tablet
2017-04-01 08:41:44 -07:00
Zach Fox
8a96969471
Merge pull request #9873 from highfidelity/PAL_v2
...
PAL v2.0
2017-03-31 17:00:41 -07:00
David Rowe
6a23f3a59b
Remove some dead code noticed in passing
2017-04-01 11:25:42 +13:00
David Rowe
f397adb22a
Reinstate scrollbars to marketplace pages
2017-04-01 11:06:27 +13:00
David Kelly
8ceb6a20f0
friend/unfriend working
2017-03-31 15:05:21 -07:00
Zach Fox
6a4c2c5e12
Fix issues; checkpoint on new ComboDialog
2017-03-31 14:56:42 -07:00
David Rowe
260309ae24
Remove CSS hack no longer needed
2017-04-01 10:53:46 +13:00
Seth Alves
54c66aff07
use tablet-ui stylus as default, rather than avatar finger
2017-03-31 13:18:40 -07:00
Seth Alves
3073b47ea3
Merge pull request #10065 from ctrlaltdavid/21242
...
Address tablet scrollbar issues
2017-03-31 12:43:53 -07:00
Ken Cooke
fa53ebef30
Merge pull request #9996 from zfox23/cleanup_selectAudioDevice
...
FB3651: Fix audio devices switching when they shouldn't
2017-03-31 12:07:49 -07:00
Seth Alves
715493922e
code review
2017-03-30 17:33:01 -07:00
Zach Fox
4712ec7400
Reset pollCount; debug log when expired generated by client
2017-03-30 17:02:15 -07:00
David Rowe
a5c683192b
Improve entity properties scroll handle operation in tablet
2017-03-31 12:26:22 +13:00
Howard Stearns
0edbf1fbd9
Merge pull request #10044 from howard-stearns/pal-backend-integration
...
Pal backend integration
2017-03-30 12:55:11 -07:00
Howard Stearns
3056bb16a2
typo, and delete request on abort/fail
2017-03-30 12:40:54 -07:00
Seth Alves
c62b07d26f
add setLandscape call to tablet
2017-03-30 11:36:21 -07:00
David Kelly
e66c075f8e
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-30 10:14:29 -07:00
David Rowe
9c4414cff6
No custom styling of marketplaces directory scrollbar
2017-03-30 14:38:17 +13:00
David Rowe
c7f648a6c2
Disable marketplace directory and Clara.io scrollbars in tablet
2017-03-30 14:20:32 +13:00
Zach Pomerantz
4a9fbf2bbd
delay 200ms to avoid recursive audio dev switches
2017-03-29 19:05:41 -04:00
Zach Pomerantz
c30ab4de8b
rm extra setDevice
2017-03-29 18:48:22 -04:00
Zach Fox
a6ff3fcdb7
Tablet PAL bugfix; Connections help text v1
2017-03-29 15:47:19 -07:00
Zach Fox
1b74576259
Fix tablet-close behavior for PAL; remove users-tablet.js
2017-03-29 14:53:45 -07:00
Seth Alves
ce9eb1a377
more tablet landscape changes
2017-03-29 14:21:38 -07:00
Seth Alves
371df35013
remove code related to tablet being a model rather than an overlay. start on landscape mode
2017-03-29 14:16:14 -07:00
Howard Stearns
b8f557ca54
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration
2017-03-29 13:30:15 -07:00
Howard Stearns
53d484c318
makes connections!
2017-03-29 13:23:31 -07:00
Howard Stearns
b0c97d3a82
putative connection integration for 2-machine testing
2017-03-29 12:22:26 -07:00
David Rowe
c618e8e001
Open feed in tablet after sharing snapshot from tablet
2017-03-29 16:52:52 +13:00
Zach Fox
b776f25b3b
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b
Revert "Merge from upstream/master"
...
This reverts commit b5ba4a109d
2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d
Merge from upstream/master
2017-03-28 17:37:34 -07:00
howard-stearns
c2a49a582e
send credentials to local metaverse servers, and initial users data
...
integration.
2017-03-28 16:44:16 -07:00
Seth Alves
4516ddf855
Merge pull request #9847 from highfidelity/tablet-ui
...
Tablet ui
2017-03-28 14:48:02 -07:00
Andrew Meadows
b9e80d3fa5
Merge pull request #9972 from kunalgosar/marketsBug
...
Fixed buttons on Marketplace
2017-03-28 12:45:25 -07:00
Zach Pomerantz
06bf5807ae
fix audio setting persistence for already selected device
2017-03-28 15:34:42 -04:00
Zach Pomerantz
5e0cfb6137
short-circuit audio switching on missing device
2017-03-28 15:34:13 -04:00
Zach Pomerantz
1bdef141c3
simplify audio menu parsing
2017-03-28 15:33:54 -04:00
Seth Alves
6df4dda746
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 11:42:14 -07:00
Seth Alves
8e38b41e44
Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui
2017-03-28 11:41:58 -07:00
Seth Alves
851ea7dabc
fix initial finger/stylus setting
2017-03-28 11:41:51 -07:00
Clément Brisset
82114ae6ab
Merge pull request #9940 from Atlante45/fix/sit
...
Fix a few sitting bugs noticed at the meetup
2017-03-28 11:14:31 -07:00
Dante Ruiz
e276bb52d2
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help-script
2017-03-28 18:14:28 +01:00
Dante Ruiz
b0e437cc5a
remove help button from tablet when reloading scripts
2017-03-28 18:14:05 +01:00
Seth Alves
0cae616ab5
Merge pull request #10031 from hyperlogic/bug-fix/mouse-disconnect-issue
...
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
2017-03-28 10:07:52 -07:00
Seth Alves
9e675d4c93
Merge pull request #9990 from hyperlogic/bug-fix/sliders
...
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Anthony J. Thibault
29a159b90d
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
...
This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.
2017-03-28 09:27:13 -07:00
David Kelly
92718b6051
cr feedback
2017-03-28 08:57:27 -07:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
David Rowe
6a3dea030e
Settings link
2017-03-28 15:15:33 +13:00
David Rowe
55033df354
Merge branch 'tablet-ui' into 21238-b
2017-03-28 14:47:57 +13:00
David Rowe
a6ef592353
Non-scrolling window with images scaled to fit
2017-03-28 14:43:26 +13:00
Seth Alves
cdac011472
fix home button
2017-03-27 18:21:00 -07:00
Zach Fox
0ae4ce7e98
Have I finally tamed the beast?
2017-03-27 16:15:11 -07:00
Brad Hefta-Gaub
3bdcfd8b78
Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
...
remove properties from RayToEntityIntersectionResult
2017-03-27 14:26:51 -07:00
David Rowe
ead1f00bbf
Title
2017-03-28 09:10:20 +13:00
David Rowe
35305b4476
Make dialog single column with images above controls
2017-03-28 08:55:38 +13:00
David Kelly
5c1e085e7b
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 11:29:18 -07:00
David Kelly
76657a670c
added notifications (faked user name for now), along with switch to avatar entities
2017-03-27 11:28:57 -07:00
Anthony J. Thibault
5796cbc898
Bug-fix for touching deleted entities or overlays.
2017-03-27 10:26:33 -07:00
Zach Fox
e1a880a5d4
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 09:10:12 -07:00
David Rowe
e58e3fbbf7
Disconnect snapshot event handler when tablet "home" button pressed
2017-03-27 17:32:04 +13:00
David Rowe
dc3095bfcd
Fix "don't share" button not closing window
2017-03-27 16:24:14 +13:00
David Rowe
d0fc352d3b
Address event bridge being shared with other scripts
2017-03-27 16:07:58 +13:00
David Rowe
aa8a1e1dda
Open snapshot dialog in tablet or window appropriately
2017-03-27 15:04:33 +13:00
Seth Alves
bb28976d0e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-26 09:32:35 -07:00
Seth Alves
90db9af2f9
Merge pull request #9978 from Triplelexx/fix-tablet-users-typo
...
fix myVisibility typo
2017-03-26 07:36:11 -08:00
Seth Alves
d45e124529
Merge pull request #9995 from hyperlogic/bug-fix/no-scroll-bar-on-marketplace
...
Hide the scrollbar on the marketplace
2017-03-25 08:36:31 -08:00
Seth Alves
3abd6b3948
Merge pull request #10006 from druiz17/tablet-help
...
Ported help into the tablet
2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi
edb66ae704
Merge branch 'tablet-ui' into tablet-ui-audio-screen
2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb
Implemented Audio settings screen for Tablet UI
2017-03-25 13:17:38 +01:00
Zach Fox
73a77f7f25
OK, how about now
2017-03-24 18:19:34 -07:00
Zach Fox
e88895935b
Revert "Actually merge from master"
...
This reverts commit 056d6fbe4f
2017-03-24 17:56:48 -07:00
Dante Ruiz
6178a86a46
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
2017-03-24 23:56:33 +01:00
Seth Alves
f1470e34f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-24 15:17:52 -07:00
Brad Hefta-Gaub
9b26e8ee95
Merge pull request #9871 from Triplelexx/21208
...
21208 - Muted microphone indicator
2017-03-24 13:07:43 -07:00
Zach Fox
31ae326880
Pretty sure about this now
2017-03-24 13:05:07 -07:00
Zach Fox
e5741869e5
Checkpoint
2017-03-24 12:22:11 -07:00
Anthony J. Thibault
7e6ff7c2fb
Scrollbar is visible on marketplace in toolbar mode.
2017-03-24 11:40:10 -07:00
Lexx
fa606446a7
remove cache buster
2017-03-24 18:27:38 +00:00
Anthony J. Thibault
54b11bb6ee
Hide the scrollbar on the marketplace
2017-03-24 11:22:50 -07:00
Zach Fox
056d6fbe4f
Actually merge from master
2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087
Revert "Merge from Master"
...
This reverts commit e48123b5bb
2017-03-24 10:04:51 -07:00
ZappoMan
52335e20a2
fix typo
2017-03-24 09:59:55 -07:00
ZappoMan
bc331af6a0
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-24 08:46:43 -07:00
Seth Alves
902e3d41d6
merge from upstream
2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59
Merge pull request #9970 from Triplelexx/21223
...
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
Zach Fox
665b21f2f7
Checkpoint
2017-03-23 17:08:32 -07:00
Anthony J. Thibault
bab9890fea
Added inputMode property to Web3DOverlay.
...
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
2017-03-23 13:54:18 -07:00
ZappoMan
246f377a07
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-23 10:40:37 -07:00
David Kelly
0edcdde746
better key mapping
2017-03-23 10:40:34 -07:00
David Kelly
a08346719c
one bit of defensive code, plus some temporary logging
2017-03-23 10:29:45 -07:00
Zach Fox
e48123b5bb
Merge from Master
2017-03-23 09:54:14 -07:00
Dante Ruiz
dfa6174069
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
2017-03-23 17:34:50 +01:00
Seth Alves
62f10204d9
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:25:48 -07:00
David Kelly
aa085e577d
more vis work
2017-03-23 09:19:04 -07:00
David Kelly
a0c19d6b59
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-22 17:02:03 -07:00
David Kelly
7b52afb58b
vis changes to fade. Still needs more work
2017-03-22 17:01:42 -07:00
Zach Fox
692ef369c7
Attempted Stale PAL fix - hard to test!
2017-03-22 15:14:11 -07:00
Triplelexx
6a17e328e8
fix myVisibility typo
2017-03-22 22:13:39 +00:00
David Kelly
675612c1e9
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-22 14:56:23 -07:00
David Kelly
020dcca78d
end handshake when successful, stop handshake sound if other guy pulls out
2017-03-22 14:55:57 -07:00
Zach Fox
bf191eabb7
Some new stale PAL behavior
2017-03-22 13:35:48 -07:00
David Kelly
34a89e4b9a
added sounds, new haptics, and some cleanup
2017-03-22 13:26:51 -07:00
Dante Ruiz
3a89654111
saving work
2017-03-22 19:14:53 +01:00
Anthony J. Thibault
2c38d7ff89
Tablet spawn orientation now takes hand orientation into account.
...
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
2017-03-22 11:03:03 -07:00
David Kelly
a594419688
friend->connection which I should have done long ago
2017-03-22 10:09:48 -07:00
Triplelexx
2d1ca99e2e
change variable names that use Quat.getForward
2017-03-22 17:00:12 +00:00
Seth Alves
bd32104bc1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-22 08:41:59 -08:00
Ryan Huffman
1285f2a9eb
Merge pull request #9937 from thoys/boppo
...
El Boppo the Clown punching bag game
2017-03-22 09:30:54 -07:00
David Kelly
59b02261e5
minor cleanup, remove waiting visualization completely
2017-03-21 16:08:25 -07:00
Triplelexx
a964edee91
change all references of Quat.getFront to Quat.getForward in scripts directory
2017-03-21 22:25:30 +00:00
Dante Ruiz
d2c139ce6e
fix error from using a misspelled function
2017-03-21 22:25:45 +01:00
kunalgosar
f09ee92fe1
spacing issues
2017-03-21 14:16:49 -07:00
kunalgosar
30d2ea0ea5
spacing issues
2017-03-21 14:15:56 -07:00
kunalgosar
a4af973ae4
fixed back button on marketplace
2017-03-21 14:12:54 -07:00
David Kelly
5bcd7ca97f
visuals update. Will do some cleaning shortly
2017-03-21 13:27:00 -07:00
Seth Alves
14027d4acb
Merge pull request #9968 from druiz17/tablet-xbox
...
Fixed the third eye for the xbox controller
2017-03-21 11:03:53 -08:00
Seth Alves
04a334fd07
unmangle merge
2017-03-21 11:02:18 -08:00
Dante Ruiz
bf3c5dbf0e
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox
2017-03-21 19:47:16 +01:00
Dante Ruiz
1811a2edc7
fixed third eye laser
2017-03-21 19:45:00 +01:00
Seth Alves
1da6349505
merge from upstream
2017-03-21 10:26:02 -07:00
Ryan Huffman
13222468e3
Merge pull request #9712 from huffman/feat/edit-particle-icon
...
Add particle system overlay in edit.js
2017-03-21 10:02:52 -07:00
Seth Alves
cc4ddd1387
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub
b7f48644af
Merge pull request #9955 from druiz17/tablet-edit-selecting
...
Fix edit.js from deselecting an object when trying to delete it
2017-03-21 09:27:30 -07:00
Zach Fox
29e97381eb
PAL open, user leaves, gray out row
2017-03-20 17:20:28 -07:00
Seth Alves
bc90e9081b
Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale
...
Tablet scale settings now take effect soon after they are changed.
2017-03-20 15:05:47 -08:00
Zach Fox
d16acc5a7f
Stale PAL Notification
2017-03-20 15:24:49 -07:00
Anthony J. Thibault
f5c3d41f2c
Tablet scale settings now take effect soon after they are changed.
2017-03-20 14:51:47 -07:00
Dante Ruiz
de24023a21
Fix edit.js from deselecting an object when trying to delete it
2017-03-20 20:43:32 +01:00
Seth Alves
8988110c3b
Merge pull request #9953 from fayeli/edit-export-entities
...
Adding Export Entities Functionality in Tablet Edit
2017-03-20 11:35:18 -08:00
David Kelly
81cb63df6b
new particle effect, first pass
2017-03-20 11:42:58 -07:00
Faye Li
f57905fbb3
remove code for jump to selection
2017-03-20 10:23:55 -07:00
Seth Alves
2e29ff3114
Merge pull request #9934 from fayeli/edit-import-entities
...
Adding Import Entities button on the Create tab of Edit
2017-03-20 09:13:08 -08:00
Brad Hefta-Gaub
af790d8474
Merge pull request #9875 from birarda/bug/spin-strafe
...
fix double snap turn strafing
2017-03-20 10:08:05 -07:00
Ryan Huffman
df644edde4
Fix hand controller not able to select light/particle icons
2017-03-20 09:45:50 -07:00
Thijs Wenker
a8740614e2
CR Fixes
2017-03-18 01:22:06 +01:00
Faye Li
197a06c423
changes in TWO entityList.js to register the export event
2017-03-17 16:17:21 -07:00
Atlante45
4c75680877
Set teleport target to Cancel if seat in use
2017-03-17 16:10:15 -07:00
Faye Li
1a46f18aa3
adding export button + hiding jump to selection
2017-03-17 15:56:55 -07:00
David Kelly
c425c32b8f
hack somewhat different visualization in. If this is ok, will cleanup
2017-03-17 14:56:47 -07:00
Thijs Wenker
febe25511b
teleport.js - ignore entity support (for boxing gloves)
2017-03-17 21:10:06 +01:00
Faye Li
6531efffbc
hook up qml button to edit.js
2017-03-17 11:22:07 -07:00
David Kelly
58ac34b336
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-17 08:46:04 -07:00
David Kelly
2758e740bf
hacked in a particle effect (as entity) plus popped sphere into existence
2017-03-17 08:45:24 -07:00
Seth Alves
df84ff27e9
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-03-17 07:52:22 -07:00
Seth Alves
a5d19439f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-16 16:32:07 -07:00
Zach Fox
fc2a501474
Cleanup JS<->QML messaging
2017-03-16 15:38:39 -07:00
David Kelly
60000becce
more careful stopping of intervals, edge case stuff
2017-03-16 13:19:17 -07:00
David Kelly
f0fad5981a
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into dk/newMessageStuff
2017-03-16 09:01:13 -07:00
Seth Alves
31e0cfe296
Merge pull request #9825 from thoys/record-fixes
...
Avatar Recorder and Playback Fixes
2017-03-16 07:27:42 -08:00
David Kelly
4f6123ee29
more messaging rework - dealing with edges
2017-03-15 16:41:07 -07:00
howard-stearns
84fd17bd88
use location.metaverseServerUrl instead of hardcoded value.
2017-03-15 16:33:23 -07:00
Dante Ruiz
a5f1fb9e9a
fixed notification spelling error
2017-03-15 19:45:30 +01:00
Dante Ruiz
dac16af1df
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation
2017-03-15 19:27:11 +01:00
Dante Ruiz
4bc050e583
added tablet notification
2017-03-15 19:26:50 +01:00
David Kelly
d8719ac3a9
cleanup, switch to overlays with texture swapping, move overlay to between hands
2017-03-15 11:15:58 -07:00
Stephen Birarda
d13752a7c6
use the correct property name for useAdvancedMovementControls
2017-03-15 10:34:43 -07:00
Stephen Birarda
bfc51d8222
use property not function for advanced movement controls
2017-03-15 10:25:06 -07:00
Seth Alves
96a3e2a6d3
Merge pull request #9898 from ctrlaltdavid/21214
...
Load controller scripts in their own script engine
2017-03-15 08:42:20 -08:00
Seth Alves
b5919d89a5
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-15 08:26:10 -08:00
howard-stearns
6c88bc98b4
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-15 09:24:30 -07:00
Triplelexx
5883bd39dc
rename color to component
2017-03-15 11:17:27 +00:00
Triplelexx
41041c711f
use utils.js
2017-03-15 11:09:13 +00:00
Triplelexx
9e0091ebe0
use utils.js, move easing function, use mixes
...
some cleanup
2017-03-15 11:08:54 +00:00
Triplelexx
84d157ab18
handle overlay lifetime during update, remove color conv
2017-03-15 10:31:09 +00:00
David Rowe
cb4bd58381
Load controller scripts in their own script engine
2017-03-15 14:31:13 +13:00
Stephen Birarda
7ddb5ff770
use correct boolean when changing AMC
2017-03-14 18:09:17 -07:00
Stephen Birarda
188530590a
add missing curly brace to script
2017-03-14 17:16:49 -07:00
Stephen Birarda
490cb83489
move advanced movement control changes to MyAvatar
2017-03-14 15:03:01 -07:00
David Kelly
0a35fa34f9
some reworking, cleaning, bug fixing...
2017-03-14 14:22:44 -07:00
Zach Fox
5da0dfc4ac
Merging from Pal_v2_Zach
2017-03-14 14:05:50 -07:00
Triplelexx
6971aeb081
additional reference information
2017-03-14 17:18:11 +00:00
David Kelly
f821ccc8c3
fix typo - doh!
2017-03-14 10:00:19 -07:00
Triplelexx
8a39ce16bd
add simple easing function
...
dodgy add push
2017-03-14 16:57:45 +00:00
Triplelexx
4dd9a7c37f
add simple easing function
2017-03-14 16:51:43 +00:00
David Kelly
246d2f4017
fix comments at top
2017-03-14 08:58:14 -07:00
Triplelexx
30c16984c0
change offsetPosition to use Camera.position
2017-03-14 06:07:22 +00:00
Triplelexx
c729ceccb5
change color lerp to use HSV color
2017-03-14 03:59:24 +00:00
David Kelly
7765daf382
handle cleanup, race, etc..., more to come
2017-03-13 18:57:01 -07:00
David Kelly
fa7283a6e2
initial new messaging - working but needs cleanup
2017-03-13 18:33:36 -07:00
Triplelexx
2e0cac4676
add extra safeguards
2017-03-14 01:25:39 +00:00
Triplelexx
8bd155cb86
change offsetPosition to use Camera.orientation
2017-03-14 01:23:04 +00:00
Ryan Huffman
8246dbafab
Update particle explorer to work outside of entity list
2017-03-13 15:15:36 -07:00
Stephen Birarda
0926b2df2a
add LX snap turn to standard mapping
2017-03-13 15:14:20 -07:00
Ryan Huffman
9880d40cfb
Update edit.js light icons to now use the name entityIcon
2017-03-13 14:38:56 -07:00
David Kelly
515e6fd34e
map Controller.Standard.RB so xbox controller works. whee.
2017-03-13 13:10:05 -07:00
howard-stearns
db06c2650f
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-13 11:53:48 -07:00
Triplelexx
95fcb1df7a
fix spelling mistake
2017-03-13 18:32:53 +00:00
Ryan Huffman
d4ade8278c
Fix js linting errors in entityIconOverlayManager.js
2017-03-13 11:27:12 -07:00
Ryan Huffman
b7783dcffe
Update edit.js light/particle overlays to be clickable when behind something
2017-03-13 11:26:34 -07:00
David Kelly
e2e7573e93
handle stopping handshake part-way through
2017-03-13 11:04:51 -07:00
Zach Fox
beb848373b
Update from zfox23/PALv2 branch
2017-03-13 10:15:06 -07:00
Ryan Huffman
c2564800dc
Add edit.js particle + light icons
2017-03-13 10:10:53 -07:00
Ryan Huffman
dbcd7fd9e9
Fix light icon overlay not updating to represent light type
2017-03-13 10:10:53 -07:00
Ryan Huffman
42d518fafb
Remove debug log in entityIconOverlayManager
2017-03-13 10:10:53 -07:00
Ryan Huffman
86116aaad7
Update light/particel icons to be shown by default in edit mode
2017-03-13 10:10:53 -07:00
Ryan Huffman
ce5ee42961
Update LightOverlayManager to work with particles
2017-03-13 10:10:53 -07:00
Seth Alves
524e4bdfbc
Merge pull request #9853 from sethalves/tablet-ui-fix-edit-props-race
...
Tablet ui fix edit props race
2017-03-13 08:56:56 -08:00
Triplelexx
873a9aa39e
change color swapping to be more concise
2017-03-11 07:40:32 +00:00
Brad Hefta-Gaub
23e47f2fdc
added icons to the audioScope app
2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub
b8a2525f9e
add auto pause/resume to the Audio Scope App
2017-03-10 17:38:00 -08:00
Anthony J. Thibault
3abc78e7d3
Fix for finger/sytlus on invisible/hidden tablet.
2017-03-10 17:18:13 -08:00
Brad Hefta-Gaub
5f3ee2e98f
add a basic tablet app for the audio scope
2017-03-10 17:08:54 -08:00
Anthony J. Thibault
07e10ae862
Merge branch 'tablet-ui' into feature/can-touch-this
2017-03-10 17:05:26 -08:00
Triplelexx
8a0dd55275
change naming and comment
2017-03-11 00:19:02 +00:00
Triplelexx
eb4dee0495
create audioMuteOverlay.js
...
client scipt that creates an overlay to provide mute feedback
2017-03-10 23:37:29 +00:00
Seth Alves
2098cd5b5e
remove stylus and search-beams when grab script is shut down
2017-03-10 13:02:16 -08:00
Seth Alves
88e74251a1
cleanups
2017-03-10 12:51:34 -08:00
Seth Alves
411ec9a791
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race
2017-03-10 10:22:10 -08:00
Seth Alves
fffff817a3
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-10 10:20:40 -08:00
Seth Alves
494b602d4c
Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot
...
toolbar becomes visible after taking a snapshot
2017-03-10 10:20:01 -08:00
Seth Alves
cef4c988c4
Merge pull request #9835 from druiz17/toolbar-window-dont-close
...
Close toolbar windows when reloading scripts
2017-03-10 10:19:07 -08:00
Seth Alves
d792559d9a
have edit.js resend properties of selected entity to entityProperties.js once it's ready
2017-03-10 09:59:23 -08:00
Dante Ruiz
d54005b62e
no more duplicate snapshot buttons after taking reloading scripts
2017-03-10 00:17:44 +00:00
Dante Ruiz
c6c0c6d382
toolbar becomes visible after taking a snapshot
2017-03-09 22:54:22 +00:00
Anthony J. Thibault
d8f04d90a7
Merge branch 'master' into feature/can-touch-this
2017-03-09 14:24:10 -08:00
Anthony J. Thibault
6f53aaed5c
Small simplification of building stylusTarget list.
2017-03-09 14:04:13 -08:00
druiz17
0069569e96
Merge branch 'tablet-ui' into 21197
2017-03-09 09:31:15 -08:00
Seth Alves
023b01814e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-quick-summon-1
2017-03-09 09:16:37 -08:00
druiz17
007ed9fe81
Merge pull request #9836 from druiz17/2-tablets-fix
...
Fixed having more than one tablet when reloading scripts
2017-03-09 09:13:14 -08:00
Anthony J. Thibault
1acc5ea760
Finger now points when near tablet + deadspot added when touching the tablet
2017-03-08 19:03:56 -08:00
Dante Ruiz
2a275a4f4b
removed tab at the end of word
2017-03-09 00:15:02 +00:00
Seth Alves
9435c58c2c
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1
2017-03-08 16:10:38 -08:00
Dante Ruiz
b878f164fb
minimize diff again
2017-03-09 00:10:38 +00:00
Dante Ruiz
f6d799c048
minimize diff
2017-03-09 00:09:32 +00:00
Dante Ruiz
561bd27c38
minimize diff
2017-03-09 00:08:50 +00:00
Dante Ruiz
5f7a0ea8fc
Close tablet when switching form HMD to desktop and vice versa
2017-03-09 00:05:26 +00:00
Seth Alves
6aac2eb338
for overlay tablets, precreate them so that they show up quickly when summoned
2017-03-08 15:31:24 -08:00
Seth Alves
de2dd7383d
didn't need invis flag, after all
2017-03-08 15:30:49 -08:00
Dante Ruiz
ce105e0329
fix double tablets when reloading scripts
2017-03-08 22:21:57 +00:00
Dante Ruiz
881213259d
Merge branch 'master' of github.com:highfidelity/hifi into toolbar-window-dont-close
2017-03-08 21:44:20 +00:00
Dante Ruiz
59b4fa5fd7
Close toolbar windows when scripts are reloaded
2017-03-08 21:44:04 +00:00
Seth Alves
371c20ee25
hide tablet by making it not visible rather than destroying it
2017-03-08 10:33:59 -08:00
Seth Alves
66d44ac6f0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-08 09:26:51 -08:00
Seth Alves
a67f8ac0ed
Merge pull request #9807 from Menithal/21166-remove-limit
...
#9761 Cloneable Improvement
2017-03-08 07:15:06 -08:00
David Rowe
950f91965d
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-08 17:35:58 +13:00
Anthony J. Thibault
836c701cb3
More accurate and responsive stylus and finger touching.
...
The algorithm used to detect when and where the stylus or finger is touching the tablet has been improved.
* hovering the finger/stylus over the surface of the tablet should cause buttons to highlight.
* flicking or using the stylus like a drum stick, should more accurately click buttons on the tablet.
* stabbing the tablet quickly, should also more accurately trigger button presses.
* moving the hand/stylus from behind the tablet should be less likely to cause press events.
2017-03-07 18:19:32 -08:00
Thijs Wenker
b21bd3afa9
Make the time and slider follow the record.js toolbar
2017-03-08 01:14:11 +01:00
Seth Alves
b938579598
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-07 11:42:44 -08:00
Andrew Meadows
1e9623e2f2
Merge pull request #9813 from druiz17/multipule-audio-fix
...
removed duplicated audio devices
2017-03-07 10:00:48 -08:00
Seth Alves
f594689fa8
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-07 09:24:50 -08:00
Dante Ruiz
fc65723d68
corrected removing duplicate devices
2017-03-06 22:14:20 +00:00
Seth Alves
4886f1cbfc
don't run stylus-on-overlay code unless the overlay is a web3d overlay
2017-03-06 12:38:19 -08:00
Brad Hefta-Gaub
38668b6ce5
Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays
...
don't automatically unhook overlays from hands unless they were grabbable overlays
2017-03-06 12:32:18 -08:00
Thijs Wenker
6ded937b25
Merge pull request #9809 from Menithal/21201
...
WL#21201 Snap-together Magnetic blocks
2017-03-06 21:30:53 +01:00
David Rowe
09ecb12510
Merge branch 'tablet-ui-edit-js' into 21197
...
# Conflicts:
# interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-07 08:59:40 +13:00
Seth Alves
27066e89a6
Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-06 11:46:19 -08:00
Seth Alves
a2d2c41f02
remove debug print
2017-03-06 11:45:49 -08:00
Seth Alves
08e2e421e4
Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js
2017-03-06 11:08:27 -08:00
Seth Alves
eb47db4441
Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-06 11:07:22 -08:00
Dante Ruiz
b6671d92c8
removed duplicated audio devices
2017-03-06 18:46:57 +00:00
Seth Alves
6ac576c9e6
Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays
2017-03-06 10:43:43 -08:00
Seth Alves
19a31d7630
don't automatically unhook overlays from hands unless they were grabbable overlays
2017-03-06 10:15:53 -08:00
Seth Alves
93246b24b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-06 08:54:49 -08:00
Brad Hefta-Gaub
781e0be0e3
Merge pull request #9806 from howard-stearns/preserve-audio-data-during-pal-refresh
...
preserve audio data during pal refresh
2017-03-06 08:45:46 -08:00
Seth Alves
c677326025
Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet
...
Touch the tablet with your finger
2017-03-04 11:58:47 -08:00
Menithal
ea3f7f0274
Initial Magnetic block
2017-03-04 18:50:30 +02:00
Menithal
d85cb645b0
Changed limit logic, default limit is now 0
...
Clones now have a named based on the original entity id
Limit is now calculated from the source instance, instead of just clone
name to avoid a single box being calculated as something else
Default limit is now 0, which disables limit
2017-03-04 11:42:43 +02:00
howard-stearns
15d680d4f9
preserve audio data during pal refresh
2017-03-03 16:56:12 -08:00
Anthony J. Thibault
e56f02d94f
Changed default for preferFingerOverStylus to false.
2017-03-03 14:12:04 -08:00
Seth Alves
bccfa79e8b
Merge pull request #9749 from ctrlaltdavid/21176
...
If someone else is grabbing entity you want to grab show their grab beam
2017-03-03 13:43:28 -08:00
David Rowe
6403e51d20
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-04 09:00:49 +13:00
David Rowe
48ee661f02
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-04 08:58:48 +13:00
Anthony J. Thibault
45febe8565
Merge branch 'master' into feature/fingers-on-tablet
2017-03-03 09:04:43 -08:00
Seth Alves
40caa1ea49
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-03 09:01:57 -08:00
David Rowe
388a144af1
Tidying after merge
2017-03-03 18:44:50 +13:00
David Rowe
482c23ead5
Merge branch 'master' into 21186
...
# Conflicts:
# scripts/system/controllers/handControllerGrab.js
2017-03-03 18:38:42 +13:00
David Rowe
9384dfd89c
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-03 18:05:18 +13:00
David Rowe
854292b193
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-03 17:51:12 +13:00
Brad Hefta-Gaub
e655e442a0
Merge pull request #9799 from sethalves/steady-hand-lasers
...
Steady hand lasers
2017-03-02 18:27:39 -08:00
Seth Alves
3b581a8dfe
merge from upstream
2017-03-02 16:35:44 -08:00
Seth Alves
155a310852
Merge pull request #9761 from Menithal/21166
...
WL#21166 Cloneable Equipment
2017-03-02 16:33:13 -08:00
Seth Alves
10cb7aab06
Merge pull request #9684 from Menithal/parent-hotkey
...
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
2017-03-02 16:30:43 -08:00
ZappoMan
6400bb6319
CR feedback
2017-03-02 14:34:14 -08:00
Anthony J. Thibault
644e29a43d
disable WANT_STATE_DEBUG in handControllerGrab.js
2017-03-02 14:15:05 -08:00
Seth Alves
f321ffdf91
don't clear EDIT_SETTING flag when creating new entities
2017-03-02 13:00:52 -08:00
Seth Alves
bbfd373887
Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-02 12:51:52 -08:00
Seth Alves
9b3c16d489
get handControllerGrab overlay lines working again
2017-03-02 12:48:37 -08:00
Seth Alves
2047e0194d
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
2017-03-02 12:44:10 -08:00
David Rowe
b985b348ec
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-03 09:43:49 +13:00
David Rowe
4d624ad256
Merge branch 'menuFix' into 21199
2017-03-03 09:42:16 +13:00
Menithal
91fa871d55
Merge branch 'parent-hotkey' of mgit:Menithal/hifi into parent-hotkey
2017-03-02 21:40:45 +02:00
Menithal
9c31f66b75
Addressed CR of 9684
2017-03-02 21:39:56 +02:00
Seth Alves
94b5e6333c
get handControllerGrab overlay lines working again
2017-03-02 11:02:06 -08:00
Ryan Huffman
1564c76ab4
Merge pull request #9792 from huffman/feat/hand-controller-drop
...
Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped
2017-03-02 10:51:35 -08:00
Seth Alves
9d4445fd61
Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-02 10:07:37 -08:00
Seth Alves
cf37845f9e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-02 10:06:38 -08:00
Seth Alves
8893c4770e
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
2017-03-02 10:02:33 -08:00
Seth Alves
93055a67a8
use new-style hand-lasers for both hands
2017-03-02 10:01:08 -08:00
ZappoMan
9e71801ae1
remove properties from RayToEntityIntersectionResult
2017-03-01 18:21:04 -08:00
Anthony J. Thibault
4f03c06a94
Added General Preference to control stylus vs finger usage
...
By default the finger is preferred over the stylus.
2017-03-01 18:07:53 -08:00
Seth Alves
7f6b803652
3d-line-overlays can now have an endParentID and endParentJointIndex
2017-03-01 17:27:32 -08:00
Dante Ruiz
58c1a2fb99
Merge branch 'master' into menuFix
2017-03-02 00:55:18 +00:00
Seth Alves
7c4869eb73
fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother
2017-03-01 16:10:07 -08:00
David Rowe
9f56d2f6f6
Make tablet general settings dialog naming more consistent with desktop
2017-03-02 12:30:36 +13:00
Menithal
231ebef117
Removed stray debugPrint
2017-03-02 01:01:57 +02:00
Menithal
fd1fded276
Fixed Clone instancing issues
2017-03-02 00:59:45 +02:00
Anthony J. Thibault
d142c3d69b
eslint fix
2017-03-01 13:29:24 -08:00
Anthony J. Thibault
f418457100
Index finger touch support for the tablet-ui.
2017-03-01 13:28:17 -08:00
David Rowe
6fafc829e1
Merge branch 'menuFix' into tablet-ui
2017-03-02 09:28:35 +13:00
David Rowe
f60c2f8ec9
Merge branch 'tablet-ui-edit-js' into tablet-ui
2017-03-02 09:27:09 +13:00
Menithal
82236bdcb9
Merge remote-tracking branch 'upstream/master' into 21166
2017-03-01 22:09:29 +02:00
Menithal
f538ac24f3
Various Properties
2017-03-01 22:07:02 +02:00
David Kelly
45293ab130
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
2017-03-01 12:55:54 -07:00
Ryan Huffman
1c3840dc78
Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped
2017-03-01 10:25:16 -08:00
David Kelly
efe44425a6
cr feedback, plus something I missed
2017-03-01 09:26:03 -07:00
Dante Ruiz
e2479a78bd
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-03-01 16:04:12 +00:00
Seth Alves
c2085ebb6e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-28 13:33:51 -08:00
David Kelly
1fc57ce9a6
alan's feedback
2017-02-28 11:51:40 -07:00
Clément Brisset
7f9437dcc5
Merge pull request #9690 from Atlante45/feat/sit
...
Add hips pinning / Sit script
2017-02-28 10:41:22 -08:00
Dante Ruiz
d5714bfa6e
Merge branch 'master' into menuFix
2017-02-28 16:55:44 +00:00
