Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 17:36:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74641 commits 72 branches 56 tags 1.2 GiB
Commit graph

228 commits

Author SHA1 Message Date
Brad Hefta-Gaub
1e9faa7754
Merge pull request #14276 from ctrlaltdavid/M19345 
Make create apps not grab tablet if editing an entity with hand
 2018-12-09 17:21:10 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
David Rowe
5e51ba051a Improve code responsibilities 2018-11-22 11:12:22 +13:00
David Rowe
44efd18882 Make Create and Shapes lasers ignore tablet while editing 2018-11-21 08:38:30 +13:00
David Rowe
b24c482743 Terminate Create far grab etc. upon laser intersecting tablet 2018-11-16 16:29:57 +13:00
David Rowe
f2868fec3f Merge branch 'master' into M19345 2018-11-16 09:11:11 +13:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
Thijs Wenker
99fcef105f spaceMode / desiredSpaceMode explanation 2018-11-09 17:59:00 +01:00
Thijs Wenker
e483b1342c CR fixes 2018-11-09 01:56:17 +01:00
Thijs Wenker
9005efb639 style fixes 2018-11-09 01:30:05 +01:00
Thijs Wenker
08da8c4190 createApp - world/local switch 2018-11-09 01:28:37 +01:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
David Rowe
0eead13fb9 Make Create not grab tablet if editing an entity with hand 2018-10-25 15:03:47 +13:00
Ryan Huffman
6221b9ee59
Merge pull request #14149 from thoys/feat/create/entityList-autoScroll 
MS19054: [CreateApp/EntityList] auto scroll
 2018-10-24 10:36:21 -07:00
Thijs Wenker
776b8b8fc7 CR and style fixes 2018-10-24 17:58:06 +02:00
Thijs Wenker
27e0c85b01 entity list auto scroll 2018-10-24 17:58:06 +02:00
Thijs Wenker
4e9f9b3edf comply with copy/paste update 2018-10-23 22:42:56 +02:00
Ryan Huffman
573df2d922 Move copy/paste/cut to SelectionManager 2018-10-22 13:56:08 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1 
move grab pseudo-properties (userData) into first-class EntityItemProperties
 2018-10-17 13:29:20 -07:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
David Back
b5edf42fd0
Merge branch 'master' into editHandlePickPlaneImprovements 2018-10-01 16:36:30 -07:00
Brad Hefta-Gaub
ef063a4072
Merge pull request #14026 from huffman/fix/edit-rotation 
Fix edit rotation handle fidgeting
 2018-10-01 16:15:32 -07:00
Ryan Huffman
feb230b3bd Remove old comment in entitySelectionTool.js 2018-09-28 16:17:52 -07:00
David Back
8c306b8428 disable debug pick plane 2018-09-27 16:04:18 -07:00
David Back
f5d9dd82d9 better pick plane for stretch, camera-facing pick plane for scale, debug pick plane, overall cleanup 2018-09-27 16:01:20 -07:00
Ryan Huffman
431daecd8e Fix shifting of yaw rotation handle 2018-09-19 14:33:51 -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
unknown
1ad3a09984 CR changes 2018-09-10 16:09:21 -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
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
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
Ryan Huffman
c0ac76bf4a
Merge pull request #13797 from dback2/rotationRingSize 
Edit handle rotation ring size
 2018-08-10 13:53:10 -07:00
David Back
e36e9aa68f tweak rotation ring size 2018-08-09 13:35:55 -07:00
David Back
a6d944e034 use alpha 1 for edit handles 2018-08-09 10:32:34 -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
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
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