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

22016 commits

Author SHA1 Message Date
vladest
10f7f08171 Added peak model, missed during merging 2017-09-19 21:42:52 +02:00
vladest
6297448e90 Build fix 2017-09-19 19:49:19 +02:00
vladest
6c32783a09 Merge branch 'master' into audio_devices_split 2017-09-19 17:43:03 +02:00
Cain Kilgore
dbe7cc5d1a 21540 - Make Rotation using Vive Controller Work 2017-09-18 23:38:38 +01:00
Elisa Lupin-Jimenez
a41aced032 Merge pull request #11390 from elisa-lj11/master 
Fixed blocks download issue with `noDownload=false` tag
 2017-09-18 13:23:47 -07:00
Anthony J. Thibault
7e2b2960ed Fix for lighting as IPD scale changes. 
(cherry picked from commit a260aaaae8)
 2017-09-18 12:15:32 -07:00
Elisa Lupin-Jimenez
a45cc88e55 Fixed blocks download issue with noDownload=false tag 2017-09-18 11:41:30 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
vladest
1cde504c74 Memleak fix. Cleanup 2017-09-16 22:57:26 +02:00
vladest
a8d24d9161 Cleanup 2017-09-16 22:41:18 +02:00
vladest
5585265349 Merge branch 'master' into modal_dialogs_async 2017-09-16 22:06:49 +02:00
vladest
3ceeb0d83e Rework all c++ calls 2017-09-16 22:04:53 +02:00
Seth Alves
765031bf89 Merge pull request #11377 from vladest/create_resize 
Add resizable flag. Use the flag for Create only
 2017-09-16 11:14:40 -07:00
Seth Alves
04b99ef8a5 Merge pull request #11352 from 1P-Cusack/FogBugz/Case_6107 
[QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below).
 2017-09-16 11:08:59 -07:00
beholder
871b169128 6618 [Worklist] Add Input Field On Top of Keyboard 2017-09-16 16:17:36 +03:00
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
Sam Gateau
512e9432ed Merge pull request #11370 from samcake/blue-bis 
Fixing the web surface of the tablet
 2017-09-15 15:36:55 -07:00
Atlante45
a37642ba44 Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 14:43:15 -07:00
samcake
524c94cdd4 Adding more comments for future fixmes 2017-09-15 14:35:45 -07:00
Atlante45
c4d018504b Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 13:28:51 -07:00
Anthony Thibault
c7fc45e0ae Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering 
Avatar Attachments now render correctly
 2017-09-15 13:28:00 -07:00
vladest
de4f34aacb Add resizable flag. Use the flag for Create only 2017-09-15 21:49:38 +02:00
Seth Alves
d968bbad6c Merge pull request #11364 from sethalves/rework-scriptengine-lifetime 
Rework scriptengine lifetime
 2017-09-15 12:17:51 -07:00
samcake
c687932ca7 One more: 2017-09-15 11:44:35 -07:00
Atlante45
8711823a9b Sync up AssetServer.qml and TabletAssetServer.qml 2017-09-15 11:44:08 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
samcake
19cd537e65 addressing review comments 2017-09-15 11:10:25 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Cain Kilgore
67a5c75a0d Doesn't need to be here anymore 2017-09-15 06:08:22 +01:00
Cain Kilgore
0526d32802 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-15 06:05:43 +01:00
Cain Kilgore
c2e342ddac Gravity Implementation 2017-09-15 06:03:56 +01:00
Sam Gateau
30bf800963 Cleanup 2017-09-14 20:33:08 -07:00
samcake
ec7536db2c Brining the changes just to fix the tablet issue 2017-09-14 18:36:20 -07:00
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
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
Seth Alves
10494cf3e0 Merge pull request #11359 from vladest/fix_runningscripts_selection 
use selection model of TreeView
 2017-09-14 11:22:08 -07:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
Seth Alves
11df5a447e Merge pull request #11310 from ElderOrb/case6718 
6718 PR11082: Help text cannot be dismissed by clicking on the text i…
 2017-09-14 11:17:48 -07:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
vladest
2f86658308 Move Tablet becomes toolbar menu from General to Developer menu 2017-09-14 16:37:02 +02:00
vladest
7233c47257 use selection model of TreeView 2017-09-14 15:36:12 +02:00
Anthony J. Thibault
8fb69a9867 Merge branch 'master' into feature/ant-man 2017-09-13 18:23:11 -07:00
Cain Kilgore
f741083352 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-14 00:25:53 +01:00
Cain Kilgore
72ca62c4af Initial Commit - more to do. 2017-09-14 00:25:11 +01: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
Melissa Brown
49ab8af428 Merge pull request #11344 from Menithal/21536 
21536: Clap App!
 2017-09-13 12:54:31 -07:00
Atlante45
c04a6b5b88 Add error tooltip 2017-09-13 09:54:56 -07:00
Atlante45
2e84f48539 Fix QML errors 2017-09-13 09:54:55 -07:00
Atlante45
9f2b0258e9 Update baking status with the correct checkmark glyph 2017-09-13 09:54:55 -07:00
Atlante45
944a4fd49d Update hifi glyphs + font reference 2017-09-13 09:54:55 -07:00
Atlante45
7d9daea0f6 Transmit baking errors to interface for display. 2017-09-13 09:54:54 -07:00
David Kelly
bce92a622e cr feedback 2017-09-13 09:45:02 -07:00
David Kelly
7550374f8f Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet 2017-09-13 04:49:13 -07:00
SamGondelman
a955381726 Merge remote-tracking branch 'upstream/master' into textAA 2017-09-12 16:50:16 -07:00
SamGondelman
1b85a453ab working on text3d overlays and entities 2017-09-12 16:49:51 -07:00
druiz17
cc7bb9a1bf Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man 2017-09-12 13:16:03 -07:00
Menithal
ca2d22a192 Updated Scripts 2017-09-12 21:22:40 +03:00
David Kelly
187ed71a8a more cleanup, plus now keyfile associated with user directly 2017-09-12 10:55:27 -07:00
vladest
92a83328c0 Follow naming convention 2017-09-12 19:17:49 +02:00
David Kelly
61e8458d13 some cleanup 2017-09-12 08:08:41 -07: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
David Kelly
5c12403b7c first working pass at single file. Cleanup needed 2017-09-11 16:40:21 -07:00
Anthony J. Thibault
b81f85e1ae Merge branch 'master' into feature/ant-man 2017-09-11 15:14:03 -07:00
Menithal
30c979bd31 Added Clap App to Repository 
Addede Clap App Icons to tablet icons (there needs to be another way to
do this than link directly to link or use this method!)
Added module as valid global to eslintrc
 2017-09-11 23:48:30 +03:00
David Kelly
4acbc2bfba Just write the image file in the format we will use later 2017-09-11 13:03:21 -07: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
Chris Collins
47a9337aa7 Merge pull request #11323 from jherico/mac_fixes 
Mac fixes
 2017-09-11 09:10:50 -07:00
David Kelly
1903f65e45 oops 2017-09-08 16:58:12 -07:00
David Kelly
0a3958f743 cr feedback 2017-09-08 16:06:30 -07:00
Anthony J. Thibault
72e0c844e4 Merge branch 'master' into feature/ant-man 2017-09-08 14:08:26 -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
David Kelly
3e0b222ec4 fix wallet for new openssl 2017-09-08 11:44:19 -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
Daniela
758f049f30 Correct offset for teleport pad. 2017-09-08 14:02:26 +01:00
David Kelly
45c8dd9dd4 cr feedback 2017-09-08 05:28:41 -07:00
Daniela
10e29d1cf0 Decrease offset for teleport pad. Add Bubble orientation and scale correction. 2017-09-08 12:45:29 +01:00
Daniela
fde5e14c04 Merge branch 'feature/ant-man' of https://github.com/hyperlogic/hifi into feature/ant-man 2017-09-08 11:54:43 +01:00
Daniela
9eb429b25a Fix offset for teleport pad. 2017-09-08 11:23:19 +01: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
Anthony J. Thibault
7ca498dc7f Entities created from Google Blocks zip files now are positioned/scaled relative to the avatar. 2017-09-07 16:28:08 -07:00
Anthony J. Thibault
f4f9c29bff Fix for avatar scale preferences 2017-09-07 15:30:16 -07:00
Anthony J. Thibault
d0f9a20a01 Fix for tablet grabbing at small scales 2017-09-07 15:10:15 -07:00
Bradley Austin Davis
eb8b892571 Various Mac fixes 2017-09-07 14:45:35 -07:00
Stephen Birarda
7859b3b11f remove image compression choices from Interface settings 2017-09-07 12:07:57 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07: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
Daniela
d11a749365 Refactor 1 line. Pad alignment is correct. 2017-09-07 19:28:36 +01:00
Daniela
94e26a554d Add 180 degrees rotation so that pad faces the avatar 2017-09-07 18:48:20 +01:00
Brad Davis
cc3beb3d91 Fix potential crash on asynchronous QML loads 2017-09-07 09:53:21 -07:00
Daniela
4c302b899d Fix teleport pad alignment 2017-09-07 17:52:09 +01:00
Daniela
3ff707f27e Add Avatar resize compatible teleport pad alignment 2017-09-07 13:31:41 +01:00
Howard Stearns
a0ae9ee747 Merge pull request #11311 from davidkelly/dk/walletCleanup 
wallet cleanup
 2017-09-06 14:29:24 -07:00
anshuman64
94e1545e58 Merge pull request #11298 from ElderOrb/case7382 
7382 Create Menu does not Work on Tablet
 2017-09-06 14:09:41 -07:00
vladest
31a23acb1a Add flickable on mouse wheel to web pages 2017-09-06 23:04:58 +02:00
Daniela
37f959d749 Add Avatar resize compatible teleport pad alignment 2017-09-06 19:45:58 +01:00