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

58795 commits

This branch
This branch
All branches
Author SHA1 Message Date
LaShonda Hopper
24b6cd71fc [Case 6107] Fixes Tablet import sorting (details below). 
This ports the fix from FileDialog to TabletFileDialog.

* There appears to be 2 versions of this file:
    * qml/dialogs/TabletFileDialog.qml
    * qml/hifi/tablet/tabletWindows/TabletFileDialog.qml

Testing the tablet within desktop mode works without this fix most
likely because it uses qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
which didn't receive the same refactor pass via d3282a4e.

Tested on Vive:  Menu -> Edit -> Import Entities

Changes Committed:
	modified:   interface/resources/qml/dialogs/TabletFileDialog.qml
 2017-09-14 14:49:49 -04:00
LaShonda Hopper
33c8e90e34 [QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below). 
Looking through the log revealed the following warning:
".../qml/dialogs/FileDialog.qml:489: Error: Cannot assign to non-existent property 'sortOrder'"

There was some refactoring to address some HMD functionality in 51b44d90
which resulted in an update to fileTableView's model.  This appears to be the point
at which sorting stopped working.

This updates the fileTableView's sorting methods to use fileTableModel as opposed
to fileTableView's model(filesModel).  This appears safe given fileTableModel internally wraps
around filesModel and is responsible for updating its value.  I'm relatively new
to QML/Qt; any comments or suggestions are welcome.

Tagging @vladest since they may want to be aware given 51b44d90.

Case Link:
https://highfidelity.fogbugz.com/f/cases/6107

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/resources/qml/dialogs/FileDialog.qml
 2017-09-13 16:25:36 -04:00
Andrew Meadows
5741699bab Merge pull request #11301 from Menithal/21484-Fix 
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
 2017-09-13 08:05:53 -07:00
Dante Ruiz
bf32f65efe Merge pull request #11341 from vladest/flickable_off 
Flickable off
 2017-09-12 13:09:06 -07:00
vladest
92a83328c0 Follow naming convention 2017-09-12 19:17:49 +02:00
vladest
08deba35ae Take in account current WebEngine profile to make sure all features are in place, like download 2017-09-12 16:22:53 +02:00
vladest
17a923b9de Temporarily disable WebView flickable until new solution will be investigated 2017-09-12 15:48:47 +02:00
anshuman64
996277b34c Merge pull request #11335 from vladest/menu_fix 
Make sure root item is created before lambda gets called for desktop …
 2017-09-11 12:47:40 -07:00
vladest
34c1cb6579 Typos and naming fixes 2017-09-11 19:42:05 +02:00
Menithal
40d339a831 21484: Updated code to go with PR feedback 2017-09-11 20:36:29 +03:00
Howard Stearns
54deef8f32 Merge pull request #11329 from davidkelly/dk/walletSSLFix 
fix wallet for new openssl
 2017-09-11 10:07:12 -07:00
Andrew Meadows
a9feca18ca Merge pull request #11317 from vladest/fix_flickable_on_wheel 
Add flickable on mouse wheel to web pages
 2017-09-11 09:32:31 -07:00
Andrew Meadows
ce3ed68861 Merge pull request #11333 from ctrlaltdavid/faster-fade-in 
Reduce entity fade-in time
 2017-09-11 09:29:45 -07:00
Chris Collins
47a9337aa7 Merge pull request #11323 from jherico/mac_fixes 
Mac fixes
 2017-09-11 09:10:50 -07:00
Andrew Meadows
1f766f743d Merge pull request #11293 from jherico/fix_hmd_menu 
Fix access to menu on background thread
 2017-09-11 08:26:04 -07:00
Andrew Meadows
f7ca6a45b6 Merge pull request #11299 from jherico/cleanup_cmake 
Cleanup CMake
 2017-09-11 08:21:30 -07:00
vladest
dfaa8761e5 Make sure root item is created before lambda gets called for desktop loader 2017-09-10 20:08:40 +02:00
David Rowe
6ba6c6ee35 Reduce entity fade-in time 2017-09-09 18:00:21 +12:00
David Kelly
1903f65e45 oops 2017-09-08 16:58:12 -07:00
Seth Alves
f5d77104c3 Merge pull request #11332 from sethalves/squelch-cannot-render 
suppress repeated 'item could not be rendered' messages
 2017-09-08 16:23:22 -07:00
David Kelly
0a3958f743 cr feedback 2017-09-08 16:06:30 -07:00
Anthony Thibault
3de518a843 Merge pull request #11331 from hyperlogic/bug-fix/unexpected-t-pose 
Fix MyAvatar getting stuck in T-pose on loading
 2017-09-08 15:18:57 -07:00
Seth Alves
967d3f69d3 suppress repeated 'item could not be rendered' messages 2017-09-08 14:13:58 -07:00
David Kelly
99cdbbe306 and lets fix the purchases flow too 2017-09-08 14:00:09 -07:00
David Kelly
c142215935 oops -- this is a windows-only thing (like so many other problems) 2017-09-08 12:52:12 -07:00
Sam Gateau
ed8aa8b74d Merge pull request #11160 from Zvork/outline 
Outline effect
 2017-09-08 12:32:01 -07:00
David Kelly
3e0b222ec4 fix wallet for new openssl 2017-09-08 11:44:19 -07:00
Anthony J. Thibault
559ac6786d Fix MyAvatar getting stuck in T-pose on loading 
Before this change, there was a race condition between the main thread calling Model::initWhenReady,
and the render thread calling Avatar::fixupModelsInScene().  They both would end up setting the
Model::_addedToScene flag.  This race caused Model::initWhenReady() to never return true, which
resulted in the MyAvatar class never initializing the animation system.
 2017-09-08 11:44:06 -07:00
Bradley Austin Davis
48b6586d01 Modifying SDL initialization due to crash on OSX 2017-09-08 11:36:32 -07:00
David Kelly
db0ecb61fd Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework 
Use new hfc account endpoint
 2017-09-08 09:03:53 -07:00
David Kelly
45c8dd9dd4 cr feedback 2017-09-08 05:28:41 -07:00
Olivier Prat
d6d36cbd43 Outline working on voxels 2017-09-08 11:14:06 +02:00
David Kelly
bb07a586ca warning, plus salting passphrase now 2017-09-07 19:24:31 -07:00
David Kelly
efdc340c5c Use new hfc account endpoint 2017-09-07 18:15:04 -07:00
Melissa Brown
cb2911f3e0 Merge pull request #11305 from cain-kilgore/delete-test-plan 
Deleted unnecessary Test Plan 2.docx
 2017-09-07 16:59:53 -07:00
Bradley Austin Davis
eb8b892571 Various Mac fixes 2017-09-07 14:45:35 -07:00
Bradley Austin Davis
37b184d982 Fix crashes in entity rendering on OSX 2017-09-07 14:32:50 -07:00
Brad Hefta-Gaub
ca00349abc Merge pull request #11248 from birarda/feat/install-remember-custom 
remember if express or custom was selected for install
 2017-09-07 12:43:01 -07:00
Brad Hefta-Gaub
6a1fe81832 Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002 
split packet construction from packet sending in OctreeSendThread
 2017-09-07 12:36:29 -07:00
Brad Hefta-Gaub
b316f366fc Merge pull request #11198 from druiz17/oculus-tablet-position 
fixed tablet spawn position for oculus menu button
 2017-09-07 12:30:33 -07:00
Thijs Wenker
e2229b3c38 Merge pull request #11302 from cain-kilgore/21523 
WL 21523 - Update text in the "How to Quit The Sandbox" Prompt
 2017-09-07 21:04:34 +02:00
Chris Collins
12d720805c Merge pull request #11319 from jherico/async_qml_load_crash 
Fix potential crash on asynchronous QML loads
 2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub
c5098abfb9 Merge pull request #10937 from kencooke/zzmp-audio/peak-values 
Add peak values for all input devices in selection dialog
 2017-09-07 11:58:50 -07:00
Brad Hefta-Gaub
3b16ebcc90 Merge pull request #11287 from jherico/vcpkg_ssl 
Migrate to vcpkg version of OpenSSL
 2017-09-07 11:53:09 -07:00
Brad Hefta-Gaub
7cce45017b Merge pull request #11244 from birarda/bug/ice-dns-fail 
add a timeout for ICE server DNS lookup
 2017-09-07 11:09:05 -07:00
Cain Kilgore
84f37b9663 Changed string name 2017-09-07 18:53:05 +01:00
Brad Hefta-Gaub
fce8715457 Merge pull request #11306 from ElderOrb/case7385 
7385 - Collect Stats on "Exit VR" button
 2017-09-07 10:18:58 -07:00
Olivier Prat
7fb7ebca57 Fixed warning on Mac 2017-09-07 19:03:22 +02:00
Brad Davis
cc3beb3d91 Fix potential crash on asynchronous QML loads 2017-09-07 09:53:21 -07:00
Olivier Prat
6b5ca0c6ce Optimized by removing unnecessary Z buffer copy 2017-09-07 18:33:00 +02:00