Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
75551 commits 2 branches 0 tags 1.1 GiB
Commit graph

75551 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roxanne Skelly
2b40260953 QmlMarketplace - disable HTML for quest 2019-02-05 09:27:12 -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
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
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
Jeff Clinton
e51d23117e
Merge pull request #14767 from jherico/fix/open_mp_dep 
Switch to nvtt with no openmp dependency (remove vcomp140.dll dependency)
 2019-01-28 12:42:56 -08:00
Jeff Clinton
9b09c09aeb
Merge pull request #14770 from sabrina-shanman/hfm_prep_tangents 
(case 20822) Add normal/tangent generation to HFM preparation step
 2019-01-28 12:41:55 -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
Roxanne Skelly
8357f1f9b5 CR fixes 2019-01-28 11:10:35 -08:00
Jeff Clinton
b5a1dc599b
Merge pull request #14725 from SamGondelman/NOverlays11 
Case 20700: Add missing pulse properties to certain Entity types
 2019-01-28 10:51:00 -08:00
Jeff Clinton
f9b63b975d
Merge pull request #14781 from danteruiz/script-print-log 
Case: 20770 allow debug prints in the log by default
 2019-01-28 10:49:18 -08:00
Jamil Akram
bcaad3092b
Merge pull request #14695 from amantley/trumpFix 
Fixed Sinking Trump Avatar Bug: Stops unnecessary vertical re-centering with big-headed avatar
 2019-01-28 10:12:55 -08:00
Seth Alves
15aa574afd
Merge pull request #14774 from danteruiz/window-ontop 
case 20705: Allow log window to stay on top
 2019-01-28 10:05:48 -08:00
Jeff Clinton
a80d842107
Merge pull request #14777 from thoys/fix/create/entityListColumnSortOrder 
MS19766: [CreateApp/Entity List] Default column order, always move empty values to bottom on initial sort of column
 2019-01-28 09:25:33 -08:00
Thijs Wenker
a8f95c8916
Merge pull request #14703 from dback2/avatarExporterImprovements 
Avatar Exporter v0.1 - add bone rules and versioning
 2019-01-28 17:45:33 +01:00
Thijs Wenker
bfb93e67b7 materialRepeat will clamp when disabled. 2019-01-28 16:46:35 +01:00
Thijs Wenker
ef1018c49b - EntityShapeVisualizer.updateSelection -> EntityShapeVisualizer.setEntities (for a more generic use) 
- GridPattern -> Material
- Replaced stringified compare with deep compare
- Copied+modified zone icon (consistent color, removed sharp edges)
 2019-01-28 16:10:29 +01:00
Thijs Wenker
c1eeab6542 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/showZonesInCreate 2019-01-28 14:32:27 +01:00
Shannon Romano
1584311689
Merge pull request #14745 from sabrina-shanman/material-inspector 
(case 20748) Add material inspector to Luci.js
 2019-01-25 17:35:07 -08:00
Shannon Romano
a2b2f3f67c
Merge pull request #14742 from hyperlogic/bug-fix/user-recenter-model-pref 
Settings > Controls > User Recenter Model now saves properly
 2019-01-25 17:34:33 -08:00
Shannon Romano
b9b21b7f87
Merge pull request #14712 from AndrewMeadows/shaped-zones-2 
case 20597: fix zones using FBX models with non-trivial mesh.modelTransform
 2019-01-25 17:33:45 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type 
Added HMD Avatar Alignment Type
 2019-01-25 17:32:41 -08:00
Shannon Romano
fe874ca5b1
Merge pull request #14511 from danteruiz/spinbox-fixes 
case 20100: fix SpinBox.qml in ControlsUit and adjusting OpenVrConfiguration SpinBoxes
 2019-01-25 17:30:16 -08:00
Shannon Romano
fc12975231
Merge pull request #14780 from davidkelly/dk/20362 
Transmit octree string parameters as utf-8 strings
 2019-01-25 17:29:02 -08:00
Shannon Romano
9c582f2870
Merge pull request #14684 from NissimHadar/20550-nitpickInstaller 
Case 20550 - nitpick installer
 2019-01-25 16:42:55 -08:00
Roxanne Skelly
dfac0d88a2 QmlMarketplace - Add 'logged out' behavior, fix issue with search scope 
display
 2019-01-25 16:41:13 -08:00
Adam Smith
e648ce38c0
Merge pull request #14679 from sabrina-shanman/bug_uv-scale 
(case 20096) Fix missing support for UV scaling parameters in FBX files
 2019-01-25 16:21:15 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature 
MS20311: Oculus login feature
 2019-01-25 16:16:32 -08:00
amantley
91fddf783f increased the threshold to stop vertical recentering 2019-01-25 16:09:45 -08:00
Dante Ruiz
db58173977 fix mac issue 2019-01-25 15:10:53 -08:00
amantley
cc4d9e2ae2 Merge remote-tracking branch 'upstream/master' into trumpFix 2019-01-25 15:05:00 -08:00
Clément Brisset
17b8f65d0a
Merge pull request #14773 from Atlante45/fix/corrupted-backups-status 
Add failed backup as corrupted during creation
 2019-01-25 14:46:24 -08:00
SamGondelman
a10f52c66d merge with master 2019-01-25 14:16:07 -08:00
Roxanne Skelly
49e6120e73 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-25 14:06:44 -08:00
Jeff Clinton
d92d256cfc
Merge pull request #14656 from SamGondelman/matFallthrough 
Case 20241: Material entity fallthrough
 2019-01-25 14:01:27 -08:00
Adam Smith
f651ad2f67
Merge pull request #14711 from SamGondelman/NOverlays10 
Case 20585: Add missing Web Overlay functionality to Web Entities
 2019-01-25 14:00:52 -08:00
Wayne Chen
1c6521486e fixing compile errors 2019-01-25 13:56:56 -08:00
Dante Ruiz
4ed54f63ea allow debug prints in the log by default 2019-01-25 13:56:54 -08:00
Roxanne Skelly
6123c4ec96 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-25 13:45:04 -08:00
Roxanne Skelly
ff2d51701e QML Marketplace 
Add keyboard while in search
General cleanup
 2019-01-25 13:41:16 -08:00
Wayne Chen
6f49914167 Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature 2019-01-25 12:19:20 -08:00
Wayne Chen
635c7533b9 more code review feedback 2019-01-25 12:15:38 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature 2019-01-25 11:44:14 -08:00
Wayne Chen
0928b1bff1 code review feedback 2019-01-25 11:36:58 -08:00
Shannon Romano
90c7423dfb
Merge pull request #14772 from wayne-chen/loginScreenPreserveRatio 
MS20825: Login Screen Aspect/Crop with resizing
 2019-01-25 11:16:10 -08:00
Shannon Romano
28edb472fc
Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale 
20565 Avatar::_collideWithOtherAvatars does not scale
 2019-01-25 11:06:36 -08:00