beholder
6409580b03
ignore intersection for 'close' button highlight overlay
2017-09-27 01:06:47 +03:00
druiz17
5a1242a1ac
fix spelling error
2017-09-26 15:06:31 -07:00
druiz17
76c1fe688c
fix auto dropping
2017-09-26 14:52:01 -07:00
Anthony J. Thibault
a7cfb5d635
teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale
2017-09-26 14:21:25 -07:00
Anthony J. Thibault
c26d04dca1
Teleport.js: Fix message bugs, and made eslint clean
...
* 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work
* 'Hifi-Teleport-Disabler' message should now work
2017-09-26 13:58:00 -07:00
Seth Alves
a871a6db1d
Merge pull request #11430 from sethalves/fix-parent-grab
...
Fix parent grab
2017-09-26 13:00:16 -07:00
beholder
24a12a2f8f
7722 Add onHover Outline to Tablet "X" Button
2017-09-26 22:31:56 +03:00
Seth Alves
81f74f9297
Merge pull request #11444 from druiz17/module-handcontrollerPointer
...
Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet
2017-09-26 12:21:03 -07:00
Seth Alves
91f5f61ea3
Merge pull request #11456 from druiz17/bugs-handControllerGrab
...
Correctly grab tablet in 3rd person
2017-09-26 12:19:20 -07:00
Seth Alves
913d3c4d12
Merge pull request #11422 from hyperlogic/feature/ant-man2
...
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
Seth Alves
216888aa03
Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab
2017-09-26 11:08:40 -07:00
Seth Alves
737b583745
avoid unequipping things during a HMD snap-turn
2017-09-26 11:08:33 -07:00
Dante Ruiz
e397d49564
Merge pull request #11159 from vladest/modal_dialogs_async
...
Modal dialogs async
2017-09-26 11:07:42 -07:00
druiz17
2cc8a55151
fix cloning equiping
2017-09-26 10:37:36 -07:00
Daniela
e264503b9f
Merge remote-tracking branch 'upstream/master'
2017-09-26 17:49:15 +01:00
Daniela
179a426389
Address QA comments.
2017-09-26 17:44:46 +01:00
Seth Alves
0b60928dd3
fix rollup-to-parent code to only roll up to entity parents
2017-09-25 19:07:40 -07:00
Brad Davis
40c42d35a5
Fix long tablet lag on first load
2017-09-25 17:50:04 -07:00
druiz17
6332a53ee2
able to grab tablet in 3rd person
2017-09-25 16:36:29 -07:00
Seth Alves
5da5b24894
unmangle merge
2017-09-25 15:18:22 -07:00
David Rowe
428efa571e
Merge branch 'master' into vr-edit-a
2017-09-26 10:40:07 +13:00
druiz17
ec40df711d
fix tablet grabbing and eslint changes
2017-09-25 14:31:13 -07:00
druiz17
b1b31444f0
fix mouse visiblity
2017-09-25 11:34:18 -07:00
druiz17
dda20c1ef5
fixing merge conflict
2017-09-25 09:45:29 -07:00
Nissim Hadar
27af4685e7
Added range and altitude to UI.
2017-09-25 09:32:52 -07:00
Seth Alves
5741782f45
merge from upstream
2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub
030da7d850
Merge pull request #11401 from druiz17/module-scale-entities
...
ScaleEntity Module
2017-09-25 09:10:32 -07:00
Seth Alves
90954a4e4f
Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab
2017-09-25 09:09:58 -07:00
vladest
1a2d38e31f
Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds
2017-09-25 17:11:44 +02:00
Nissim Hadar
1a9625d272
Merge branch 'master' into hazeZone
2017-09-24 18:27:36 -07:00
Nissim Hadar
6cbf087708
First version with combo for Haze Mode.
2017-09-24 15:08:22 -07:00
Zach Fox
921ebc221e
Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled
...
Enable Inspection Mode for all; change Commerce setting name
2017-09-22 17:52:27 -07:00
druiz17
b8ee60a394
fix scripting error
2017-09-22 17:13:48 -07:00
druiz17
2c7b8cdb4f
fixing script issues
2017-09-22 16:26:41 -07:00
druiz17
ee9ac3e7f9
undo unnessary changes
2017-09-22 15:38:39 -07:00
druiz17
28d8af0b44
Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer
2017-09-22 15:33:17 -07:00
druiz17
e965b7fff1
hand controller pointer
2017-09-22 15:32:40 -07:00
Zach Fox
0eafdeab14
Fix hover -> unhover overlay behavior
2017-09-22 13:32:11 -07:00
Zach Fox
bb9db3ef6d
Updates to behavior and shader appearance
2017-09-22 11:24:30 -07:00
Nissim Hadar
5e1d470553
WIP
2017-09-22 09:48:22 -07:00
David Rowe
e0658c7a2f
Merge branch 'master' into vr-edit-a
2017-09-22 15:18:14 +12:00
druiz17
53efe6bfb2
working on fix
2017-09-21 18:17:05 -07:00
Anthony J. Thibault
54e627e2c5
Merge branch 'master' into feature/ant-man2
2017-09-21 13:59:47 -07:00
Seth Alves
fc3e259f6f
remove debug prints
2017-09-21 11:42:30 -07:00
Seth Alves
3c22c9ea3a
back out bad change
2017-09-21 11:39:14 -07:00
Zach Fox
57b5a23373
Enable Inspection Mode for all; change Commerce setting name
2017-09-21 11:18:21 -07:00
Seth Alves
24bfb3f3b9
oops
2017-09-21 11:16:00 -07:00
Seth Alves
363a2a3a7a
merge from upstream
2017-09-21 11:08:29 -07:00
Seth Alves
473db92a8e
fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped
2017-09-21 11:07:47 -07:00
Daniela
d054c6dc36
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-09-21 18:29:45 +01:00
Daniela
adde847798
Fix code standard.
2017-09-21 17:57:02 +01:00
Seth Alves
61efaf7fc2
Merge pull request #11420 from druiz17/fix-parenting-overlay-module
...
nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another
2017-09-21 09:44:07 -07:00
Daniela
9787c31d70
Fix protect color pick from wrong user input.
2017-09-21 17:17:36 +01:00
druiz17
65e0c99618
small change
2017-09-21 09:07:49 -07:00
druiz17
2d7d6f85ba
fixing merge conflicts
2017-09-21 09:04:13 -07:00
Daniela
d960a7c42e
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-09-21 16:20:51 +01:00
Daniela
7ccfac0b3b
Protect stroke width from wrong user input. Protect color pick from wrong user input.
2017-09-21 15:54:53 +01:00
beholder
8085d0292d
7723 Tablet Should Rotate Faster when using Create app
2017-09-21 16:26:54 +03:00
David Rowe
c05ccd2ed5
Merge branch 'master' into vr-edit-a
2017-09-21 14:08:16 +12:00
Anthony Thibault
03e278c5ae
Merge pull request #11416 from druiz17/stylus-pos
...
Pull back the stylus position in hand.
2017-09-20 17:40:22 -07:00
druiz17
2c55419c60
change tablet forward offset
2017-09-20 16:49:45 -07:00
Seth Alves
90c97319ea
Merge pull request #11408 from druiz17/fix-tablet-input
...
fixing/improving and cleanup tablet inputs
2017-09-20 16:36:07 -07:00
druiz17
949c343604
fixing nearGrabParentModule switching grabbed overlays
2017-09-20 15:34:01 -07:00
Thijs Wenker
7ea1968b33
Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=)
2017-09-20 14:59:15 -07:00
Thijs Wenker
60a566768a
removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script
2017-09-20 14:39:13 -07:00
druiz17
92f3dfe2ab
move the stylus back a bit
2017-09-20 14:23:43 -07:00
druiz17
c20c5ee2b5
fixed tablet grabbing issue
2017-09-20 14:10:10 -07:00
druiz17
2ce6dcf89d
fixing spelling error
2017-09-20 11:45:42 -07:00
druiz17
5d87036f32
make changes requests and slight fixes
2017-09-20 11:41:31 -07:00
vladest
c17ca955db
Listener disconnects in C++ now
2017-09-20 20:03:53 +02:00
Daniela
8144841258
Add Edit.js Entities spawn up according to the orientation of the avatar.
2017-09-20 09:21:16 -07:00
Anthony J. Thibault
0873b88347
code review feedback
2017-09-20 09:21:15 -07:00
druiz17
e78d8bc132
tablet on wiki planet
2017-09-20 09:11:06 -07:00
druiz17
9c66a25d83
fixing and cleanup tablet inputs
2017-09-19 17:03:53 -07:00
vladest
67771bc297
Merge branch 'master' into modal_dialogs_async
2017-09-19 21:51:02 +02:00
Daniela
1426e10024
Fix texture loading issue with upstream master. Tune amount of points.
2017-09-19 17:47:00 +01:00
druiz17
e2921661e9
scaling entities
2017-09-19 09:35:22 -07:00
David Rowe
c56fda88fa
Merge branch 'master' into vr-edit-a
2017-09-19 16:17:04 +12:00
druiz17
9df3b6c211
change tablet spawn position
2017-09-18 13:29:05 -07:00
Anthony J. Thibault
0757f513af
Merge branch 'master' into feature/ant-man
2017-09-18 11:36:39 -07:00
vladest
5585265349
Merge branch 'master' into modal_dialogs_async
2017-09-16 22:06:49 +02:00
Seth Alves
765031bf89
Merge pull request #11377 from vladest/create_resize
...
Add resizable flag. Use the flag for Create only
2017-09-16 11:14:40 -07:00
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
