Matt Hardcastle
79bf26ee27
Add prebuild metrics logging for CI system
...
Metric about the times various parts of the build take are great to
have. This change takes us a step in that direction by adding metrics to
the prebuild step of the build process. These metrics are off by
default; use the `--ci-build` option of `prebuild.py` to enable them.
2019-02-07 16:37:54 -08:00
Jeff Clinton
54109deab9
Merge pull request #14825 from SamGondelman/fall
...
Case 20829: Always fall when flying is not allowed
2019-02-07 14:39:46 -08:00
John Conklin II
dda310c0b9
Merge pull request #14835 from SamGondelman/textures
...
Case 20944: Fix Model textures property
2019-02-07 14:19:01 -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
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
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
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
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
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
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
Roxanne Skelly
1840f874ab
Add Attributions to Qml Marketplace
2019-02-04 13:29:06 -08:00
Jamil Akram
bab411e001
Merge pull request #14822 from hyperlogic/bug-fix/anim-tests-work-again
...
Make Animation Unit Tests Pass Again
2019-02-04 12:45:12 -08:00
Andrew Meadows
1d7265f668
trust the data in the packet, Luke
2019-02-04 09:45:06 -08:00
Roxanne Skelly
39ad36a4d0
QmlMarketplace - bugfixes and Markup rendering of descriptions
...
* Render markup in descriptions (bold, italic, quote, etc.)
* Back button from marketplaces list now works properly
* Layout fixes
2019-02-01 15:27:17 -08:00
Dante Ruiz
f4118213b1
give tablet root color
2019-02-01 10:12:04 -08:00
Jeff Clinton
1239ca086d
Merge pull request #14831 from danteruiz/the-spot
...
Case 20942: Goto the spot on first launch (80.0/master)
2019-01-31 14:15:24 -08:00
SamGondelman
ee1552661c
fix textures
2019-01-31 12:04:46 -08:00
Dante Ruiz
778ddad9ac
to the spot on first launch
2019-01-31 10:52:48 -08:00
SamGondelman
2d0c1184e4
only domain zone entities control flying and ghosting
2019-01-30 18:27:17 -08:00
SamGondelman
5553752d81
fall when flying not allowed
2019-01-30 18:04:44 -08:00
Clement
283dabc622
Fix reload mechanic for entity server scripts
2019-01-30 17:29:28 -08:00
Anthony Thibault
2c40b120ca
Make Animation Tests Pass Again
2019-01-30 17:26:52 -08:00
SamGondelman
6e61c02d04
fix getEntityProperties
2019-01-30 17:17:39 -08:00
Howard Stearns
75c1bdbf0d
Merge pull request #14812 from SimonWalton-HiFi/avatar-data-packet-overrun
...
80.0/master: Fix small miscalculation in space requirements for serialized avatar-data
2019-01-30 17:00:12 -08:00
Brad Davis
9714271a2a
Migrate shutdown hack applied to QtActivity to InterfaceActivity
2019-01-30 16:23:22 -08:00
Bradley Austin Davis
2db5bbd381
Fix mac frame player
2019-01-30 16:23:22 -08:00
Brad Davis
3866c7568c
Update dockerfile
2019-01-30 16:23:22 -08:00
Brad Davis
eb0566b94e
Fix signing configs
2019-01-30 16:23:22 -08:00
Brad Davis
67cf08e8ae
Quest frame player
2019-01-30 16:23:22 -08:00
