Brad Davis
|
bfda7d73c1
|
Fix frame player
|
2019-02-15 16:39:36 -08:00 |
|
danteruiz
|
b00746c096
|
Trim picks in use during quest:
|
2019-02-15 16:24:17 -08:00 |
|
SamGondelman
|
0f33d696d2
|
trying to fix pal colors
|
2019-02-15 16:12:36 -08:00 |
|
Brad Davis
|
02a95b599d
|
fix extra shadergen args
|
2019-02-15 15:57:19 -08:00 |
|
John Conklin II
|
e77cdfc0d2
|
Merge pull request #14936 from sabrina-shanman/bug_gltf_mat-support
(case 21231) Fix GLTF materials
|
2019-02-15 15:43:31 -08:00 |
|
John Conklin II
|
4520236873
|
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor
Case 21012: Avatar Doctor
|
2019-02-15 15:43:18 -08:00 |
|
amantley
|
95530e6ba5
|
removed the unnecessary animArmIK.h and .cpp
|
2019-02-15 15:41:23 -08:00 |
|
Howard Stearns
|
f16eb1c029
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 15:15:13 -08:00 |
|
amantley
|
36093926d0
|
added fake android defines for running the new ik on pc
|
2019-02-15 15:00:39 -08:00 |
|
Thijs Wenker
|
e900d3784b
|
fixes
|
2019-02-15 23:58:42 +01:00 |
|
sabrina-shanman
|
bb123cfe3b
|
Fix GLTF materials
|
2019-02-15 14:51:29 -08:00 |
|
SamGondelman
|
3df231f1e0
|
it's working!
|
2019-02-15 14:43:22 -08:00 |
|
amerhifi
|
6ea941e4a8
|
Merge pull request #8 from highfidelity/feature/quest
Feature/quest
|
2019-02-15 14:40:45 -08:00 |
|
Brad Davis
|
00ed86d1cf
|
fixing typo
|
2019-02-15 14:34:40 -08:00 |
|
Brad Davis
|
f896623404
|
Fix prebuild crash if can't find git binary (such as when running under Android Studio)
|
2019-02-15 14:30:54 -08:00 |
|
amerhifi
|
0fa0b07577
|
Merge pull request #7 from highfidelity/feature/quest
Feature/quest
|
2019-02-15 14:26:44 -08:00 |
|
John Conklin II
|
3969a0433e
|
Merge pull request #14920 from NissimHadar/21193-updateNitpickReadme
Case 21193: update nitpick readme
|
2019-02-15 14:23:13 -08:00 |
|
Brad Davis
|
51884155ee
|
Support Android app-specific extensions in shaders
|
2019-02-15 14:16:58 -08:00 |
|
John Conklin II
|
09d8221582
|
Merge pull request #14834 from gcalero/connection_failure_dialog
Case 20936: Set message dialog text width so wrap mode takes effect
|
2019-02-15 14:16:02 -08:00 |
|
Brad Davis
|
578bc4fc89
|
Suppress logspam with missing Controller in QML
|
2019-02-15 14:15:24 -08:00 |
|
ingerjm0
|
c8791841de
|
Merge pull request #14918 from ctrlaltdavid/M21128
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc
|
2019-02-15 14:15:13 -08:00 |
|
John Conklin II
|
c7a6902e93
|
Merge pull request #14881 from dback2/avatarExporterTextures
Case 20613: Avatar Exporter v0.2 - copy external textures
|
2019-02-15 14:14:05 -08:00 |
|
Brad Davis
|
5030bbd2cf
|
Update Oculus platform SDK
|
2019-02-15 14:12:52 -08:00 |
|
Brad Davis
|
78be935e1a
|
Consolidating differences from master
|
2019-02-15 14:12:37 -08:00 |
|
Sam Gateau
|
70c085dfab
|
Merge pull request #14928 from jherico/fix/android_release_apk
Fix android release build APK
|
2019-02-15 14:11:51 -08:00 |
|
Brad Davis
|
4409e59682
|
Add per-android-app preprocessor macros
|
2019-02-15 14:11:26 -08:00 |
|
amantley
|
3f9b761e42
|
updating the android only if defs
|
2019-02-15 14:05:42 -08:00 |
|
Roxanne Skelly
|
a82385200e
|
Merge pull request #14906 from roxanneskelly/QmlMarketplace
Qml marketplace - multiple improvements/bugfixes
|
2019-02-15 14:04:47 -08:00 |
|
Andrew Meadows
|
7872da6b97
|
Merge pull request #14915 from samcake/brown
Case 21190: Introducing msaa to forward renderer
|
2019-02-15 13:48:33 -08:00 |
|
John Conklin II
|
b9356e22d8
|
Merge pull request #14927 from huffman/fix/hide-asset-browser
Case 16349: Fix asset browser being hidden in incorrect way on server switch
|
2019-02-15 13:32:27 -08:00 |
|
David Back
|
348ac3167f
|
move failed bone rules call, add get texture directory
|
2019-02-15 12:58:30 -08:00 |
|
SamGondelman
|
c92b82e744
|
merge with master
|
2019-02-15 12:43:30 -08:00 |
|
Roxanne Skelly
|
1154414a07
|
remove unneeded marketplaceInject.js
|
2019-02-15 12:36:35 -08:00 |
|
Roxanne Skelly
|
6d38dcbfad
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
|
2019-02-15 12:33:44 -08:00 |
|
Roxanne Skelly
|
2c4f485079
|
QmlMarketplace invert arrow direction on sort.
|
2019-02-15 12:31:01 -08:00 |
|
Thijs Wenker
|
74ce98a075
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor
|
2019-02-15 20:57:20 +01:00 |
|
Thijs Wenker
|
556a55ff16
|
Better scale and texture checks
|
2019-02-15 20:55:27 +01:00 |
|
SamGondelman
|
87ab255115
|
finish moving materials to rendering
|
2019-02-15 11:49:20 -08:00 |
|
Sam Gateau
|
6edf7e7907
|
Merge pull request #14931 from jherico/fix/vive_crash
Case 21230: Fix crash in vive and interleaved stereo plugins
|
2019-02-15 11:41:03 -08:00 |
|
Brad Davis
|
a5f84ab51a
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 11:37:13 -08:00 |
|
luiscuenca
|
b670f72e84
|
fix warning on linux
|
2019-02-15 12:35:17 -07:00 |
|
Roxanne Skelly
|
fb524f8900
|
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
|
2019-02-15 11:35:06 -08:00 |
|
John Conklin II
|
7008330641
|
Merge pull request #14921 from NissimHadar/fixMacError
Compilation error on Qt 5.12
|
2019-02-15 11:28:55 -08:00 |
|
David Back
|
158e255319
|
Merge pull request #14902 from huffman/fix/duplicating-grabbed-entities
Case 21029: Fix duplicating non-dynamic grabbed entities in edit.js
|
2019-02-15 11:25:42 -08:00 |
|
John Conklin II
|
5f0db88a20
|
Merge pull request #14914 from raveenajain/gltf_tangents
Case 21165: tangent attribute
|
2019-02-15 11:24:21 -08:00 |
|
Sam Gateau
|
5e9eeccb95
|
Merge pull request #14930 from NissimHadar/fixCMake
Case 21241: Fix CMake problem for ubuntu build of nitpick
|
2019-02-15 11:23:58 -08:00 |
|
Sam Gondelman
|
9aa99f24f0
|
Merge pull request #14905 from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
|
2019-02-15 11:21:51 -08:00 |
|
Brad Davis
|
a786a832d9
|
Fix android release build APK
|
2019-02-15 11:10:30 -08:00 |
|
SamGondelman
|
25b31cfc72
|
merge with master
|
2019-02-15 11:08:24 -08:00 |
|
Clément Brisset
|
3c60aaff96
|
Merge pull request #14922 from AndrewMeadows/avoid-entity-update-storm
Case 21232: avoid entity update storm from entity-server
|
2019-02-15 11:01:08 -08:00 |
|