Ryan Huffman
|
1ff644b619
|
Merge pull request #14256 from ctrlaltdavid/M17008
Fix Interface crash importing JSON with duplicate entity IDs in file
|
2018-11-08 11:04:43 -08:00 |
|
Roxanne Skelly
|
0dc8a798a1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case19373
|
2018-11-08 10:51:21 -08:00 |
|
Jamil Akram
|
7c22a1954c
|
Merge pull request #14237 from NissimHadar/addNoLogin
case 18450: Do not show login dialog if requested not to on the command line.
|
2018-11-08 10:43:21 -08:00 |
|
Roxanne Skelly
|
04a3d6f098
|
Merge branch 'master' of https://github.com/highfidelity/hifi into SetupLogging
|
2018-11-08 10:35:07 -08:00 |
|
Jeff Clinton
|
62e3e87ba6
|
Merge pull request #14325 from huffman/fix/new-model-dynamic
Fix new models not obeying dynamic checkbox
|
2018-11-08 10:22:12 -08:00 |
|
Jeff Clinton
|
30ff3f676a
|
Merge pull request #14310 from thoys/fix/create/tooltips-refinement
Create APP tooltip / Adressed CR comments / Regression
|
2018-11-08 10:03:17 -08:00 |
|
Dante Ruiz
|
358aa547b1
|
feedback changes
|
2018-11-08 09:58:53 -08:00 |
|
Dante Ruiz
|
f664421fe0
|
addressing code review feedback
|
2018-11-08 09:58:53 -08:00 |
|
Dante Ruiz
|
501746b156
|
3D Keyboard
|
2018-11-08 09:58:53 -08:00 |
|
Zach Fox
|
b97fd6eb95
|
Merge pull request #14255 from zfox23/textToSpeech
Text to Speech App
|
2018-11-08 09:44:59 -08:00 |
|
Jeff Clinton
|
49bf01294a
|
Merge pull request #14320 from huffman/fix/default-collision-values
Update the default edit.js collidesWith to include myAvatar
|
2018-11-08 09:17:40 -08:00 |
|
Clement
|
ef54a63de6
|
Use uint8_t instead of bool on the wire
|
2018-11-07 17:54:49 -08:00 |
|
Clement
|
8f763dfd50
|
Fix bug and crash in solo logic
|
2018-11-07 17:46:18 -08:00 |
|
Sam Gateau
|
4489efa58b
|
Merge pull request #14346 from AndrewMeadows/fix-crash-19654
Case 19654: fix crash in btCollisionWorld::updateSingleAabb()
|
2018-11-07 16:09:36 -08:00 |
|
Shannon Romano
|
7e96ceb222
|
Merge pull request #14254 from samcake/black-bis
Case 19140: Clean up Luci ui to aggregate more tools
|
2018-11-07 15:10:48 -08:00 |
|
Zach Fox
|
cee1454f6e
|
CR feedback - thanks Ken!
|
2018-11-07 15:09:53 -08:00 |
|
SamGondelman
|
d316fe15ce
|
fix tablet culling
|
2018-11-07 15:02:32 -08:00 |
|
Zach Fox
|
48d3450c5a
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-11-07 14:59:23 -08:00 |
|
Zach Fox
|
3cbaec818d
|
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug
Fix MS19743: Fix case where user couldn't update certain items
|
2018-11-07 14:57:35 -08:00 |
|
Jeff Clinton
|
e507e91bfd
|
Merge pull request #14227 from ElderOrb/FB19396
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…
|
2018-11-07 13:36:41 -08:00 |
|
sam gateau
|
c40ded598d
|
REmoving any attempt to fix anything in this pr
|
2018-11-07 12:18:52 -08:00 |
|
sam gateau
|
9ada9a7ad3
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-11-07 12:07:15 -08:00 |
|
sabrina-shanman
|
4d9c20343a
|
Link shared library in hfm
|
2018-11-07 11:44:58 -08:00 |
|
Clement
|
65a83cb026
|
Resend solo nodes on mixer reconnect
|
2018-11-07 11:41:04 -08:00 |
|
Jeff Clinton
|
63bf077776
|
Merge pull request #14263 from ElderOrb/better_imports_for_controls_and_styles
Better imports for controls and styles
|
2018-11-07 11:19:55 -08:00 |
|
Sam Gateau
|
e6cd9a4ffa
|
Merge pull request #14301 from NissimHadar/fixPath
case 19636 - Make path to VCPKG relative to ENV variable
|
2018-11-07 10:58:56 -08:00 |
|
Sam Gateau
|
e28560a9c7
|
Merge pull request #14311 from SamGondelman/interstitial
Case 19682: Disable interstitial on android
|
2018-11-07 10:47:31 -08:00 |
|
Sam Gateau
|
d15c8a8854
|
Merge pull request #14313 from SamGondelman/macFix
Case 19686: Possibly fix mac debug deferred issue
|
2018-11-07 10:33:41 -08:00 |
|
Sam Gateau
|
8cda3f729b
|
Merge pull request #14316 from AndrewMeadows/workload-views-include-MyAvatar
Case 19394: always keep entities near MyAvatar in physics simulation
|
2018-11-07 10:26:47 -08:00 |
|
Sam Gateau
|
5d0be31fe7
|
Merge pull request #14354 from SamGondelman/deadlock
Case 19735: Fix ResourceCache mutex issues
|
2018-11-07 09:55:41 -08:00 |
|
sabrina-shanman
|
2c94d1f620
|
Fix hfm not linking in script-engine for Android build
|
2018-11-07 09:24:42 -08:00 |
|
sabrina-shanman
|
8b37133875
|
Remove unnecessary draco dependency from hfm library
|
2018-11-06 17:10:44 -08:00 |
|
sabrina-shanman
|
906fc1a425
|
Fix Android build not linking hfm library
|
2018-11-06 16:38:36 -08:00 |
|
Zach Fox
|
8776028259
|
Prepend "root" to "currentUpdatesPage"
|
2018-11-06 16:10:49 -08:00 |
|
Zach Fox
|
f22bbff505
|
Fix MS19743: Fix case where user couldn't update certain items
|
2018-11-06 15:47:47 -08:00 |
|
sabrina-shanman
|
e654ff9bbc
|
Remove forward declaration in HFM.h so ModelPackager and other things can use it instead
|
2018-11-06 14:53:23 -08:00 |
|
sabrina-shanman
|
70c9db38ef
|
Do not reference HFM inside the hfm namespace
|
2018-11-06 14:13:48 -08:00 |
|
sabrina-shanman
|
8fa72396ef
|
Consolidate HFM class implementations into source file and move model
logging.
|
2018-11-06 14:05:36 -08:00 |
|
Clement
|
b8cb433fa1
|
Spelling
|
2018-11-06 13:39:36 -08:00 |
|
Clement
|
beb575a88d
|
Don't attenuate soloed nodes.
|
2018-11-06 13:39:24 -08:00 |
|
Clement
|
0ca0a6f3be
|
Fix JSDoc arrays
|
2018-11-06 12:57:17 -08:00 |
|
Zach Fox
|
378bf911d4
|
Fix another build error
|
2018-11-06 12:48:17 -08:00 |
|
Clement
|
4e802b0f3f
|
Add JSDoc comments
|
2018-11-06 11:59:15 -08:00 |
|
SamGondelman
|
1444b3a186
|
resource mutex issues
(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
|
2018-11-06 11:57:57 -08:00 |
|
sabrina-shanman
|
1a69afb3e8
|
Move HFM.h to hfm subfolder per convention
|
2018-11-06 11:43:19 -08:00 |
|
Zach Fox
|
c33f9b6ea3
|
Fix build error
|
2018-11-06 11:26:09 -08:00 |
|
Zach Fox
|
53742e90f5
|
Cleanup after merge
|
2018-11-06 10:30:10 -08:00 |
|
Zach Fox
|
58dd690c0a
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-11-06 10:29:05 -08:00 |
|
luiscuenca
|
0f1b12475e
|
Use clamp
|
2018-11-06 10:15:17 -07:00 |
|
luiscuenca
|
0f183b409b
|
Fix warnings
|
2018-11-06 10:08:06 -07:00 |
|