Sam Gateau
|
48d671c6c3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2019-02-07 18:54:19 -08:00 |
|
Sam Gateau
|
466da1bd05
|
Merge pull request #14783 from NissimHadar/20816-installOnAndroid
Case 20816: install on android (Mac and Windows installers)
|
2019-02-07 17:02:40 -08:00 |
|
NissimHadar
|
cf83124968
|
Improved instructions.
|
2019-02-07 14:57:25 -08:00 |
|
NissimHadar
|
c168d31e07
|
Added missing ".
|
2019-02-07 14:52:59 -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 |
|
NissimHadar
|
bab306fd30
|
Added instruction to add Python to path.
|
2019-02-07 14:38:53 -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 |
|
NissimHadar
|
03ad14caaf
|
Removed unneeded step.
|
2019-02-07 14:17:18 -08:00 |
|
NissimHadar
|
f9396fe597
|
Corrected error message.
|
2019-02-07 14:11:59 -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 |
|
Sam Gateau
|
4648c47af8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2019-02-06 18:13:26 -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 |
|
NissimHadar
|
89eff9171e
|
Merge branch '20816-installOnAndroid' of github.com:NissimHadar/hifi into 20816-installOnAndroid
|
2019-02-06 14:29:30 -08:00 |
|
NissimHadar
|
8f09c5b689
|
Updated readme.
|
2019-02-06 14:28:19 -08:00 |
|
Dante Ruiz
|
f07b5c8490
|
update urls
|
2019-02-06 14:25:25 -08:00 |
|
Sam Gateau
|
db30857b87
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-02-06 13:21:34 -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 |
|
Sam Gateau
|
8ec9c8502d
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-02-06 12:09:38 -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 |
|
Sam Gateau
|
d8f6583047
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-02-06 09:01:38 -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 |
|
Sam Gateau
|
35491bf5b0
|
Multisampling works in 4.1
|
2019-02-06 00:05:17 -08:00 |
|
Sam Gateau
|
893bbe3a37
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-02-05 18:02:09 -08:00 |
|
Sam Gateau
|
b1b6533295
|
Restore clear
|
2019-02-05 18:01:41 -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 |
|
NissimHadar
|
e14869ac71
|
Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid
|
2019-02-05 14:10:27 -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 |
|
Sam Gateau
|
59d53bd716
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-02-05 12:20:39 -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 |
|
NissimHadar
|
cc3a74b7a0
|
Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid
|
2019-02-05 09:01:46 -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 |
|
Sam Gateau
|
4089f8c5b0
|
Adding Color filter to the tone mapper
|
2019-02-04 23:45:35 -08:00 |
|
Sam Gateau
|
99251bdd6d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2019-02-04 19:16:14 -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 |
|