Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
...
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
SamGondelman
b418e43ef2
ctrlaltdavid's minitablet fix
2019-02-12 13:15:58 -08:00
Sam Gateau
afb6c838eb
REverting all the changes from the brown branch not used
2019-02-11 20:13:37 -08:00
Sam Gateau
8a4f7fe2b6
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-02-11 18:57:33 -08:00
SamGondelman
a9767e4c22
working on mini tablet
2019-02-11 15:46:29 -08:00
Ryan Huffman
16b48046c6
Fix not being able to type text into particle url field
2019-02-11 15:27:30 -08:00
SamGondelman
f53ccf7363
fix create, working on mini tablet
2019-02-11 14:54:53 -08:00
SamGondelman
d988de4a17
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-11 10:27:12 -08:00
Brad Hefta-Gaub
8faff57033
Merge pull request #14830 from thoys/fix/create/zoneShapeVisualizersIgnorePickray
...
MS20909: ignore pickRay for zone shape visualizers
2019-02-08 19:12:58 -08:00
John Conklin II
b46fb7cfe7
Merge pull request #14860 from thoys/fix/create/entityListUnderscoreFirstSorting
...
Case 19385: local compare in entity list sorting
2019-02-08 14:56:32 -08:00
Sam Gateau
48d671c6c3
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-02-07 18:54:19 -08:00
SamGondelman
e74ff18bef
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:48:13 -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
Dante Ruiz
f07b5c8490
update urls
2019-02-06 14:25:25 -08:00
Sam Gateau
8ec9c8502d
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-02-06 12:09:38 -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
Thijs Wenker
2247dd3471
local compare in entity list sorting
2019-02-06 18:24:40 +01:00
Sam Gateau
d8f6583047
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-02-06 09:01:38 -08:00
Sam Gateau
35491bf5b0
Multisampling works in 4.1
2019-02-06 00:05:17 -08:00
danteruiz
30bd9774b2
script engine to load platform specific files
2019-02-05 13:11:54 -08:00
Sam Gateau
4089f8c5b0
Adding Color filter to the tone mapper
2019-02-04 23:45:35 -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
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
SamGondelman
c6080d0795
fix edit selection + log problem
2019-02-01 14:37:42 -08:00
SamGondelman
ba8320f561
fix 2d overlay deletion
2019-02-01 14:31:26 -08:00
SamGondelman
b80d2a9b06
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-01 13:33:04 -08:00
Thijs Wenker
80f5cbc8ab
also ignore picking on the material entity
2019-01-31 22:14:15 +01:00
Thijs Wenker
15066faaf7
ignore pickRay for zone shape visualizers
2019-01-31 19:45:29 +01:00
SamGondelman
7d47bfa2e4
david's comments
2019-01-30 11:50:32 -08:00
SamGondelman
834e44dd3a
make polyline's with faceCamera not depend on normal
2019-01-30 11:02:24 -08:00
Ryan Huffman
9c8e21ec6b
Merge pull request #14806 from thoys/fix/create/mismatchingEntityHostTypeChildren
...
MS20893 [CreateApp] Ignore children of mismatching entityHostTypes
2019-01-30 09:55:39 -08:00
Thijs Wenker
132d293c3c
skip child entities of mismatching entityHostType when copy/delete/duplication of entities
2019-01-30 03:15:32 +01:00
Roxanne Skelly
0fdbca8ade
QmlMarketplace Bugfixes
...
* Fix upgrades
* Certificate 'View in Marketplace' wasn't working
* command-line hifiapp:MARKET wasn't launching
* Home link wasn't disappearing where it should
* Log In button on marketplace wasn't working
* Other minor UI bugfixes
2019-01-29 16:07:27 -08:00
Jeff Clinton
08a3e65f66
Merge pull request #14789 from danteruiz/recenter-hmd-log-window
...
Case 20771: Make sure that the script log is in the correct location when switching to and from HMD
2019-01-29 13:03:43 -08:00
SamGondelman
9aae9d13f6
fix tablet home button
2019-01-28 22:19:31 -08:00
SamGondelman
a8dbe5e761
working on build errors
2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a
showKeyboardFocusHighlight + fixes
2019-01-28 20:43:47 -08:00
SamGondelman
0d1e4bed66
merge with master
2019-01-28 18:13:05 -08:00
SamGondelman
445608e163
fix entity selection tool
2019-01-28 15:30:19 -08:00
Roxanne Skelly
a4d105f24f
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-28 15:17:08 -08:00
Roxanne Skelly
2fe78383ed
QmlMarketplace - Fix issues found during test
...
* command line --url hifiapp:MARKET was not bringing up correct
marketplace
* Search field was not being cleared when 'home' button was clicked
after a search
* tablet button was not lit when marketplace was launched
2019-01-28 15:14:49 -08:00
Shannon Romano
1aa6221f57
Merge pull request #14779 from thoys/fix/create/AddMissingMaterialTooltips
...
MS20333: [CreateApp] add missing Material Entity tooltips
2019-01-28 14:18:46 -08:00
Dante Ruiz
20d933ce6e
recenter log window when enter and exiting hmd mode
2019-01-28 13:58:29 -08:00
John Conklin II
c95b681092
Merge pull request #14696 from thoys/feat/create/showZonesInCreate
...
MS20292 - [CreateApp] Make it easier to see zones while you're editing them
2019-01-28 11:41:42 -08:00
Jeff Clinton
9d09c777d2
Merge pull request #14778 from thoys/fix/create/ignoreScriptedKeyEventsFromJSONEditor
...
MS20501 [CreateApp/Properties] ignore scripted key events from the JSON Editors
2019-01-28 11:40:48 -08:00
Thijs Wenker
b75c4ae3b6
fix spelling
2019-01-28 20:26:04 +01:00
Roxanne Skelly
d3cffa50d6
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-28 11:11:28 -08:00
