Commit graph

701 commits

Author SHA1 Message Date
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity
fix bug that caused localAngularVelocity to get zeroed out
2018-09-24 14:32:57 -07:00
Ryan Huffman
8805ce49e3 Remove verbose logging of keyboard messages in edit.js and gridTool.js 2018-09-19 15:06:58 -07:00
Seth Alves
f86075b2dd Revert "Fix for angularVelocity zeroing out on duplication or undo"
This reverts commit 9c96a10f6c.
2018-09-15 09:21:12 -07:00
David Back
7768e08510 rename func 2018-09-12 16:06:14 -07:00
David Back
1b8e9ed906 get controller position from avatar frame 2018-09-12 16:02:43 -07:00
David Back
55a4c55f78 remove unused and rename var 2018-09-12 14:48:27 -07:00
David Back
3da442a8f9 allow highlights in hmd, fix center scale hmd math 2018-09-12 14:44:04 -07:00
David Back
cf1c1296a7 fix center scale cube in hmd 2018-09-12 11:44:26 -07:00
Ryan Huffman
530fa5aee9
Merge pull request #13865 from dback2/editHandleScaleImprovements
Edit handle scale improvements
2018-09-11 12:57:47 -07:00
Ryan Huffman
4b8f5ea6b9 Fix syntax and duplicate event handlers in entityList.js 2018-09-10 16:44:13 -07:00
unknown
1ad3a09984 CR changes 2018-09-10 16:09:21 -07:00
Ryan Huffman
5aa5552727 Fix PROFILE not forwarding calls when disabled 2018-09-10 14:07:25 -07:00
Ryan Huffman
3cc90d3c80 Disable profiling in entityList.js 2018-09-07 12:07:19 -07:00
David Back
3d75d4726a scale invertly once passing minimum 2018-09-06 16:04:59 -07:00
David Back
6ac38190c1 tweak scaling multiple 2018-09-06 12:23:38 -07:00
David Back
92ff522862 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements 2018-09-06 11:54:05 -07:00
Ryan Huffman
739530cb85 Limit Entity List to only getting the properties it needs 2018-09-05 14:30:36 -07:00
Ryan Huffman
a9a5bf1e97 Replace entity list UI with custom, brute-force solution 2018-09-05 14:30:19 -07:00
Ryan Huffman
f6ac755bae Add profiling to edit.js fof the entity list 2018-09-05 14:30:19 -07:00
Ryan Huffman
133ac0662a Move entity list qml to scripts dir 2018-09-05 14:30:19 -07:00
Seth Alves
52bbb4d2ab fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix. 2018-08-27 16:21:01 -07:00
David Back
30c6975198 maintain stretch cube position vs mouse when stretching 2018-08-24 11:53:03 -07:00
David Back
8eddb36c82 resize scale cube 2018-08-22 17:29:40 -07:00
David Back
8c422cb0eb change corner cubes to center cube, replace spheres with cubes 2018-08-22 16:54:59 -07:00
Ryan Huffman
24af22a52f Fix edit orbit camera getting stuck zooming 2018-08-15 13:56:44 -07:00
Seth Alves
3623590e90
Merge pull request #13784 from sethalves/far-point-joints
Far point joints
2018-08-14 15:40:07 -07:00
John Conklin II
8c5344ad1a
Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut
MS17380: Create App fix for angularVelocity zeroing out on duplication or undo
2018-08-14 11:37:33 -07:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
John Conklin II
73ef2ff09c
Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit
MS17291: Create-app increase focus distance limit
2018-08-13 14:58:17 -07:00
Thijs Wenker
f26188d5b8 added comment for limit choice 2018-08-11 01:54:13 +02:00
Thijs Wenker
876079bb81 deactivate Create App when desktop windows are closed 2018-08-11 00:41:50 +02:00
Ryan Huffman
c0ac76bf4a
Merge pull request #13797 from dback2/rotationRingSize
Edit handle rotation ring size
2018-08-10 13:53:10 -07:00
John Conklin II
de0cdf6d8d
Merge pull request #13793 from wayne-chen/fixWebTabletJSBug
Fixing web tablet JavaScript error
2018-08-10 09:31:17 -07:00
Thijs Wenker
925cfc9b23 Set a max focus distance value of 14km to not lose the edit handles by far-clipping 2018-08-10 16:45:27 +02:00
David Back
e36e9aa68f tweak rotation ring size 2018-08-09 13:35:55 -07:00
Wayne Chen
2a6ff90a2c fixing web tablet error 2018-08-09 11:30:10 -07:00
David Back
a6d944e034 use alpha 1 for edit handles 2018-08-09 10:32:34 -07:00
John Conklin II
34697b6b07
Merge pull request #13770 from huffman/fix/edit-duplicate-fix
Fix duplicating multiple entities causing infinite looping
2018-08-09 09:07:37 -07:00
Anthony Thibault
90b0bd333f
Merge pull request #13774 from danteruiz/revert-tablet-material-entity
Revert to using overlays instead of material entities for button highlighting.
2018-08-08 17:33:26 -07:00
David Back
3c5c5d8552
Merge pull request #13750 from dback2/editLogSpamFix
Fix edit log spam with -1 hand
2018-08-07 13:51:39 -07:00
Dante Ruiz
269afb9a49 remove tablet material entities code remove create 2018-08-07 11:19:22 -07:00
Dante Ruiz
8c5eefcc95 some file and code cleanup 2018-08-07 10:58:45 -07:00
Dante Ruiz
d78c571df6 revert to use overlays instead of entities for tablet highlighting 2018-08-07 10:56:53 -07:00
Thijs Wenker
9c96a10f6c Fix for angularVelocity zeroing out on duplication or undo 2018-08-07 19:35:49 +02:00
Ryan Huffman
61fdce9c11 Fix duplicating multiple entities causing infinite looping 2018-08-07 09:52:14 -07:00
David Back
0565e0400c fix edit log spam with -1 hand 2018-08-03 11:08:56 -07: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