Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 17:33:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
58297 commits 75 branches 59 tags 1.2 GiB
Commit graph

21411 commits

Author SHA1 Message Date
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
Brad Davis
7d18d2e017 Restore corrected touch event simulation 2017-07-29 08:51:51 -07:00
vladest
3c9ab36416 Remove already already implemented fix 2017-07-29 12:00:41 +02:00
vladest
0333849aa8 Merge branch 'master' into fix_menu_landscape 2017-07-29 11:44:58 +02:00
Brad Davis
5946a965da Disable touch event emulation for tablet until we fix crash 2017-07-28 18:54:16 -07: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 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
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
Andrew Meadows
3ec9640ea1 fix calculation of walk motor for HMD 2017-07-28 09:22:47 -07:00
vladest
45934cb53e Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode 2017-07-28 18:04:29 +02: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
Brad Hefta-Gaub
d572510770 Merge pull request #11009 from AndrewMeadows/fix-QueryAACube 
update EntityItem bounding cube when on changed dimensions
 2017-07-27 18:21:06 -07:00
Anthony J. Thibault
6c2b6674bb load and save shoulderConfig to settings. 2017-07-27 17:33:54 -07:00
utkarshgautamnyu
1beec26003 Update TabletAssetServer.qml 2017-07-27 15:55:55 -07:00
utkarshgautamnyu
a6a4bd5923 Update AssetServer.qml 2017-07-27 15:55:30 -07:00
utkarshgautamnyu
07fc9a6dc3 Indentation fixes 2017-07-27 14:53:49 -07:00
utkarshgautamnyu
4680911264 Enabled multiple selection and multiple deletion in asset browser 2017-07-27 14:47:30 -07:00
Brad Hefta-Gaub
9b3be6d164 Merge pull request #10808 from humbletim/21400 
WL 21400 -- Setting that lets you switch from cursor to reticle
 2017-07-27 13:16:58 -07:00
Anthony J. Thibault
bcb4cc32d2 another clang error fix 2017-07-27 10:26:10 -07:00
Anthony J. Thibault
778c8bf9a7 clang build error fix 2017-07-27 10:08:35 -07:00
anshuman64
bcb819206b Merge pull request #11037 from sethalves/bug-camera-mode-mods 
use Qt menu hotkeys to drive camera-mode changes
 2017-07-27 09:44:53 -07:00
Anthony J. Thibault
8f5c41af2d changed _controllerPoseMap from unordered_map to map 2017-07-27 09:44:37 -07:00
Anthony J. Thibault
78c6564174 Merge branch 'master' into feature/secondary-pose-support 2017-07-27 09:09:32 -07:00
Anthony J. Thibault
8dc9714282 Pass armCircumference and shoulderWidth to qml. 2017-07-27 09:08:34 -07:00
Chris Collins
853101fcbc Merge pull request #10928 from 1P-Cusack/21362 
Add point and thumb up gestures to the Vive.
 2017-07-26 22:07:14 -07:00
Zach Fox
8a7561d61b IT'S WORKING SOB SOB SOB 2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357 WHYYYY DOESN'T THIS WORK 2017-07-26 16:14:35 -07:00
Seth Alves
9c9cfad4c4 use ctrl rather than alt to activate camera-mode shortcuts 2017-07-26 15:56:08 -07:00
Seth Alves
71023bcb1b Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods 2017-07-26 15:54:57 -07:00
Zach Fox
3a05219c59 Closer still 2017-07-26 14:10:41 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Zach Fox
65c28ca821 Bugfixes 2017-07-26 13:17:51 -07:00
Zach Fox
62f6c10b2b Renaming things; bugfixes; improvements 2017-07-26 12:45:10 -07:00
Zach Fox
24ddbb4b22 Silly bug preventing the whole thing from working 2017-07-26 12:08:55 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
utkarshgautamnyu
71ddf1e7c1 Removed Compound Collision type 2017-07-26 10:20:17 -07:00
Zach Fox
9020607ccf First pass 2017-07-25 17:54:46 -07:00
utkarshgautamnyu
24f4468fd5 added additional collision types to asset browser in tablet mode 2017-07-25 17:12:13 -07:00
utkarshgautamnyu
65192aa620 added additional collision types to asset browser and new model dialog 2017-07-25 17:12:13 -07:00
Anthony J. Thibault
572213daaf Added shoulder config to Controller Settings UI 
All offset values in Controller Settings UI are now in cm.
 2017-07-25 17:05:07 -07:00
Zach Fox
7702bfceaa Big cleanup and preparation; Actually fix desktop tablet 2017-07-25 16:12:32 -07:00
1P-Cusack
9e25c3b7d8 Renaming 'not' route to 'logicalNot'. 
Build was failing on non-windows platforms because 'not' is a reserved
word in C++ (which Visual Studio happily ignores).
 2017-07-25 14:47:34 -04:00
Zach Fox
c71dca5b4b Missed a magic number 2017-07-25 11:15:44 -07:00
Zach Fox
256b7efdd2 Handle the case when the camera is inside the bounding box of an entity 2017-07-25 11:06:54 -07:00
Zach Fox
40038ce54b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-25 09:33:07 -07:00
Andrew Meadows
9d1fba3a3b Merge pull request #10821 from ctrlaltdavid/21418 
Don't execute body of controllers' plugin update methods if not enabled
 2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6 Merge pull request #11029 from cain-kilgore/dominant-hands 
WL 21453 - Add a "Dominant Hand" setting
 2017-07-25 08:01:31 -07:00
Cain Kilgore
f9204a7034 Now it should appear.. 2017-07-25 09:03:47 +01:00
Cain Kilgore
2f857a6d1a Forgot a file 2017-07-25 06:05:06 +01:00
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01:00
Seth Alves
766c6f48c3 third person camera is alt+G rather than alt+O 2017-07-24 17:43:01 -07:00
Anthony J. Thibault
33a1d6e225 Merge branch 'master' into feature/secondary-pose-support 2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10 Shoulder puck calibration work in progress 
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
 2017-07-24 17:22:48 -07:00
Zach Fox
c22798a8e6 Offset tablet position to left of screen per feedback 2017-07-24 17:16:07 -07:00
Seth Alves
97756e6140 accidently deleted a break 2017-07-24 16:12:03 -07:00
Seth Alves
82a787a753 use alt+h for mirror-mode 2017-07-24 16:04:11 -07:00
Andrew Meadows
8c55476c65 fix motor direction when walking upside down 
also maintain worldUp and remove unnecessary cruft
 2017-07-24 16:00:13 -07:00
Andrew Meadows
f598b1f1f5 fix spelling typo in comment 2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65 move nextAttitude() from AvatarData to MyAvatar 2017-07-24 16:00:13 -07:00
Andrew Meadows
f0871c6878 avoid unnecessary and expensive gets 2017-07-24 16:00:13 -07:00
Seth Alves
e53badf88b use alt+f for 1st person camera and alt+o for 3rd 2017-07-24 15:56:37 -07:00
Cain Kilgore
84609f27e3 Final Change - They're now Radio Boxes. 2017-07-24 23:53:03 +01:00
Seth Alves
afc7eaff8d Merge branch 'bug-camera-mode-mods' of github.com:druiz17/hifi into bug-camera-mode-mods 2017-07-24 15:21:37 -07:00
Cain Kilgore
9c152ddc6f Ticking left will keep it on left, not right 2017-07-24 22:30:43 +01:00
Zach Fox
223ed5b59a Hack to mod tablet orientation when clicking context overlay 2017-07-24 14:29:06 -07:00
humbletim
de6975b227 add missing cursor-*.pngs 2017-07-24 17:16:13 -04:00
Andrew Meadows
a44b33ab11 Merge pull request #11023 from jherico/audio_deadlock 
Fix for audio deadlock & audio device selection
 2017-07-24 14:03:29 -07:00
Cain Kilgore
9ff7891c88 Fixed reference error, Gustavo should build now. 2017-07-24 19:56:02 +01:00
Cain Kilgore
64ba159adf Updating Small Reference 2017-07-24 19:12:14 +01:00
Cain Kilgore
fd2264f7c9 removed duplicate 2017-07-24 19:05:49 +01:00
Cain Kilgore
e6fd85f45a Some code cleanup 2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub
0ba8d43522 Merge pull request #10994 from vladest/avatar_default_speeds 
Change default mouse speeds for avatar
 2017-07-24 10:13:27 -07:00
Stephen Birarda
26be7e1a01 Merge pull request #10999 from birarda/bug/html-path-on-mac-build 
fix create tab load on OS X
 2017-07-24 10:12:40 -07:00
Chris Collins
ceb218f4cc Merge pull request #10798 from humbletim/add-persistent-console-history 
Save JS "Console..." history across sessions
 2017-07-24 09:24:04 -07:00
Cain Kilgore
a4cf27402d Tabs and Cleanup of Code 2017-07-24 06:27:14 +01:00
Cain Kilgore
630922dd95 Dominant Hands Branch Initial Commit 
Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
 2017-07-24 06:18:24 +01:00
humbletim
300b926464 only call QList::constFirst when history list isn't empty 2017-07-23 14:12:52 -04:00
Dante Ruiz
95299244cf fixed running scripts popup 2017-07-22 00:24:24 +01:00
Dante Ruiz
06b4c53d28 only desktop mode 2017-07-22 00:15:26 +01:00
Dante Ruiz
7bf3f45e39 finished the locked default scripts 2017-07-21 23:32:25 +01:00
David Kelly
e7c6ba9ae2 unused var 2017-07-21 14:44:45 -07:00
Zach Fox
811be15bbc Another attmept to fix the tablet 2017-07-21 14:02:19 -07:00
David Kelly
8de09affad Merge pull request #11025 from davidkelly/dk/contextOverlayPositioning 
reposition context overlay when far away
 2017-07-21 13:35:57 -07:00
Zach Fox
796292dd4c Fix the tablet 2017-07-21 13:21:13 -07:00
David Kelly
9e31024a0e merged with new stuff too 2017-07-21 13:16:41 -07:00
vladest
615a3c52e4 Ooops.. 2017-07-21 21:26:33 +02:00
Zach Fox
a346e5ccf6 New inspect icon 2017-07-21 11:56:06 -07:00
Zach Fox
a800f6c05a No magic numbers; Move (i) based on laser hand; Tablet to Tab key 2017-07-21 11:48:19 -07:00
Brad Davis
5b5e94700e Additional audio fixes 2017-07-21 09:52:44 -07:00
Brad Davis
d1c2218a31 Temporary patch for deadlock 2017-07-21 09:52:36 -07:00
Zach Fox
7d125f44e4 Set parentID even when overlay already exists 2017-07-21 09:35:49 -07:00
Dante Ruiz
625b7e535a Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-07-21 17:20:03 +01:00
vladest
33a8ab2d58 Adjusted according discussion in PR 2017-07-21 18:18:23 +02:00
Dante Ruiz
e2359f6bb9 changes api call 2017-07-21 17:15:31 +01:00
vladest
b13cbd5bde Merge branch 'master' into avatar_default_speeds 2017-07-21 17:45:11 +02:00
David Kelly
875d0eb815 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into context-overlays 2017-07-21 07:20:19 -07:00
David Kelly
6db2e2c6c9 Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-21 07:18:33 -07:00
Olivier Prat
7bc7b1eabc Merge branch 'master' of git://github.com/highfidelity/hifi into fade2 2017-07-21 09:27:30 +02:00
Stephen Birarda
7cfdf7d5ae Merge pull request #11000 from highfidelity/bug/6219 
made changes to size of content to display 'choose file' button
 2017-07-20 17:46:15 -07:00
anshuman64
5f3b68d544 Use ctrl+H instead of alt+H 2017-07-20 17:36:02 -07:00
Dante Ruiz
649b974927 mods for changes camera views 2017-07-21 01:01:23 +01:00
Zach Fox
e68f9499fa Add hover/unhover handlers to context overlays 2017-07-20 16:51:00 -07:00
Andrew Meadows
a8dac0cb79 don't send constant updates for grabbed objects 2017-07-20 15:45:50 -07:00
Zach Fox
3698fe9b6b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-20 15:10:06 -07:00
David Kelly
c8015e4eb6 cleanup, fixed build issue 2017-07-20 14:52:58 -07:00
David Kelly
c1de09c7f6 whitespace issue 2017-07-20 14:24:16 -07:00
David Kelly
10503c3a16 registration point 2017-07-20 14:18:07 -07:00
Dante Ruiz
3c862c34b2 disable reload default scripts by default 2017-07-20 21:15:00 +01:00
Zach Fox
e18fec140a Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2 2017-07-20 13:03:34 -07:00
Zach Fox
a1a7ab945a Make dimensions better 2017-07-20 12:58:15 -07:00
Zach Fox
f515a24568 UX improvements 2017-07-20 12:00:13 -07:00
David Kelly
b7be727b4c turn off ContextOverlay for pal, edit. Improve clicks too 2017-07-20 11:30:55 -07:00
David Kelly
0544c1e561 build issue 2017-07-20 08:18:37 -07:00
David Kelly
110efd63c8 enabled property so we can turn it off during edit, etc... 2017-07-20 08:08:49 -07:00
David Kelly
b236a21adc no clicks on 'highlight' overlay 2017-07-20 07:28:45 -07:00
David Kelly
0023832938 simple fixes 2017-07-19 17:38:19 -07:00
David Kelly
ebce1ce9de Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/placeholderHighlighting 2017-07-19 17:13:11 -07:00
Zach Fox
2dce254928 Actually increase target size 2017-07-19 17:11:45 -07:00
David Rowe
091b666d7e Fix noise reduction checkbox not always working 2017-07-20 12:06:19 +12:00
David Kelly
40ec770bc1 Highlight using simple yellow bounding box 2017-07-19 17:06:17 -07:00
Stephen Birarda
3936ee93f0 use default scripts path in EditTabView to fix load on OS X 2017-07-19 16:34:04 -07:00
utkarshgautamnyu
ce5ff23e70 made changes to size of content to dosplay 'choose file' button 2017-07-19 16:15:34 -07:00
David Kelly
920ac17caf minor renaming 2017-07-19 15:46:28 -07:00
David Kelly
5f82a76cc9 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/marketplaceItemsOnly 2017-07-19 15:41:36 -07:00
David Kelly
ecd419e0d3 cr feedback 2017-07-19 15:32:03 -07:00
Zach Fox
4374d4d1e5 Small improvements to overlay 2017-07-19 15:27:48 -07:00
David Kelly
44c9f0e65e Overlay appears only on marketplace items 2017-07-19 15:13:26 -07:00
David Kelly
f0091f16a1 cr feedback 2017-07-19 14:46:10 -07:00
David Kelly
a8ab115b12 Open marketplace when we know the marketplaceID of an entity 2017-07-19 14:11:14 -07:00
Zach Fox
c866bd814d Make clicks work right 2017-07-19 12:24:20 -07:00
Zach Fox
f06ec715f2 Quick bugfix 2017-07-19 09:59:44 -07:00
Zach Fox
1d26a268c1 Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay 2017-07-19 09:53:51 -07:00
Zach Fox
761d35d633 Getting there! 2017-07-18 17:10:23 -07:00
Zach Fox
8f6af3a1ab ContextOverlay 2017-07-18 16:28:24 -07:00
Zach Fox
265f978a06 It's working! 2017-07-18 15:57:26 -07:00
vladest
4b94d24c29 Change default mouse speeds for avatar 2017-07-18 23:51:19 +02:00
Zach Fox
084f4d2ab0 Why were Web3DOverlays done this way? 2017-07-18 14:42:59 -07:00
Zach Fox
2b1a0921da Initial work on clickable overlays 2017-07-18 14:01:16 -07:00
Brad Davis
1aee8f1f4d Ensure we continue calling idle when minimized 2017-07-18 13:44:58 -07:00
Chris Collins
e99683fdcf Merge pull request #10985 from jherico/audio_deadlock 
Trying to resolve QML / Audio deadlocks
 2017-07-18 12:40:03 -07:00
Dante Ruiz
976fec66f8 fixed loading script whitespace 2017-07-18 17:59:42 +01:00
Brad Hefta-Gaub
2dfaf7b02a Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 
Case 5783: Restarting Interface allows you to have Avatar Scale Too Big
 2017-07-18 08:51:13 -07:00
Brad Hefta-Gaub
d94365cc44 Merge pull request #10979 from zfox23/hoverOverlay_lasers 
Create/Destroy Hover Overlays using hand controller lasers
 2017-07-18 08:44:48 -07:00
Brad Hefta-Gaub
a7e328285e Merge pull request #10969 from druiz17/bug/addmodel-textbox 
allow user move the cursor with the mouse for the add model URL textbox
 2017-07-18 08:41:08 -07:00