David Rowe
709e7e7d90
Add undo/redo for clone
2017-09-13 15:25:40 +12:00
David Rowe
003c1c7bc5
Add undo/redo for group/ungroup
2017-09-13 15:16:16 +12:00
David Rowe
8c9026c892
Add undo/redo for scaling
2017-09-13 14:13:48 +12:00
David Rowe
97b2988005
Miscellaneous fixes
2017-09-13 14:13:23 +12:00
druiz17
b3ff5c86f7
fixed secondary triggers and chest lid
2017-09-12 14:43:06 -07:00
David Rowe
d718ea6928
Add undo/redo for move
2017-09-13 09:17:28 +12: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
David Rowe
922b712b35
Add undo/redo for coloring entities
2017-09-12 21:58:09 +12:00
David Rowe
93a5cae7d2
Add undo/redo for deleting entities
2017-09-12 21:39:30 +12:00
David Rowe
3bb3e57f71
Add undo/redo for creating entities
2017-09-12 20:59:03 +12:00
David Rowe
68c4a2f7f6
Add History object to handle history
2017-09-12 20:53:15 +12:00
David Rowe
afb47dcfb2
Add undo and redo buttons to Tools menu
2017-09-12 20:43:11 +12:00
Anthony J. Thibault
bb5e808051
Fix for some of tablet size issues, on switching domains.
2017-09-11 18:59:52 -07:00
Anthony J. Thibault
b81f85e1ae
Merge branch 'master' into feature/ant-man
2017-09-11 15:14:03 -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
David Rowe
be049009c8
Improve sizing of scale handles
2017-09-11 17:51:58 +12:00
David Rowe
ec6cae4105
Fix physics "grabbable" setting being applied without gravity
2017-09-11 17:04:50 +12:00
David Rowe
acf6a433a9
Don't scale z-axis of text and Web entities
2017-09-11 16:38:06 +12:00
David Rowe
18f4a3bf35
Fix hiding UI when hand is inside entity that camera isn't
2017-09-11 15:43:19 +12:00
David Rowe
ce15d0ecd0
Fix color picker circle and slider images clipping at oblique angles
2017-09-11 15:18:42 +12:00
David Rowe
bd95274a72
Merge branch 'master' into vr-edit-a
2017-09-09 20:16:09 +12:00
David Rowe
6f4f8e583b
Don't kick off physics for Text and Web entities
2017-09-09 20:15:15 +12:00
David Rowe
a7e04fcba6
Don't color particle effects
2017-09-09 20:14:09 +12:00
David Rowe
561c3e4653
Make polylines and polyvoxes able to be colored
2017-09-09 17:24:07 +12: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
5d1a5eea4c
added test file
2017-09-08 13:45:45 -07:00
druiz17
b3e2c7ac56
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-08 13:30:48 -07:00
druiz17
e33012e522
laser on tablet update
2017-09-08 13:30:30 -07:00
Sam Gateau
ed8aa8b74d
Merge pull request #11160 from Zvork/outline
...
Outline effect
2017-09-08 12:32:01 -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
David Rowe
70581ebbc1
Fix handle scaling's scaling and positioning of entities
2017-09-08 10:43:43 +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
Olivier Prat
796c59b9c2
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-09-07 10:13:53 +02:00
David Rowe
8fdc2313cc
Tidying
2017-09-07 18:36:01 +12: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
David Rowe
e94d2034c7
Don't grab entity behind entity just created and grip-click-deleted
2017-09-07 10:44:03 +12:00
David Rowe
8ca97d91c5
Make able to pick color from locked entities
2017-09-07 10:26:12 +12:00
druiz17
0d66bfca05
added far trigger
2017-09-06 14:58:04 -07:00
David Rowe
2661fb6647
Tidying
2017-09-07 08:48:03 +12:00
Daniela
0ac7e00612
Add Avatar resize compatible teleport.js pad scale
2017-09-06 19:45:03 +01:00
Olivier Prat
17e992bd14
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-09-06 19:08:37 +02:00
Olivier Prat
fe357671e1
Removed qmlc files
2017-09-06 19:06:40 +02:00
Olivier Prat
25ff132fc7
Debugging scripts working again with correct occlusion management
2017-09-06 19:05:15 +02: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
3cc0db8b40
Fix app icon occasionally being disabled at Interface start
2017-09-06 23:38:38 +12:00
David Rowe
808f37a824
Prevent entities from jittering or drifting when grab a moving set
2017-09-06 22:54:51 +12:00
David Rowe
6c35a008f1
Fix scaling entities that have physics
2017-09-06 22:32:22 +12:00
David Rowe
7b19b39bce
Make physics work with multiple entities per HiFi's current capabilities
2017-09-06 18:36:06 +12: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
David Rowe
61fc32714a
Handle domain and permission changes; disable app icon appropriately
2017-09-06 12:23:36 +12: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
Olivier Prat
b619b2311d
Merged with master
2017-09-05 10:27:53 +02:00
David Rowe
310750fc0f
Close the app when the user changes avatars
2017-09-04 13:30:51 +12:00
David Rowe
2cd6f7fd54
Fix cursor not working when change dominant hand
2017-09-04 12:59:05 +12:00
David Rowe
44b365df6d
Merge branch 'master' into vr-edit-a
2017-09-03 10:57:32 +12:00
David Rowe
1cbc807016
Further haptic and audio tweaks
2017-09-02 21:23:30 +12:00
David Rowe
c93acbecaa
Move hover haptic pulses to dominant hand
2017-09-02 21:23:13 +12:00
David Rowe
039ceed74c
Modify equip and create sounds
2017-09-02 21:01:37 +12:00
David Rowe
5408daea73
Increase drop tool haptic pulse and decress hover haptic pulses
2017-09-02 20:49:50 +12:00
David Rowe
c7461a9646
Fix hover colors of menu buttons and header "back" icon
2017-09-02 20:36:22 +12:00
David Rowe
939b2ef11a
Fix laser enabling / disabling while inside an entity
2017-09-02 19:39:37 +12:00
David Rowe
d3819cfee3
Better names for overlay methods
2017-09-02 19:24:37 +12:00
David Rowe
9f9a0b0c58
Hide UI if hand is inside entity that camera is outside of
2017-09-02 19:09:36 +12:00
David Rowe
296d270098
Enable entities inside an entity to be manipulated
2017-09-02 19:06:43 +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
David Rowe
110413b025
Fix action after color picker failure
2017-09-01 14:36:44 +12:00
David Rowe
734ce66df3
Add audio and haptic feedback
2017-09-01 14:30:22 +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
David Rowe
652fbaa9b7
Refactoring
2017-08-31 15:30:04 +12:00
David Rowe
3dacd1fcda
Tidy options settings code
2017-08-31 13:55:00 +12:00
David Rowe
5299596254
Code tidying
2017-08-31 13:36:48 +12:00
Anthony J. Thibault
6e6687c3a6
Change tablet dimensions as sensorToWorldScale changes
2017-08-30 18:21:25 -07:00
David Rowe
3f0872465f
Rename new code items
2017-08-31 13:20:37 +12:00
David Rowe
c6f987c00c
Remove old code
2017-08-31 13:05:50 +12:00
Dante Ruiz
47699d4439
fixed edit.js
2017-08-30 16:52:59 -07:00
David Rowe
63074ad928
Fix button press distance
2017-08-31 11:44:52 +12:00
David Rowe
e8af4bdb2d
Fix up hover state of toggle button after pressing
2017-08-31 10:54:20 +12: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
David Rowe
59505b4334
Fix up colors and highlighting of group/ungroup and toggle buttons
2017-08-31 09:30:11 +12:00
David Rowe
db27b97ec7
Add zero indicators to Physics options' sliders
2017-08-31 08:24:38 +12: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
David Rowe
13ac963bcc
Default collisions to on
2017-08-30 20:51:25 +12:00
David Rowe
5cf40fd208
Style Physics options toggle buttons
2017-08-30 20:47:33 +12:00
David Rowe
42d2045bae
Style Physics options presets pick list
2017-08-30 17:20:32 +12: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
David Rowe
e18e11a07b
Style Physics options sliders
2017-08-30 09:01:46 +12: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
David Rowe
33765e14fa
Update general layout of Physics options
2017-08-29 21:06:29 +12:00
David Rowe
666c163637
Fix Color tool's "Swatches" label
2017-08-29 20:30:04 +12:00
David Rowe
758442999d
When picking a color highlight only single entity in a group
2017-08-29 18:03:31 +12:00
David Rowe
78876d39b4
Make all buttons raise when hovered
2017-08-29 17:58:37 +12:00
David Rowe
04a545da37
Style color slider
2017-08-29 16:54:45 +12:00
David Rowe
62e3c211eb
Style color circle
2017-08-29 15:46:43 +12:00
Dante Ruiz
4b592687b7
finished webEntityLaserInput, now working on cloning
2017-08-28 17:35:34 -07:00
David Rowe
67eb92da8f
Style color swatches
2017-08-29 10:51:36 +12: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
David Rowe
9abcf9525c
Use Settings values to determine whether or not swatches are populated
2017-08-28 15:51:11 +12:00
David Rowe
8dd06bc270
Style color picker button
2017-08-28 12:06:26 +12:00
David Rowe
c8381f32bb
Style current color indicator
2017-08-27 21:15:27 +12:00
David Rowe
64821ccd76
Update general Color options layout
2017-08-26 17:09:04 +12:00
David Rowe
b0ef570ce0
Style Group options
2017-08-26 14:20:37 +12:00
Dante Ruiz
0eceb7b382
unviersial web3d vs laser
2017-08-25 17:40:30 -07:00
David Rowe
c29a900588
Fix button hovering and pressing problems
2017-08-26 12:08:37 +12:00
Zach Fox
a03f9592c1
Inventory to Purchases
2017-08-25 16:34:48 -07:00
David Rowe
2899d51835
Fix "Finish" buttons not clearing tool action
2017-08-26 11:18:25 +12:00
Zach Fox
d19377d2d4
Saving
2017-08-25 15:56:30 -07:00
David Rowe
73a6f1f278
Style Delete options
2017-08-26 10:47:41 +12:00
David Rowe
7e817652a7
Style Clone options
2017-08-26 09:51:51 +12: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
David Rowe
71c3a58e88
Style Stretch options
2017-08-25 20:50:12 +12:00
David Rowe
eda513caf0
Display appropriate icon and label on tool icon per current tool
2017-08-25 14:58:05 +12:00
David Rowe
850efec97b
Display tool icon on dominant hand when tool is active
2017-08-25 14:07:41 +12:00
Dante Ruiz
fa676aaadf
lasers on tablet working
2017-08-24 17:42:27 -07:00
David Rowe
3b299fc34d
Fix Tools menu displaying on right hand
2017-08-25 12:05:24 +12: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
David Rowe
5fec240ea6
Move Tools and Create panels closer together
2017-08-25 09:20:00 +12: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
David Rowe
9858c05bdb
Pressing header in Tools options takes user back to Tools menu
2017-08-24 21:22:05 +12:00
David Rowe
24202b7fa5
Simplify deleting overlays
2017-08-24 15:26:26 +12:00
David Rowe
a33dbfe9b3
Change Tools menu header content per current tool
2017-08-24 14:30:05 +12:00
Dante Ruiz
dbe8aa77d7
working on laser v tablet
2017-08-23 17:32:41 -07:00
David Rowe
e8a1614499
Remove setting tool icon color
2017-08-24 11:10:41 +12: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
David Rowe
5a1b2babde
Add further items to Create palette
2017-08-24 09:21:54 +12: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
David Rowe
2a2f058898
Fix Tools menu header underline color
2017-08-23 21:59:55 +12:00
David Rowe
be45f600d4
Style Create palette items
2017-08-23 21:56:59 +12:00
David Rowe
1aba95ecb8
Style Tools menu buttons
2017-08-23 18:20:51 +12: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
David Rowe
0ef03eb52a
Remove extraneous panels
2017-08-23 10:42:24 +12:00
David Rowe
7051ff8f1f
Rename "tool menu" to "tools menu"
2017-08-23 09:41:46 +12:00
David Rowe
d6a23abb7c
Tools menu header and panel
2017-08-23 09:30:19 +12: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
David Rowe
44778e791f
Fix entity creation position
2017-08-22 22:55:43 +12:00
David Rowe
f542c54e6c
Lay out Create palette entity items
2017-08-22 22:40:38 +12:00
David Rowe
5a4ebbd54d
Style Create palette header and panel
2017-08-22 21:59:31 +12:00
David Rowe
bb7e4fa302
Revise coordinate system
2017-08-22 16:02:24 +12:00
David Rowe
79056c385f
Fix options buttons not pressing
2017-08-22 14:57:17 +12:00
David Rowe
c953df0040
Fix "Finish" buttons not clearing tool properly
2017-08-22 14:35:56 +12: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
cc0b95c70a
Lint
2017-08-21 17:32:40 +12:00
David Rowe
fcf4831a3b
Center Tools menu and options UI
2017-08-21 17:26:03 +12:00
David Rowe
0064c51610
Add "Finish" buttons for scale, clone, and delete tools
2017-08-21 16:24:55 +12:00
David Rowe
ca3eadb82f
Don't display menu buttons when tool options panel open, and vice versa
2017-08-21 16:04:34 +12:00
David Rowe
e34e8ff2c0
Fix color circle and slider changes not being applied when coloring
2017-08-21 13:24:07 +12: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
David Rowe
9434ef44c3
Delay physics kick in order to avoid some erratic behavior
2017-08-20 14:15:34 +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
David Rowe
c3f96b6727
Fix damping property name
2017-08-18 13:27:38 +12: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
David Rowe
5dd74d71fb
Activate the color picker
2017-08-18 09:55:09 +12: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
Olivier Prat
1e4cf5d797
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-08-17 09:46:49 +02:00
David Rowe
32113e84e4
Move color circle crosshairs witih laser
2017-08-17 14:45:47 +12:00
David Rowe
069102f68b
Initial color circle UI elements
2017-08-17 13:59:56 +12:00
Chris Collins
9c9bcd80b8
Merge pull request #11191 from SamGondelman/logging
...
Miscellaneous logging fixes
2017-08-16 15:46:32 -07:00
David Rowe
35d06c0244
Make space for color circle
2017-08-17 10:12:28 +12: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
9d87954d71
Merge branch 'master' of github.com:CraftsmanMG/hifi
2017-08-16 18:52:39 +01: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
Artur Gomes
f794079c62
Merge remote-tracking branch 'upstream/master'
2017-08-16 17:54:35 +01:00
SamGondelman
86cc938a47
Merge remote-tracking branch 'upstream/master' into sharks
2017-08-16 09:54:12 -07:00
Artur Gomes
07a16d658b
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 17:21:19 +01: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
David Rowe
90c2036be7
Fix physics options labels being displayed when options pane opens
2017-08-17 00:08:09 +12:00
David Rowe
2287e16ea7
Set physics values per picklist items
2017-08-17 00:04:14 +12:00
David Rowe
2c2f866c82
Close picklist if click elsewhere
2017-08-16 21:33:34 +12:00
David Rowe
f9de451b30
Make picklist label display "CUSTOM" when slider value is changed
2017-08-16 21:11:10 +12:00
David Rowe
30e9b8ea45
Update picklist label when item is picked
2017-08-16 20:56:08 +12:00
David Rowe
bfaae7c220
Add picklist options
2017-08-16 20:22:24 +12:00
David Rowe
c705bb7fad
Add picklist button
2017-08-16 14:55:44 +12:00
David Rowe
cca862b6ba
Apply physics to just the root entity
2017-08-16 13:47:14 +12:00
David Rowe
b1938bafea
Apply slider values to entities
2017-08-16 13:40:06 +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
072f3dfb03
removed commented out code, removed blocks from default scripts
2017-08-15 10:25:14 -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
David Rowe
cb53ad43e0
Tidying
2017-08-15 18:16:21 +12:00
David Rowe
8d01c02c29
Tidy clearing color swatches
2017-08-15 17:54:21 +12:00
David Rowe
8cf18c1b03
Tidy applying color swatches
2017-08-15 17:47:59 +12:00
David Rowe
3a1fc1f11c
Remember Physics slider values
2017-08-15 17:44:42 +12: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
David Rowe
504857a1b8
Set up Physics sliders
2017-08-15 10:23:36 +12:00
David Rowe
441ba15708
Fix swatch colors
2017-08-14 17:23:02 +12: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
David Rowe
71993972a2
Improve ungrouping behavior
2017-08-13 14:04:01 +12: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
David Rowe
bc00bcd02c
For development testing, apply physics to the entity intersected
2017-08-12 16:59:28 +12:00
David Rowe
a5407398e7
Fix Group tool highlights not being cleared when switch to other tools
2017-08-12 16:21:55 +12:00
David Rowe
c281d5f94b
Highlight and color single entities with Color tool
2017-08-12 15:46:53 +12:00
David Rowe
541402b559
Distinguish properly between intersected and root entities
2017-08-12 14:56:22 +12: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
2bf0ea1dff
Fix display artifact that occurs when overlay dimension is 0
2017-08-11 22:31:04 +12:00
David Rowe
a96d9ab85b
Apply physics toggle button values
2017-08-11 22:11:34 +12:00
Olivier Prat
1763ecd4c6
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-08-11 09:38:00 +02:00
David Rowe
ee225e6a8d
Implement toggle buttons
2017-08-11 18:23:20 +12:00
David Rowe
401a00441a
Merge branch 'master' into vr-edit-a
2017-08-11 15:26:20 +12:00
David Rowe
c82a4d6d56
Layout mockup of Physics options
2017-08-11 13:15:07 +12:00
David Rowe
0b063926b6
Move image slider to Color options
2017-08-11 11:41:33 +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
David Rowe
821f5de3e3
Further reduce number of Entites.getEntityProperties() calls
2017-08-11 10:20:36 +12:00
David Rowe
c34344161e
Improve App object handling
2017-08-11 10:09:52 +12:00
David Rowe
37f57852da
Set hand highlight sphere size from grab radius
2017-08-11 09:56:47 +12:00
David Rowe
badd57c165
Tidying
2017-08-11 09:26:05 +12:00
Elisa Lupin-Jimenez
28476960bb
Moved Blocks to tablet app
2017-08-10 14:23:45 -07:00
Sam Gateau
79f3be1efe
Merge pull request #11021 from Zvork/fade2
...
Fade dissolve effect JUST AVATARS
2017-08-10 13:48:30 -07:00
howard-stearns
ca13d58b0b
blance and inventory stubs
2017-08-10 12:44:50 -07:00
David Rowe
6977c35b6e
Reduce number of Entities.getEntityProperties() calls
2017-08-10 22:17:46 +12:00
David Rowe
6d61c188f8
Tighten up grabbing created entity
2017-08-10 21:22:11 +12:00
David Rowe
20c7e17fb6
Tidy up logging
2017-08-10 21:13:40 +12:00
Olivier Prat
a397138599
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-08-10 10:56:51 +02:00
David Rowe
b58cac1c56
Tidying
2017-08-10 17:28:43 +12:00
David Rowe
4b3f7d6614
Reorient Tools menu and slightly adjust Create palette position
2017-08-10 16:46:39 +12:00
David Rowe
a6af6e0bff
Add extra color swatches for user tests
2017-08-10 16:27:19 +12:00
David Rowe
594d144210
Finesse sliders to produce values that fully got to 0.0 and 1.0
2017-08-10 15:45:05 +12:00
David Rowe
9442a667b4
Raise sliders on hover
2017-08-10 15:32:48 +12:00
David Rowe
cc64644946
Don't press sliders down when click on them
2017-08-10 15:02:19 +12:00
Seth Alves
0d0f147056
port action-near-grab to dispatcher
2017-08-09 17:48:35 -07:00
David Rowe
e1adb3a20e
Add image slider (for H, S, V or similar values)
2017-08-10 12:44:30 +12: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
David Rowe
397527d3f3
Add image UI element
2017-08-10 10:23:13 +12: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
David Rowe
1aeaee8153
Rename slider to barSlider
2017-08-10 09:04:28 +12: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
Olivier Prat
392a99f038
Added some fill parameters. Still need to fix issues with blur changing with screen aspect ratio
2017-08-09 19:18:16 +02:00
Zach Fox
61526256bc
Remove personalized comment
2017-08-09 09:30:18 -07:00
Olivier Prat
0f2c41b009
Added outline intensity
2017-08-09 18:27:39 +02:00
Olivier Prat
01a028cbb6
First alpha working version of outline
2017-08-09 18:03:52 +02: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
David Rowe
1c2d3ced89
Add some further entities to the Create palette
2017-08-09 17:28:28 +12:00
David Rowe
c19ec58220
Halve hand highlight and grab sphere radius
2017-08-09 15:51:37 +12:00
David Rowe
938b09c1a4
Slider display per intersection value
2017-08-09 15:19:25 +12:00
David Rowe
3d4cec63cd
Calculate slider value from laser intersection
2017-08-09 14:36:17 +12: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
David Rowe
c79931106d
Add basic element of slider
2017-08-09 12:06:35 +12:00
Elisa Lupin-Jimenez
efd25a5e70
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-08 16:55:10 -07:00
David Rowe
28f9f9e4d0
Add a "Physics" button and panel
2017-08-09 11:02:33 +12: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
David Rowe
22432671ca
Fix newly created entity not being grabbed
2017-08-09 09:26:33 +12: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
Artur Gomes
0017e29e60
Fix animated hue not working even though the checkbox was checked after
...
restarting the interface.
2017-08-08 20:04:51 +01: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
Artur Gomes
981e935b61
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-08 18:00:21 +01:00
Olivier Prat
44ee7c4bf1
Renamed to OutlineEffect and working on debugging tool. Problems with outline framebuffer not complete
2017-08-08 18:41:57 +02:00
Artur Gomes
541c45b563
Fix desktop drawing mode creating more than one entity in an unusual way.
2017-08-08 16:22:34 +01:00
Artur Gomes
016170f4ff
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-08 15:50:50 +01:00
Artur Gomes
a316d96ea7
Fix tablet loosing focus (from the drawing hand) when switching hands.
2017-08-08 14:15:26 +01:00
Artur Gomes
0e7a490e38
Merge remote-tracking branch 'upstream/master'
2017-08-08 12:48:52 +01:00
Artur Gomes
0dd7df8b81
Fix brush texture stretching at start.
...
Add some code refactoring.
2017-08-08 12:47:28 +01:00
David Rowe
046ce353fd
Fix highlight overlay getting deleted
2017-08-08 21:56:01 +12:00
David Rowe
42284796a1
Remember swatch colors
2017-08-08 21:44:54 +12:00
David Rowe
0b8ea29193
Clear swatch with grip click
2017-08-08 20:37:41 +12:00
David Rowe
f88191b7b3
Merge branch 'master' into vr-edit-a
2017-08-08 16:43:20 +12:00
David Rowe
6621b43fae
Make some swatches start with "no color"; color them when clicked
2017-08-08 16:34:45 +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
David Rowe
1231491a72
Add color picker
2017-08-07 17:29:58 +12: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
David Rowe
0f44e36128
Fix buttons sometimes staying pressed
2017-08-05 18:04:39 +12:00
David Rowe
4e87c13020
Tidy group buttons' enabling
2017-08-05 17:52:54 +12:00
David Rowe
bff3ad342d
Tidy command and callback handling
2017-08-05 17:37:40 +12:00
David Rowe
e6456ca501
Tidy and fix options handling
2017-08-05 17:08:56 +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
David Rowe
23fab65f27
Tidying
2017-08-05 12:08:36 +12:00
David Rowe
24f36c1ae5
Default current color and remember current color over tool/app toggles
2017-08-05 12:07:33 +12: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
Artur Gomes
1d11df0922
Did clean up of the code and unused files.
2017-08-04 20:14:36 +01:00
Artur Gomes
a40ba6d0c5
Merge remote-tracking branch 'upstream/master'
2017-08-04 18:00:31 +01:00
Artur Gomes
302364486f
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-04 17:54:43 +01:00
David Rowe
ceba5769e0
Apply color to entities when click them
2017-08-04 18:07:42 +12:00
David Rowe
75b481adab
Update icon color as current color is changed
2017-08-04 17:52:53 +12:00
David Rowe
d0143c2c19
Add color swatch buttons and "current color" circle
2017-08-04 17:33:00 +12:00
David Rowe
ed497afdc3
Add "Color" tool button, icon, and empty options panel
2017-08-04 14:08:57 +12:00
David Rowe
2237290b2e
Add labels to buttons
2017-08-04 13:22:48 +12:00
anshuman64
83e50f894a
Merge pull request #11106 from seefo/tracked-objects
...
Added Vive pucks as an input channel and added new puck-attach script
2017-08-03 17:03:45 -07:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
seefo
67b5921079
Changed puck-attach to make tracked entities collisionless
2017-08-03 16:01:12 -07:00
seefo
498ac5d0ab
Updated version of puck-attach.js
2017-08-03 15:08:06 -07:00
David Rowe
4d8226ac02
Abstract out some common constants missing from the API
2017-08-04 09:23:40 +12:00
David Rowe
110355796c
Add delete tool
2017-08-04 08:55:43 +12:00
David Rowe
e2dccc1420
Merge branch 'master' into vr-edit-a
2017-08-04 07:33:18 +12:00
Andrew Meadows
e465186511
Merge pull request #11048 from 1P-Cusack/21389
...
WL21389 PR1: Representation of collision shapes need updating (details below).
2017-08-03 09:04:31 -07:00
David Kelly
4b7779f0f5
add flag to outline render flags, fix pal.js/edit.js interaction
2017-08-03 07:57:21 -07:00
David Rowe
e29bed7f07
Don't auto-grab if trigger fully pressed when laser starts intersecting
2017-08-03 20:26:21 +12:00
David Rowe
1ba658ee45
Implement grouping and ungrouping
2017-08-03 19:52:39 +12: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
David Rowe
1e1cb3a02e
Fix scale tool highlight color
2017-08-03 13:24:38 +12:00
David Rowe
1b866fdf9e
Enable/disable grouping buttons depending on current group selection
2017-08-03 13:20:14 +12:00
David Rowe
c4eac1660c
Fix app toggling and hand swapping issues
2017-08-03 11:46:05 +12:00
David Rowe
37c1060080
Fix button highlighting and clicking
2017-08-03 11:06:51 +12:00
VRCat\VRKitten
e4e4ead4af
'Untabified' files
2017-08-02 16:56:02 -06:00
seefo
82654c7cda
Made requested changed to puck-attach.js
2017-08-02 15:28:26 -07:00
seefo
961f748d87
Fixed a potential bug with puck-attach parenting
2017-08-02 13:08:44 -07:00
seefo
620f1a65c0
New puck-attach script
2017-08-02 13:08:44 -07:00
seefo
106b0ad8bb
Added Vive pucks as an input channel
2017-08-02 13:08:43 -07:00
Artur Gomes
1de97b50ee
Merge remote-tracking branch 'upstream/master'
2017-08-02 20:02:59 +01:00
Artur Gomes
2c80e2e86e
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-02 19:32:04 +01: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
David Rowe
25bbdba987
Add Tool menu options panels, in particular grouping buttons
2017-08-02 22:17:02 +12:00
David Rowe
83f580c514
Generalize Tool menu UI
2017-08-02 19:07:11 +12:00
David Rowe
fb1284ad61
Clear grouping selection when choose another tool
2017-08-02 16:12:49 +12:00
David Rowe
53d755d8da
Clear grouping selection when drop tool
2017-08-02 14:45:19 +12:00
David Rowe
26a14d0934
Swap button and tool icon colours to match grouping highlights
2017-08-02 14:41:42 +12:00
David Rowe
65e57a9262
Highlight grouping entities
2017-08-02 14:38:26 +12: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 Rowe
c686cef4a0
Collect grouping data
2017-08-02 13:15:53 +12:00
David Rowe
7e1584a43e
Add grouping state
2017-08-02 12:27:02 +12:00
David Rowe
6d90b6d0fd
Simplify trigger click usage
2017-08-02 11:49:10 +12: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
David Rowe
a94b2b367b
Simplify grip click handling
2017-08-02 09:16:24 +12:00
David Rowe
12d911f290
Add "group" bool button and icon
2017-08-02 08:41:53 +12: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
Artur Gomes
e79a78e839
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-01 16:25:18 +01:00
Artur Gomes
f17221301a
Fix paint surface always facing the HMD instead of rotating with the
...
brush/hand;
2017-08-01 10:50:09 +01:00
David Rowe
f2cf2cab6e
Generalize tool selected
2017-08-01 16:02:04 +12:00
David Rowe
ca7c747c96
Create entities at hand position rather than in front of avatar
2017-08-01 11:46:22 +12:00
David Rowe
59dc5ec3b8
Refactor tool buttons
2017-08-01 10:20:55 +12: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
Artur Gomes
1f5be31326
Make savedSettings variable null after it is used, since it is probably
...
a cause for a big memory leak.
2017-07-31 19:34:49 +01:00
Elisa Lupin-Jimenez
b2161e433c
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-07-31 09:54:21 -07:00
Artur Gomes
904c730d07
Merge remote-tracking branch 'upstream/master'
2017-07-31 17:36:34 +01:00
Artur Gomes
25524f5ab0
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-07-31 17:35:11 +01:00
Liv Erickson
ed9ea17917
remove semi-colon
2017-07-31 08:02:18 -07:00
Olivier Prat
490aad2a06
Merged from master
2017-07-31 12:00:35 +02:00
Matti Lahtinen
5fab6c37a3
Removed stray variable test
2017-07-31 08:56:04 +03:00
David Rowe
ab8bccf16b
Implement cloning action
2017-07-30 11:03:19 +12: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
David Rowe
48ee7a3b1a
Add icon for clone tool
2017-07-29 17:39:23 +12:00
David Rowe
18a9dad918
Add button for clone tool
2017-07-29 17:15:33 +12:00
David Rowe
676deb8a5c
Make grip naming consistent with trigger naming
2017-07-29 16:16:48 +12:00
David Rowe
1d500dd3aa
Use dominant hand setting and handle setting changes
2017-07-29 16:10:48 +12:00
David Rowe
30595c78a0
Fix button not unpressing when cursor moves off it
2017-07-29 14:51:58 +12:00
David Rowe
52a2538d73
Fix scale handles not displaying after delete entity
2017-07-29 14:41:58 +12:00
David Rowe
9f90960a12
Make grip press discard tool
2017-07-29 13:31:08 +12:00
David Rowe
f4b2e399ef
Fix multiple and malingering tool icons
2017-07-29 12:54:21 +12:00
David Rowe
c201e7b65a
Display placeholder for tool icon on dominant hand
2017-07-29 10:59:15 +12:00
David Rowe
2a654b3657
Merge branch 'master' into vr-edit-a
2017-07-29 08:34:58 +12:00
Andrew Meadows
d4e72df928
Merge pull request #10711 from burtsloane/midi
...
Midi support for Entities
2017-07-28 10:51:43 -07: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
David Rowe
64f5fe4009
Make Create palette a separate object
2017-07-28 10:36:54 +12:00
Seth Alves
f0c9f1d120
starting on controller-dispatcher experiment
2017-07-27 15:32:13 -07:00
David Rowe
9fe3a823ee
Fix unexpectedly deleting multiple entities
2017-07-28 09:35:29 +12:00
David Rowe
21c15120ba
Raise Tool menu up a little to accommodate wooden mannequin's hand
2017-07-28 09:24:15 +12:00
jmo
003c483ec6
stray tabs changed to spaces, and long comment split to multiple lines
2017-07-27 15:21:58 -06:00
David Rowe
01f37b53e9
Fix non-dominant hand ciursor dot showing when it shouldn't
2017-07-28 09:20:21 +12:00
SamGondelman
e3288a9004
fix flicker, scissor warning, and handControllerGrab sphere size
2017-07-27 11:17:30 -07:00
Artur Gomes
43f600a1f7
Fix brush weird behaviour when starting with clean settings (brush would
...
be black and filled instead of appliying the correct texture with color)
2017-07-27 19:07:33 +01:00
Artur Gomes
535f23e408
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-07-27 18:37:19 +01:00
Elisa Lupin-Jimenez
1c640cf37b
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-07-27 10:00:17 -07:00
Artur Gomes
0f3c21d8ab
Merge remote-tracking branch 'upstream/master'
2017-07-27 17:09:01 +01:00
Artur Gomes
d7a564b34d
Move line width widget from the palette tab to the brushes tab.
2017-07-27 16:57:44 +01: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
David Rowe
86f33727eb
Add prototype Create palette
2017-07-27 16:53:15 +12:00
David Rowe
e8c5e1c2d5
Make the button move down when pressed
2017-07-27 16:05:32 +12:00
David Rowe
3b111b85ef
Move UI to hand
2017-07-27 15:56:42 +12:00
David Rowe
573a49853a
Tidying
2017-07-27 15:09:22 +12:00
David Rowe
136ea78873
Use overlays instead of entities
2017-07-27 13:47:35 +12: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
burtsloane
d4ae298a8d
Merge branch 'master' into midi
2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444
Merge branch 'master' of https://github.com/burtsloane/hifi into midi
2017-07-26 13:30:57 -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
Artur Gomes
7f4ce3a04a
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-07-26 17:53:13 +01:00
scromie@turnmeupgames.com
33ff5917be
fix
2017-07-26 19:34:20 +03:00
David Rowe
6203a1ad68
Wire up button to toggle scale-with-hands / scale-with-handles
2017-07-26 22:41:38 +12:00
David Rowe
d4b872d9e1
Detect button press
2017-07-26 22:30:52 +12:00
David Rowe
3566609173
Highlight button as it is hovered
2017-07-26 21:34:13 +12:00
David Rowe
52759be618
Don't transition laser length when start intersecting UI
2017-07-26 20:40:12 +12:00
Artur Gomes
747fe0382a
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-07-26 09:20:04 +01:00
David Rowe
8dceb3cc6c
Show laser dot on UI even if trigger isn't squeezed
2017-07-26 17:26:43 +12:00
David Rowe
194a82974b
Make laser dot a minimum size commensurate with near laser beam width
2017-07-26 15:53:34 +12:00
David Rowe
0f2176127e
Fix locations of dominant hand settings and update setup
2017-07-26 15:41:16 +12:00
David Rowe
bf69402219
Laser intersect but don't highlight non-editable entities
2017-07-26 15:31:54 +12: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
Leander Hasty
d155c02640
[WL21389] wip and modifications based on comments
...
https://github.com/highfidelity/hifi/pull/11024#pullrequestreview-51611518
Cleans up tabs, moves new functionality out of ShapeFactory directly to
RenderableShapeEntityItem's computeShapeInfo override, begins to break down
where we will need pointlists.
Still need to determine how rotation is handled for pointlists, and check
for axis alignment on cylinders before deciding on a shape.
Changes to be committed:
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h
modified: libraries/entities/CMakeLists.txt
modified: libraries/entities/src/ShapeEntityItem.cpp
modified: libraries/entities/src/ShapeEntityItem.h
modified: libraries/physics/src/ShapeFactory.cpp
modified: libraries/physics/src/ShapeFactory.h
modified: libraries/shared/src/ShapeInfo.cpp
modified: scripts/developer/tests/basicEntityTest/entitySpawner.js
2017-07-25 15:20:35 -04:00
LaShonda Hopper
75403124b6
[WL21389] Addresses physics library dependency and has some other fixes (details below).
...
* Addresses physics library dependency by moving computeShapeInfo override from
ShapeEntityItem (which is within Entities Library) to RenderableShapeEntityItem
(which is in Entities-Renderer Library).
** Entities-Renderer library already links against the physic library.
** Per discussion with Andrew Meadows: In order to ShapeEntityItem to be
utilized the library dependency between the Entity and Physics library
would need to be resolved to avoid the cyclical reliance which isn't in
the scope of this ticket.
* Updates shapeSpawner test script from the default clone of basicEntityTest\entitySpawner.js
** Objects now have a finite lifetime
** Script now cleans up the objects created when the script ends
** Also moved some adjustable properties out into var aliases at the top of the
file for easier/less error prone tweaking. Should probably add one for the shapeType.
* Fixes some issues with validateShapeType helper function
* Removed naive attempt at including physics library within entities library.
* Transferred some todos from notes
* Fixed some formatting
NOTE(s):
This compiles and runs. Cylinder is spawned and treated as CYLINDER_Y.
TODO(s):
* Add tweakable var for shapeType within shapeSpawner.js
* Vet and verify other shapes.
* Add in edge case handling.
* Add in support for other shapes to ShapeInfo infrastructure.
Changes to be committed:
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h
modified: libraries/entities/CMakeLists.txt
modified: libraries/entities/src/ShapeEntityItem.cpp
modified: libraries/entities/src/ShapeEntityItem.h
modified: libraries/physics/src/ShapeFactory.cpp
modified: libraries/shared/src/ShapeInfo.cpp
modified: scripts/developer/tests/basicEntityTest/shapeSpawner.js
2017-07-25 14:43:39 -04:00
LaShonda Hopper
5bc38bd7f0
[WL21389] Collision Shapes need to be updated (details below).
...
Revised approach involves creating a helper function within ShapeFactory to aid
in devising the ShapeType to be used by an ShapeEntityItem for collision. The
ShapeFactory is currently doing this for creating the actual Bullet Library
collision shapes.
ShapeEntityItem overrides its virtually inherited computeShapeInfo which
in turn calls the new ShapeFactory helper function.
ShapeEntityItem has a new memvar _collisionShapeType to cache its actual
ShapeType used by the physics system. This memvar is returned via the getShapeType
accessor which is expected to return an object's ShapeType.
Note(s):
This is similar to the original approach save translation between entity::Shape and ShapeType
isn't tied to the EntityItemProperties shapeTypeNames or shapeType. This approach more
directly solves the issue of getting the actual ShapeType used by the time it's needed
to determine the bullet collision object type created when initializing the physic information.
Translation of the ShapeEntityItem's entity::Shape to its ShapeType is handled by
ShapeFactory which handles creating the bullet collision objects when setting up
physics on the ShapeEntityItems.
Known Issue(s):
This doesn't compile. It appears that the Entity Library needs to know about
the Physics Library. The naive attempt at providing that link failed to resolve
all compilation issues.
Current Error:
C1083: Cannot open include file: btBulletDynamicsCommon.h:
No such file or directory (C:\projects\cusack\libraries\entities\src\ShapeEntityItem.cpp)
C:\projects\cusack\libraries\physics\src\ShapeFactory.h 15 1 entities
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
modified: libraries/entities/CMakeLists.txt
modified: libraries/entities/src/ShapeEntityItem.cpp
modified: libraries/entities/src/ShapeEntityItem.h
modified: libraries/physics/src/ShapeFactory.cpp
modified: libraries/physics/src/ShapeFactory.h
modified: libraries/physics/src/ShapeInfo.cpp
modified: scripts/developer/tests/basicEntityTest/entitySpawner.js
new file: scripts/developer/tests/basicEntityTest/shapeSpawner.js
2017-07-25 14:43:07 -04: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
Artur Gomes
67b477fa01
Merge remote-tracking branch 'upstream/master'
2017-07-25 10:00:32 +01:00
Artur Gomes
b84f3d389c
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-07-25 09:55:23 +01: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 Rowe
72e3c9a881
Insert UI handling between input updates and editor actions
2017-07-24 16:59:34 +12:00
David Rowe
51522edd94
Separate out input objects from editor object
2017-07-24 16:32:10 +12:00
David Rowe
1f244fb487
Better way of handling grip click
2017-07-24 15:25:00 +12:00
David Rowe
4353400d23
Fix null state transition
2017-07-22 17:55:00 +12:00
David Rowe
a7f7a2c401
Add representative Tool menu UI elements
2017-07-22 17:47:49 +12:00
David Rowe
9cb8aea4fd
Make grip click delete selection
2017-07-22 13:06:15 +12:00
David Rowe
44fe60ddda
Stub dominant hand setting support
2017-07-22 11:47:14 +12:00
David Rowe
233655b76b
Split script into multiple files
2017-07-22 11:20:17 +12:00
Andrew Meadows
bec7f7c644
Merge pull request #11010 from druiz17/bug-tablet-third-person
...
You can now properly grab and move the tablet in third person
2017-07-21 13:33:55 -07: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
6db2e2c6c9
Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays
2017-07-21 07:18:33 -07:00
Olivier Prat
7bc7b1eabc
Merge branch 'master' of git://github.com/highfidelity/hifi into fade2
2017-07-21 09:27:30 +02:00
David Rowe
7e4e68ccf9
Fix highlight overlay sometimes being out of position
2017-07-21 14:52:24 +12:00
David Rowe
f858abcf7c
Resume app from idle state
2017-07-21 14:31:15 +12:00
David Rowe
218b13b0e9
Turn off laser when grabbing or scaling with hand
2017-07-21 14:17:50 +12:00
David Rowe
1434f98dab
Fix multi-selection scale handles box after toggling while grabbed
2017-07-21 13:49:26 +12:00
David Rowe
cf51c546d3
Fix direct scaling scale and position
2017-07-21 13:43:20 +12:00
David Rowe
e09113fef5
Fix handle scaling down to very small dimensions
2017-07-21 13:18:10 +12:00
David Kelly
5cd05da31e
strict comparisons
2017-07-20 15:16:40 -07:00
Zach Fox
3698fe9b6b
Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays
2017-07-20 15:10:06 -07:00
SamGondelman
5de0970365
put back ignoredEntities functionality in teleport
2017-07-20 14:17:52 -07:00
