Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 13:42:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71140 commits 71 branches 56 tags 1.2 GiB
Commit graph

680 commits

Author SHA1 Message Date
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
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
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