Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 06:44:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57745 commits 25 branches 0 tags 1.1 GiB
Commit graph

57745 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 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
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 Rowe
f6591e2d8a Merge branch 'master' into vr-edit-a 2017-08-01 08:26:03 +12:00
Chris Collins
5bdaa4daa1 Merge pull request #11087 from jherico/crash_null_entity_element 
Fix potential nullptr access in EntityTreeElement
 2017-07-31 09:15:52 -07:00
Brad Hefta-Gaub
7785c11ee8 Merge pull request #11080 from jherico/fix_web_touch_emulation 
Fix web touch emulation
 2017-07-30 09:14:54 -07:00
Brad Hefta-Gaub
c88e5d1053 Merge pull request #11084 from jherico/fix_paths_warning 
Fix log warnings from non-notifiable properties
 2017-07-30 08:51:47 -07:00
Brad Davis
861b33a845 Fix potential nullptr access in EntityTreeElement 2017-07-29 17:22:25 -07:00
David Rowe
ab8bccf16b Implement cloning action 2017-07-30 11:03:19 +12:00
Brad Hefta-Gaub
3bd2464a01 Merge pull request #11086 from highfidelity/revert-11079-disable_web_touch_emulation 
Revert "Disable touch event emulation for tablet until we fix crash"
 2017-07-29 13:11:32 -07:00
Brad Hefta-Gaub
af2452eb64 Revert "Disable touch event emulation for tablet until we fix crash" 2017-07-29 13:06:07 -07:00
Brad Davis
17b06e8e12 Fix log warnings from non-notifiable properties 2017-07-29 11:54:39 -07:00
Brad Davis
7d18d2e017 Restore corrected touch event simulation 2017-07-29 08:51:51 -07:00
Brad Hefta-Gaub
52bebf621d Merge pull request #11079 from jherico/disable_web_touch_emulation 
Disable touch event emulation for tablet until we fix crash
 2017-07-29 08:28:37 -07: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
19fc8b2ed0 Merge branch 'master' into vr-edit-a 2017-07-29 15:01:03 +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
Brad Davis
5946a965da Disable touch event emulation for tablet until we fix crash 2017-07-28 18:54:16 -07: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
Chris Collins
cfd9f8b64e Merge pull request #11077 from jherico/overlay_event_crashes 
Fix overlay event handling thread issues
 2017-07-28 15:56:09 -07:00
anshuman64
e11388f7f7 Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal 
Add a "dominant hand changed" signal
 2017-07-28 15:17:50 -07:00
Brad Hefta-Gaub
dd310b8661 Merge pull request #11076 from birarda/bug/blank-create-tabs 
fix blank create tabs in HMD
 2017-07-28 15:07:17 -07:00
Brad Davis
d42052a299 Fix overlay event handling thread issues 2017-07-28 14:56:21 -07:00
Stephen Birarda
17dd028ec7 make Paths available to desktop and tablet QML context 2017-07-28 14:23:18 -07:00
David Rowe
2a654b3657 Merge branch 'master' into vr-edit-a 2017-07-29 08:34:58 +12:00
Brad Hefta-Gaub
c200d40862 Merge pull request #11063 from nimisha20/patch-2 
Updating with the latest dependency info
 2017-07-28 13:30:28 -07:00
anshuman64
defc76c9cf Merge pull request #11075 from jherico/tablet_scripting_crash 
Fix tablet button crash
 2017-07-28 11:57:27 -07:00
Brad Davis
3d0c13915a Fix tablet button crash 2017-07-28 11:20:57 -07:00
Andrew Meadows
d4e72df928 Merge pull request #10711 from burtsloane/midi 
Midi support for Entities
 2017-07-28 10:51:43 -07:00
utkarshgautamnyu
f407bf6f5a Merge pull request #11064 from highfidelity/bug/6513 
Enabled multiple selection and deletion in Asset Browser
 2017-07-28 09:46:34 -07:00
Chris Collins
20513ccf83 Merge pull request #11069 from jherico/overlay_deadlocks 
Prevent deadlocks from Overlays update logic recursing into other Overlays calls
 2017-07-28 09:25:26 -07:00
Brad Hefta-Gaub
3e1174a4ca Merge pull request #11070 from kencooke/master 
Merge pull request #10987 from SamGondelman/hmd59Crash2
 2017-07-28 08:27:28 -07:00
Chris Collins
4684b388c7 Merge pull request #10987 from SamGondelman/hmd59Crash2 
Fix crash when putting on HMD for Qt 5.9
 2017-07-28 07:41:07 -07:00
Brad Davis
bb57504498 Prevent deadlocks from Overlays update logic recursing into other Overlays calls 2017-07-27 19:39:22 -07:00
David Rowe
c1d179eba1 Add "dominant hand changed" signal 2017-07-28 14:20:49 +12:00