Wayne Chen
|
28ab4096d0
|
optimizing ctor/dtor
|
2019-01-28 14:44:00 -08:00 |
|
Wayne Chen
|
e4c3011a0b
|
only init platform if oculus store is running
|
2019-01-28 14:37:18 -08:00 |
|
Wayne Chen
|
0f1aebea82
|
adding init/shutdown for plugin init
|
2019-01-28 14:35:41 -08:00 |
|
Wayne Chen
|
c06f2f337e
|
adding code for if oculus is running
|
2019-01-28 14:20:03 -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 |
|
luiscuenca
|
1b75f569b3
|
fix jsdoc
|
2019-01-28 15:02:10 -07:00 |
|
Dante Ruiz
|
20d933ce6e
|
recenter log window when enter and exiting hmd mode
|
2019-01-28 13:58:29 -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 |
|
Gabriel Calero
|
1d1ae90e8e
|
Merge remote-tracking branch 'upstream/master' into display_name_and_avatar
|
2019-01-28 17:39:59 -03:00 |
|
luiscuenca
|
2a1f1a4855
|
Remove debug logging
|
2019-01-28 12:55:36 -07: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 |
|
SamGondelman
|
13cb70a6a5
|
Merge remote-tracking branch 'upstream/master' into NOverlays12
|
2019-01-28 11:37:15 -08:00 |
|
Thijs Wenker
|
b75c4ae3b6
|
fix spelling
|
2019-01-28 20:26:04 +01:00 |
|
Wayne Chen
|
09770920a8
|
only initialize plugin if oculus store starting
|
2019-01-28 11:12:12 -08: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 |
|
raveenajain
|
e112bf19cb
|
gltf color attribute
|
2019-01-28 11:08:09 -08:00 |
|
luiscuenca
|
cc73649ef8
|
Merge branch 'master' into multiSphereAvatar04
|
2019-01-28 11:57:04 -07:00 |
|
luiscuenca
|
49659f0039
|
Fix error on exit and jointsToFilter param removed
|
2019-01-28 11:55:53 -07: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 |
|
Andrew Meadows
|
f2b9f088b4
|
fix bad comparison causing undeleted grabs
|
2019-01-28 08:58:57 -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 |
|
NissimHadar
|
f248beba9f
|
Added device description + running Interface.
|
2019-01-27 23:43:07 -08:00 |
|
Sam Gondelman
|
4d83c7f6df
|
fix line rendering mode
|
2019-01-27 00:02:06 -08:00 |
|
NissimHadar
|
94d741480c
|
Added missing SSL dll's
|
2019-01-26 14:59:30 -08:00 |
|
NissimHadar
|
bee86235a3
|
Corrected error message.
|
2019-01-26 09:52:58 -08:00 |
|
NissimHadar
|
d91bca54f0
|
Merge branch '20816-installOnAndroid' of github.com:NissimHadar/hifi into 20816-installOnAndroid
|
2019-01-25 23:22:15 -08:00 |
|
NissimHadar
|
8223e046c8
|
Eliminate silly gcc warnings.
|
2019-01-25 21:41:00 -08:00 |
|
NissimHadar
|
e9ffa05b4b
|
Eliminate silly gcc warnings.
|
2019-01-25 20:27:23 -08:00 |
|
NissimHadar
|
7a957d829c
|
Missing files.
|
2019-01-25 19:36:06 -08:00 |
|
NissimHadar
|
8871621372
|
Removed duplicated folder.
|
2019-01-25 18:26:29 -08:00 |
|
NissimHadar
|
a2bae0b329
|
Fixing merge issues.
|
2019-01-25 18:15:26 -08:00 |
|
NissimHadar
|
79f096fb7e
|
Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid
|
2019-01-25 18:02:59 -08: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 |
|
NissimHadar
|
ce90b62c3e
|
Testing APK installation.
|
2019-01-25 16:48:29 -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 |
|