Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 03:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
49972 commits 71 branches 56 tags 1.2 GiB
Commit graph

49972 commits

Author SHA1 Message Date
Seth Alves
756d96c368 fix search ray getting left on. started adding stylus models 2017-01-16 07:46:12 -08:00
Seth Alves
e434defc7f Merge pull request from sethalves/tablet-ui 
Tablet ui
 2017-01-16 06:49:15 -08:00
Seth Alves
c2d6bf10d2 hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size 2017-01-16 06:47:50 -08:00
Seth Alves
f0248275ec Merge branch 'load-models-in-keyhole' of github.com:sethalves/hifi into tablet-ui 2017-01-16 06:47:15 -08:00
Seth Alves
050a7e87d2 load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled. 2017-01-15 17:04:51 -08:00
Seth Alves
17b1bdba86 Merge pull request from sethalves/tablet-ui 
Tablet ui grab changes
 2017-01-15 11:31:34 -08:00
Seth Alves
4a451e95dc don't call release when off state is entered. don't attempt to unhook stylus as a stray child 2017-01-15 11:29:29 -08:00
Seth Alves
3b4f5e3023 don't include overlays in results from EntityScriptingInterface::getChildrenIDsOfJoint 2017-01-15 11:27:29 -08:00
Seth Alves
7ab3e60f36 Merge pull request from sethalves/tablet-ui-grab-changes 
Tablet ui grab changes
 2017-01-15 10:18:23 -08:00
Seth Alves
b8234ad75c try a different way of keeping track of original parentIDs of grabbed entities 2017-01-15 10:16:28 -08:00
Seth Alves
36fdaa6350 avoid a little pop when grabbing something with ignore-ik as true 2017-01-15 10:10:54 -08:00
Seth Alves
75db4354fd Merge pull request from sethalves/tablet-ui 
Tablet ui merge from upstream
 2017-01-14 18:01:42 -08:00
Seth Alves
0744a148b1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-14 18:00:09 -08:00
Brad Hefta-Gaub
98699885f4 Merge pull request from kencooke/audio-mixformat-invalid 
Fix audio failures
 2017-01-14 14:53:01 -08:00
Ken Cooke
42e13d1e97 Fix audio failures on systems that return incorrect/unsupported mixFormat 2017-01-14 10:26:13 -08:00
Seth Alves
9fd86de47c Merge pull request from sethalves/tablet-ui 
adjust overlay position so that it shows up on new tablet fbx
 2017-01-13 16:15:48 -08:00
Seth Alves
e46b40e729 adjust overlay position so that it shows up on new tablet fbx 2017-01-13 16:14:12 -08:00
Seth Alves
85104b442f Merge pull request from sethalves/tablet-ui 
auto-end a near-grab if the parentID is changed to something else
 2017-01-13 14:23:13 -08:00
Seth Alves
e00814dd53 auto-end a near-grab if the parentID is changed to something else 2017-01-13 14:21:44 -08:00
samcake
584feef56d Merge pull request from jherico/fbx_parse_optimizations 
Improve FBX parsing performance
 2017-01-13 13:44:54 -08:00
Seth Alves
691fb14883 Merge pull request from sethalves/tablet-ui 
avoid filling log with bogus warning
 2017-01-13 12:01:41 -08:00
Seth Alves
5a81dface9 avoid filling log with bogus warning 2017-01-13 12:00:51 -08:00
Seth Alves
a3620ad9fe Merge pull request from sethalves/tablet-ui-make-market-work-again 
get marketplace-in-tablet working again
 2017-01-13 11:03:21 -08:00
Seth Alves
9430d2a58d get marketplace-in-tablet working again 2017-01-13 11:03:02 -08:00
Seth Alves
e13ccfe556 Merge pull request from sethalves/tablet-ui 
Tablet ui merge from upstream
 2017-01-13 10:17:58 -08:00
Seth Alves
9de8144f0d merge from upstream 2017-01-13 10:17:03 -08:00
Seth Alves
50ad0d881d Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-13 10:15:00 -08:00
Seth Alves
f9a36d68ad Merge pull request from ctrlaltdavid/21127 
Make Clara.io downloads convert textures to PNG
 2017-01-13 10:14:43 -08:00
Seth Alves
bbff372097 Merge pull request from fayeli/tablet-menu-qml 
Rework Context Menu QML to Be Suitable for Tablet
 2017-01-13 09:59:57 -08:00
Seth Alves
481cc47f79 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-13 09:28:18 -08:00
Zach Fox
71f0e02210 Merge pull request from zfox23/PAL_ScrollbarRefinement 
PAL: Scrollbar refinement & visual updates
 2017-01-12 20:41:18 -08:00
Seth Alves
88f3ff7977 Merge pull request from hyperlogic/tablet-ui3 
Prevent crash when closing the tablet while a sound is playing.
 2017-01-12 18:17:53 -08:00
Seth Alves
2d17bb6067 Merge pull request from sethalves/tablet-ui-merge-from-master 
Tablet ui merge from master
 2017-01-12 18:17:40 -08:00
Faye Li Si Fi
834e3af879 checkbox margin and nav hover color 2017-01-12 18:12:13 -08:00
Faye Li Si Fi
10a82ac11f update breadcrumb text as you navigate menus 2017-01-12 17:38:13 -08:00
Anthony J. Thibault
1b4146af6d Prevent crash when closing the tablet while a sound is playing. 2017-01-12 17:23:06 -08:00
Seth Alves
cc4f4ac506 fix merge from upstream 2017-01-12 17:08:14 -08:00
Seth Alves
e9422cbf1e fix model scales 2017-01-12 16:38:27 -08:00
Faye Li Si Fi
54eef26eaa click breadcrumb text to go back to parent menu 2017-01-12 16:33:33 -08:00
Brad Davis
29b160d685 Reduce temp qvariant creation and qvariant conversion 2017-01-12 16:17:03 -08:00
Brad Davis
2383592678 Improve FBX parsing performance by bulk loading of arrays 2017-01-12 16:17:02 -08:00
Faye Li Si Fi
ef699db5be nav bar menu now bring you back to menu root 2017-01-12 16:14:37 -08:00
Seth Alves
5fa379fea2 fix model scales 2017-01-12 16:12:43 -08:00
Faye Li Si Fi
99b6c6f1fd menu icon and breadcrumb text 2017-01-12 15:47:02 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
samcake
90151b67c4 Merge pull request from jherico/min_threadpool 
Reduce min threads in threadpool to 1
 2017-01-12 15:37:17 -08:00
David Rowe
d7ab7316a8 Tidying 2017-01-13 12:28:53 +13:00
David Rowe
ad5822d96d Fix first progress message box not closing 2017-01-13 12:26:42 +13:00
David Rowe
632989e031 Fix progress messages not displaying in HMD 2017-01-13 12:09:22 +13:00
Brad Davis
659badd8bf Change minimum threadpool size 1 2017-01-12 14:43:31 -08:00