Commit graph

656 commits

Author SHA1 Message Date
Thijs Wenker
9c96a10f6c Fix for angularVelocity zeroing out on duplication or undo 2018-08-07 19:35:49 +02:00
David Back
cdbf75666f new line 2018-08-01 12:46:49 -07:00
David Back
f946bb73ef remove constants 2018-08-01 12:46:17 -07:00
David Back
97e45643b0 spacing 2018-08-01 12:44:40 -07:00
David Back
ca3151ae39 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCameraKeyFix 2018-08-01 12:43:04 -07:00
David Back
3e9e00f1d6 use key codes for entity camera keys 2018-08-01 12:42:50 -07:00
Thijs Wenker
c562a6945d
Merge pull request #13671 from huffman/fix/create-copy-follows-user
Fix duplication not working as expected on grabbed entities
2018-08-01 19:25:33 +02:00
Ryan Huffman
bbdc7ba380 Fix Uuid null comparison and dangling comma in Create tool 2018-07-31 13:57:27 -07:00
David Back
ad9ec26781 print 2018-07-31 11:53:17 -07:00
David Back
7bf7663f09 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 11:51:26 -07:00
David Back
4a722a62f7 use click handler only, remove triggerClicked 2018-07-31 11:51:16 -07:00
David Back
b420ef8cf2 fix trigger clicks on vive 2018-07-30 13:21:09 -07:00
Dante Ruiz
4caf613269 making requested changes 2018-07-30 10:19:27 -07:00
Dante Ruiz
cf6850de48 better stuff 2018-07-27 17:53:21 -07:00
Dante Ruiz
6320401308 somewhat better distance from bounding box 2018-07-27 17:49:49 -07:00
Ryan Huffman
103f9e04fa Fix duplication not working as expected on grabbed entities 2018-07-27 13:32:12 -07:00
David Back
cd842afc1c prevent both hands triggering same time, allow one to trigger after other 2018-07-26 17:52:25 -07:00
David Back
dcdf734114 remove unneeded 2018-07-26 16:43:07 -07:00
David Back
82e5d6ad29 use triggerClicks from controllers for edit handles 2018-07-26 16:38:25 -07:00
Dante Ruiz
6edd109dfe revert back to the old way we checkForChildTooFarAway 2018-07-26 15:23:54 -07:00
Thijs Wenker
b7d12c6b1c
Merge pull request #13656 from huffman/fix/create-selection-box
Fix the Create selection box not always matching outline
2018-07-24 19:49:20 +02:00
Ryan Huffman
d1da7675f6
Merge pull request #13648 from huffman/fix/create-xz-lines
Fix xz guides not showing when translating with Shift
2018-07-23 10:44:47 -07:00
Seth Alves
a6a4dd3b8e
Merge pull request #13570 from danteruiz/fix-tablet-material-entities
clean up tablet material entities  and don't display them in create menu
2018-07-23 09:50:23 -07:00
Ryan Huffman
ae26c5fe9a Remove extraneous logging 2018-07-20 11:38:02 -07:00
Ryan Huffman
32122a7c1f Replace magic numbers with RAIL_AXIS_LENGTH 2018-07-20 11:37:42 -07:00
Ryan Huffman
2305099874 Fix the Create selection box not always matching outline 2018-07-19 16:09:21 -07:00
Ryan Huffman
25b558e6b4 Fix xz guides not showing when translating with Shift 2018-07-19 12:56:18 -07:00
Thijs Wenker
b29044fd7e
Merge pull request #13618 from dback2/clickHandleSwitchEntityFix
Fix quickly clicking an edit handle causing selected entity change
2018-07-18 22:49:11 +02:00
Qliemillar
07a7bbbcf6
Merge pull request #13621 from thoys/fix/create/desktop-tablet#master
[FIX] Use create app in tablet mode when choosing to use tablet in desktop mode
2018-07-17 14:36:55 -06:00
Thijs Wenker
09e1090e72 Use create app in tablet mode when choosing to use tablet in desktop mode 2018-07-17 17:33:13 +02:00
Dante Ruiz
0fa2a71d0f actually fix requested changes 2018-07-16 11:35:53 -07:00
Dante Ruiz
47eb7a0899 Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab-and-flickering 2018-07-16 10:04:42 -07:00
Qliemillar
511b297be5
Merge pull request #13597 from dback2/entityListDeleteSpamFix
Fix entity list refresh when entity deleted
2018-07-16 09:49:25 -06:00
David Back
46a9521939 fix selecting an edit handle causing selected entity change 2018-07-13 17:40:24 -07:00
David Back
c225c3deca
Merge pull request #13608 from dback2/alignSelectionToGridFix
Fix aligning selection to grid
2018-07-13 13:33:26 -07:00
unknown
151f948b26 prints 2018-07-12 19:26:20 -07:00
unknown
acae4df3c3 fix align to selection to grid 2018-07-12 19:23:06 -07:00
unknown
306a77c039 fix delete event 2018-07-12 12:46:18 -07:00
Dante Ruiz
1cc95fbf76 better fix 2018-07-10 11:05:41 -07:00
Dante Ruiz
df4d81277f clean up tablet material entities and don't show them in edit 2018-07-09 16:59:32 -07:00
David Back
7a7b9730ee only clamp handles in hmd outside bounding box 2018-07-09 15:36:22 -07:00
John Conklin II
25406fa464
Merge pull request #13495 from thoys/feat/create/native-windows
Create App: Native windows
2018-07-09 14:25:13 -07:00
David Back
8f1ad8e367
Merge pull request #13538 from dback2/editHandleMacFix
Edit handle undefined event fix
2018-07-09 12:08:18 -07:00
John Conklin II
79b2858220
Merge pull request #13543 from ctrlaltdavid/M16392
Create snap-to-grid and translation fixes
2018-07-09 11:39:26 -07:00
Thijs Wenker
b1884b0841 CR fixes 2018-07-09 16:38:53 +02:00
David Back
3bcc727d47 check controller triggered in checkControllerMove 2018-07-06 18:57:32 -07:00
David Back
f33fae30ed Merge branch 'editHandleMacFix' of github.com:dback2/hifi into editHandleMacFix 2018-07-06 18:56:09 -07:00
David Back
a546d8b279 tabs 2018-07-06 15:48:53 -07:00
Dante Ruiz
ae03dcb57a fix parent grab dropping and cullig flickering 2018-07-06 15:42:21 -07:00
David Back
33e170315c recurse on children of children 2018-07-06 15:39:18 -07:00