amerhifi
|
ef655cd243
|
removed junk
|
2019-02-11 10:38:10 -08:00 |
|
amerhifi
|
e6366eaf02
|
consolidated the OculusAcitivity into OCulusMobilieAcitivity to reduce amount of back and forth between super and base as well as remove reduntant calls to native. Moved setcontentView on the native callback becuase it was blocking QtActivity from finishing its initialization
|
2019-02-11 09:46:06 -08:00 |
|
amerhifi
|
e8a35c63c7
|
moved asset loading to the permissions screen, added the onNotifyAppLoaded signal connect function as well as binding to the qtread with the ui thread.
|
2019-02-08 13:45:53 -08:00 |
|
amerhifi
|
8848d0210a
|
stuff
|
2019-02-08 00:27:25 -08:00 |
|
amerhifi
|
dade8e9e7a
|
moving all the qtactivity code to OculusActivity due to lost reference when switching from MAin to Quest
|
2019-02-07 23:22:15 -08:00 |
|
Brad Davis
|
070fb25b80
|
Cleaning up differnces from master
|
2019-02-07 13:33:28 -08:00 |
|
Bradley Austin Davis
|
23d7c0fb70
|
Merge pull request #14869 from danteruiz/feature/quest
Master into Feature/quest
|
2019-02-07 11:04:49 -08:00 |
|
danteruiz
|
95d30e5cbf
|
Merge branch 'master' of github.com:highfidelity/hifi into feature/quest
|
2019-02-07 10:41:44 -08:00 |
|
Sam Gateau
|
632d6e8a73
|
Merge pull request #14863 from danteruiz/android-apps-directories
Case 20877: Support CMake time configuration of QmlFileSelectors
|
2019-02-07 09:30:49 -08:00 |
|
Bradley Austin Davis
|
b8906c3c40
|
Merge pull request #14867 from samcake/quest6
Quest addressing the low resolution
|
2019-02-06 17:19:42 -08:00 |
|
Sam Gateau
|
29573aaa83
|
fix the half resoolution problem
|
2019-02-06 16:41:23 -08:00 |
|
Shannon Romano
|
6fd480e51d
|
Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2
case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around
|
2019-02-06 15:52:31 -08:00 |
|
Jeff Clinton
|
2c666aed5e
|
Merge pull request #14821 from SamGondelman/owningAvatarID
Case 20932: Fix getEntityProperties
|
2019-02-06 14:43:31 -08:00 |
|
Dante Ruiz
|
f07b5c8490
|
update urls
|
2019-02-06 14:25:25 -08:00 |
|
Brad Davis
|
8b70f1771e
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-06 13:16:22 -08:00 |
|
Sam Gateau
|
9ff9117a34
|
Merge pull request #14811 from jherico/feature/quest_frame_player
Case 20884: Quest frame player and Oculus libraries
|
2019-02-06 13:15:39 -08:00 |
|
Brad Davis
|
b40595b14f
|
Fix merge issue
|
2019-02-06 13:06:04 -08:00 |
|
Brad Davis
|
3331a8ad43
|
Removing signing configs for frame player apps
|
2019-02-06 13:00:49 -08:00 |
|
Shannon Romano
|
6a91b54261
|
Merge pull request #14856 from AndrewMeadows/fix-crash-on-early-shutdown-redux
case 21042: fix interface crash on early shutdown, 0.80.0 redux
|
2019-02-06 11:53:49 -08:00 |
|
Shannon Romano
|
30a6f25b69
|
Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor
case 20048: don't allow MyAvatar to move until physics enabled
|
2019-02-06 11:52:42 -08:00 |
|
danteruiz
|
d0fecac0d8
|
+android -> +android_interface
|
2019-02-06 11:37:52 -08:00 |
|
Shannon Romano
|
61459d5756
|
Merge pull request #14775 from roxanneskelly/QmlMarketplace
Qml marketplace
|
2019-02-06 11:20:49 -08:00 |
|
Shannon Romano
|
26927aaec6
|
Merge pull request #14847 from AndrewMeadows/trust-the-packet
Case 20959: fix crash for incorrect parsing of AvatarEntity data
|
2019-02-06 11:15:13 -08:00 |
|
Brad Davis
|
19be752361
|
Merge remote-tracking branch 'origin/feature/quest_frame_player' into feature/quest
|
2019-02-06 10:29:07 -08:00 |
|
Brad Davis
|
91e18f569b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-06 10:15:36 -08:00 |
|
Bradley Austin Davis
|
a622f43099
|
Merge pull request #14861 from danteruiz/unused
remove initialized variable
|
2019-02-06 10:01:34 -08:00 |
|
Dante Ruiz
|
6c9d15d9a9
|
remove used variable
|
2019-02-06 09:58:02 -08:00 |
|
Bradley Austin Davis
|
41a07af790
|
Merge pull request #14859 from danteruiz/fix-quest-controllers
Make sure that the quest controllers are connected after initialization
|
2019-02-06 09:31:46 -08:00 |
|
Dante Ruiz
|
aa645af744
|
fix quest controllers
|
2019-02-06 09:19:36 -08:00 |
|
John Conklin II
|
3ee412faf7
|
Merge pull request #14854 from danteruiz/quest-default
Case 21037: Allow the script engine to use FileSeclector when loading scriopts
|
2019-02-06 07:21:03 -08:00 |
|
Andrew Meadows
|
16ef30ced0
|
don't flushRepeatedMessages() in LogHandler dtor
|
2019-02-05 17:14:25 -08:00 |
|
John Conklin II
|
ae6672533c
|
Merge pull request #14788 from jherico/feature/quest_gpu_timers
Case 20876: Quest: Support gpu timing on systems with disjoint timer extension
|
2019-02-05 14:49:40 -08:00 |
|
John Conklin II
|
ec0bdba7fb
|
Merge pull request #14814 from sethalves/fix-edit-in-releaseGrab
case 20919: Fix edit in release grab
|
2019-02-05 14:48:59 -08:00 |
|
Sam Gateau
|
6b1baed30f
|
Merge pull request #14844 from highfidelity/feature/questLifeCycle
case 21032: Feature/quest life cycle
|
2019-02-05 14:36:13 -08:00 |
|
danteruiz
|
30bd9774b2
|
script engine to load platform specific files
|
2019-02-05 13:11:54 -08:00 |
|
Jeff Clinton
|
35608c35de
|
Merge pull request #14808 from danteruiz/webengine-fileselector
Case 20879: Migrate webEngine referencing QML into +webengine folder
|
2019-02-05 12:57:38 -08:00 |
|
Roxanne Skelly
|
d3bc536b58
|
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
|
2019-02-05 11:35:28 -08:00 |
|
amerhifi
|
1daf2bbed4
|
renamed to match others
|
2019-02-05 11:15:57 -08:00 |
|
amerhifi
|
944f4c96ae
|
New build file for Quest
new build file specific to the quest device
|
2019-02-05 11:14:52 -08:00 |
|
Andrew Meadows
|
cbd83f972c
|
remove unsued variable
|
2019-02-05 10:17:10 -08:00 |
|
Roxanne Skelly
|
2b40260953
|
QmlMarketplace - disable HTML for quest
|
2019-02-05 09:27:12 -08:00 |
|
Brad Hefta-Gaub
|
936837c886
|
Merge pull request #14823 from Atlante45/fix/scripts-load-fail-master
[master] Fix reload mechanic for entity server scripts
|
2019-02-05 09:19:56 -08:00 |
|
Andrew Meadows
|
e50892b3d2
|
MyAvatar is unmovable until physics is enabled
|
2019-02-05 09:00:48 -08:00 |
|
Andrew Meadows
|
5a4960b300
|
add crash::doAssert() for debug purposes
|
2019-02-05 09:00:48 -08:00 |
|
Roxanne Skelly
|
364a1698fe
|
QmlMarketplace - Height of Marketplace Item was improperly calcualted with attributions
|
2019-02-04 17:24:30 -08:00 |
|
Jamil Akram
|
35c0af0bf3
|
Merge pull request #14818 from wayne-chen/oculusLoginFeature
MS20925: Oculus login button not appearing
|
2019-02-04 17:20:07 -08:00 |
|
Roxanne Skelly
|
db9b44a71a
|
QmlMarketplace - The QML Text object has sufficient markup to handle
all of our needs, so use that instead of webengineview
|
2019-02-04 15:30:53 -08:00 |
|
Roxanne Skelly
|
78aa1783a0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
|
2019-02-04 15:04:55 -08:00 |
|
Roxanne Skelly
|
e23c589de7
|
QmlMarketplace - fix issue with footer not appearing in marketplaces list
|
2019-02-04 15:04:18 -08:00 |
|
John Conklin II
|
46fc19e101
|
Merge pull request #14840 from danteruiz/tablet-root-color
Case 20973: Fix SendAsset.qml has wrong color
|
2019-02-04 14:27:19 -08:00 |
|