Ryan Huffman
|
32122a7c1f
|
Replace magic numbers with RAIL_AXIS_LENGTH
|
2018-07-20 11:37:42 -07:00 |
|
Ryan Huffman
|
25b558e6b4
|
Fix xz guides not showing when translating with Shift
|
2018-07-19 12:56:18 -07:00 |
|
Qliemillar
|
566c837bba
|
Merge pull request #13631 from ElderOrb/avatarapp-combobox-fix
fix 'the drop down does not shows the wearable'
|
2018-07-19 12:23:48 -06:00 |
|
Howard Stearns
|
2378cdfdc6
|
Merge pull request #13624 from howard-stearns/app-refactor4-merge
appUi module, and use in People app
|
2018-07-19 11:07:54 -07:00 |
|
Qliemillar
|
3466d944fb
|
Merge pull request #13630 from huffman/fix/create-undo-while-disabled-visual
Disable showing the entity edit tools when undoing while disabled
|
2018-07-19 09:03:40 -06:00 |
|
Stephen Birarda
|
6257d5618a
|
Merge pull request #13640 from birarda/bug/404-bad-agent-requests-master
404 malformed agent script requests
|
2018-07-18 16:41:14 -07:00 |
|
Wayne Chen
|
37131d75e9
|
Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537
MS16537: Updating "Forgot Username/Forgot Password" behavior
|
2018-07-18 16:32:55 -07:00 |
|
Howard Stearns
|
084a4338ff
|
Merge pull request #13633 from howard-stearns/pre-fectch-infinite-scroll-items
pre-fetch infinite scroll pages before reaching the end
|
2018-07-18 16:18:19 -07:00 |
|
Stephen Birarda
|
499aa4ad13
|
404 malformed agent script requests, check doc root
|
2018-07-18 15:22:45 -07:00 |
|
howard-stearns
|
a904182cc2
|
cr feedback
|
2018-07-18 14:03:26 -07:00 |
|
Thijs Wenker
|
b29044fd7e
|
Merge pull request #13618 from dback2/clickHandleSwitchEntityFix
Fix quickly clicking an edit handle causing selected entity change
|
2018-07-18 22:49:11 +02:00 |
|
howard-stearns
|
74914ffb3e
|
Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge
|
2018-07-18 13:16:50 -07:00 |
|
howard-stearns
|
0a47672d64
|
machinery for fetching next page of inifinite scroll before it really
needed, and use in our infinite scrolls
|
2018-07-18 13:00:03 -07:00 |
|
Ryan Huffman
|
b015845371
|
Disable showing the entity edit tools when undoing while disabled
|
2018-07-18 11:54:40 -07:00 |
|
Alexander Ivash
|
fe96ad2389
|
fix 'the drop down does not shows the wearable'
|
2018-07-18 21:16:47 +03:00 |
|
Wayne Chen
|
0cbcae9181
|
reverting onLinkActivated brackets
|
2018-07-18 10:44:37 -07:00 |
|
Howard Stearns
|
db212a0c99
|
Merge pull request #13625 from zfox23/MS16802_openGlyph
Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button
|
2018-07-18 10:12:47 -07:00 |
|
Wayne Chen
|
c104e95ef4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537
|
2018-07-18 09:06:22 -07:00 |
|
Zach Fox
|
919bfce7ab
|
Simplify
|
2018-07-18 09:00:01 -07:00 |
|
Qliemillar
|
080d664341
|
Merge pull request #13619 from luiscuenca/handTouchDisabler
Allow creators to disable hand touch from javascript
|
2018-07-18 08:16:37 -06:00 |
|
luiscuenca
|
e3594fe1b7
|
mutex added
|
2018-07-17 17:23:03 -07:00 |
|
Wayne Chen
|
3b7f88a4a8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537
|
2018-07-17 17:08:43 -07:00 |
|
luiscuenca
|
ba884f8a94
|
Forgotten coment
|
2018-07-17 16:42:59 -07:00 |
|
luiscuenca
|
6225435385
|
some ortographic fixes
|
2018-07-17 16:38:34 -07:00 |
|
luiscuenca
|
fcb7614f7e
|
Format and fixes
|
2018-07-17 16:34:30 -07:00 |
|
Zach Fox
|
ef4265de4b
|
Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button
|
2018-07-17 16:16:43 -07:00 |
|
Qliemillar
|
07a7bbbcf6
|
Merge pull request #13621 from thoys/fix/create/desktop-tablet#master
[FIX] Use create app in tablet mode when choosing to use tablet in desktop mode
|
2018-07-17 14:36:55 -06:00 |
|
howard-stearns
|
bfd9e208b5
|
Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge
|
2018-07-17 12:31:18 -07:00 |
|
Seth Alves
|
c67904b1a2
|
Merge pull request #13615 from luiscuenca/glTFPathFixes
glTF importer fixes (Corruption while reading .bin files and allows loading local files)
|
2018-07-17 12:19:58 -07:00 |
|
qliacoombs
|
db109589f6
|
Merge pull request #13535 from huffman/fix/asset-server-corrupt-mappings
Fix potential map.json corruption in Asset Server
|
2018-07-17 13:11:43 -06:00 |
|
Qliemillar
|
17ddf37510
|
Merge pull request #12656 from ElderOrb/oven_windows_fix
Fix inability to 'bake' models on Windows
|
2018-07-17 09:42:46 -06:00 |
|
Thijs Wenker
|
09e1090e72
|
Use create app in tablet mode when choosing to use tablet in desktop mode
|
2018-07-17 17:33:13 +02:00 |
|
Qliemillar
|
d498d6bb3d
|
Merge pull request #13617 from amantley/rotateRecenter
Reduce Frequent Flipping of Avatar Facing Direction By Resetting _headControllerFacingMovingAverage
|
2018-07-17 08:57:24 -06:00 |
|
Qliemillar
|
42daa33d11
|
Merge pull request #13560 from danteruiz/fix-parent-grab-and-flickering
fix parent grab dropping and cullig flickering when flying at high velocities
|
2018-07-17 08:53:41 -06:00 |
|
luiscuenca
|
82a3b73de8
|
Added disable hand touch for entityID
|
2018-07-17 07:06:48 -07:00 |
|
howard-stearns
|
cb5ac6f42c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into app-refactor4-merge
|
2018-07-16 17:43:53 -07:00 |
|
luiscuenca
|
84dac94379
|
Allow creator to disable hand touch
|
2018-07-16 17:03:50 -07:00 |
|
Zach Fox
|
7cdb84ee68
|
Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup
Fix MS16562: Massive PAL speedup!
|
2018-07-16 16:45:01 -07:00 |
|
howard-stearns
|
2c92b02b95
|
lint
|
2018-07-16 16:28:44 -07:00 |
|
howard-stearns
|
f1fed37763
|
cleanup
|
2018-07-16 15:58:01 -07:00 |
|
howard-stearns
|
4e6aa34814
|
Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4
|
2018-07-16 13:07:08 -07:00 |
|
howard-stearns
|
ffa5259319
|
cleanup references to button, tablet
|
2018-07-16 13:06:12 -07:00 |
|
howard-stearns
|
46061a2a15
|
initial with pal
|
2018-07-16 11:54:05 -07:00 |
|
Dante Ruiz
|
20a8275343
|
min diff
|
2018-07-16 11:43:29 -07:00 |
|
Dante Ruiz
|
fa2b975e8f
|
undo some wrong changes
|
2018-07-16 11:42:38 -07:00 |
|
Dante Ruiz
|
0fa2a71d0f
|
actually fix requested changes
|
2018-07-16 11:35:53 -07:00 |
|
amantley
|
abb2c7ef14
|
Added reset of the _headControllerFacingMovingAverage in MyAvatar.cpp prePhysicsUpdate(). This stops some of the flipping back and forth that has been happening with rotational recenter.
|
2018-07-16 11:29:49 -07:00 |
|
Zach Fox
|
ac2351e49f
|
Make JSDoc happy
|
2018-07-16 11:00:27 -07:00 |
|
Dante Ruiz
|
d81420542c
|
making PR requests
|
2018-07-16 11:00:27 -07:00 |
|
Qliemillar
|
43435bdeae
|
Merge pull request #13609 from Cristo86/android_refresh_domains
Android - Refresh domains list with swipe
|
2018-07-16 11:59:14 -06:00 |
|