David Kelly
030b39050a
Merge pull request #11343 from davidkelly/dk/oneFileWallet
...
Wallet updates
2017-09-13 11:15:03 -07:00
Andrew Meadows
50b94887fa
Merge pull request #11339 from ElderOrb/case7469
...
7469 Mouse Pointer Depth is Incorrect in HMD Mode
2017-09-13 08:33:09 -07:00
Andrew Meadows
5741699bab
Merge pull request #11301 from Menithal/21484-Fix
...
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
2017-09-13 08:05:53 -07:00
David Kelly
7550374f8f
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet
2017-09-13 04:49:13 -07:00
David Kelly
187ed71a8a
more cleanup, plus now keyfile associated with user directly
2017-09-12 10:55:27 -07:00
beholder
deee6aab1a
7469 Mouse Pointer Depth is Incorrect in HMD Mode
2017-09-12 04:24:18 +03:00
anshuman64
996277b34c
Merge pull request #11335 from vladest/menu_fix
...
Make sure root item is created before lambda gets called for desktop …
2017-09-11 12:47:40 -07:00
vladest
34c1cb6579
Typos and naming fixes
2017-09-11 19:42:05 +02:00
Menithal
40d339a831
21484: Updated code to go with PR feedback
2017-09-11 20:36:29 +03:00
Andrew Meadows
ce3ed68861
Merge pull request #11333 from ctrlaltdavid/faster-fade-in
...
Reduce entity fade-in time
2017-09-11 09:29:45 -07:00
Chris Collins
47a9337aa7
Merge pull request #11323 from jherico/mac_fixes
...
Mac fixes
2017-09-11 09:10:50 -07:00
Andrew Meadows
1f766f743d
Merge pull request #11293 from jherico/fix_hmd_menu
...
Fix access to menu on background thread
2017-09-11 08:26:04 -07:00
vladest
dfaa8761e5
Make sure root item is created before lambda gets called for desktop loader
2017-09-10 20:08:40 +02:00
David Rowe
6ba6c6ee35
Reduce entity fade-in time
2017-09-09 18:00:21 +12:00
Seth Alves
f5d77104c3
Merge pull request #11332 from sethalves/squelch-cannot-render
...
suppress repeated 'item could not be rendered' messages
2017-09-08 16:23:22 -07:00
Anthony Thibault
3de518a843
Merge pull request #11331 from hyperlogic/bug-fix/unexpected-t-pose
...
Fix MyAvatar getting stuck in T-pose on loading
2017-09-08 15:18:57 -07:00
Seth Alves
967d3f69d3
suppress repeated 'item could not be rendered' messages
2017-09-08 14:13:58 -07:00
Sam Gateau
ed8aa8b74d
Merge pull request #11160 from Zvork/outline
...
Outline effect
2017-09-08 12:32:01 -07:00
Anthony J. Thibault
559ac6786d
Fix MyAvatar getting stuck in T-pose on loading
...
Before this change, there was a race condition between the main thread calling Model::initWhenReady,
and the render thread calling Avatar::fixupModelsInScene(). They both would end up setting the
Model::_addedToScene flag. This race caused Model::initWhenReady() to never return true, which
resulted in the MyAvatar class never initializing the animation system.
2017-09-08 11:44:06 -07:00
Olivier Prat
d6d36cbd43
Outline working on voxels
2017-09-08 11:14:06 +02:00
Bradley Austin Davis
eb8b892571
Various Mac fixes
2017-09-07 14:45:35 -07:00
Bradley Austin Davis
37b184d982
Fix crashes in entity rendering on OSX
2017-09-07 14:32:50 -07:00
Brad Hefta-Gaub
6a1fe81832
Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002
...
split packet construction from packet sending in OctreeSendThread
2017-09-07 12:36:29 -07:00
Chris Collins
12d720805c
Merge pull request #11319 from jherico/async_qml_load_crash
...
Fix potential crash on asynchronous QML loads
2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub
c5098abfb9
Merge pull request #10937 from kencooke/zzmp-audio/peak-values
...
Add peak values for all input devices in selection dialog
2017-09-07 11:58:50 -07:00
Olivier Prat
7fb7ebca57
Fixed warning on Mac
2017-09-07 19:03:22 +02:00
Brad Davis
cc3beb3d91
Fix potential crash on asynchronous QML loads
2017-09-07 09:53:21 -07:00
Olivier Prat
6b5ca0c6ce
Optimized by removing unnecessary Z buffer copy
2017-09-07 18:33:00 +02:00
Olivier Prat
2003495166
Adjustments to half texel fix
2017-09-07 12:30:20 +02:00
Olivier Prat
b43514fb8b
Modified outline shader to do fill branch on CPU. Fixed assymetric outline
...
due to depth sample not offset by a half texel in shader.
2017-09-07 12:15:38 +02:00
Olivier Prat
b9eb317d9b
Fixed non working outline in stereo with new changes
2017-09-07 10:33:55 +02:00
Menithal
e1acf9dbc9
Merge remote-tracking branch 'upstream/master' into 21484-Fix
2017-09-06 20:42:47 +03:00
Olivier Prat
17e992bd14
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-09-06 19:08:37 +02:00
Olivier Prat
25ff132fc7
Debugging scripts working again with correct occlusion management
2017-09-06 19:05:15 +02:00
Olivier Prat
10643feb78
Working with specific zpass rendering for outline. Debug script needs relinking to correct config
2017-09-06 18:40:38 +02:00
Olivier Prat
d6ea01c4f3
Created outline task but still need to create specific render job with z-pass shaders
2017-09-06 17:34:29 +02:00
Olivier Prat
75e06b691f
Simplified version that works directly with metas
2017-09-06 15:59:04 +02:00
Olivier Prat
700d4a4b43
First working version of outline working with selection interface.
2017-09-06 15:47:10 +02:00
anshuman64
3a44c6977e
Merge pull request #11300 from ElderOrb/case7196
...
7196 Mouse pointer no longer visible in HMD mode
2017-09-05 17:42:36 -07:00
Andrew Meadows
4b8840f307
Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1
...
fix a bug that caused dynamic children to wink in and out and then vanish
2017-09-05 10:02:47 -07:00
Olivier Prat
b619b2311d
Merged with master
2017-09-05 10:27:53 +02:00
Menithal
856452405e
Made Code abit more concise for better compilation
2017-09-05 08:46:37 +03:00
Menithal
119a2703f7
Removed Debug Joints that wasnt used anylonger
2017-09-04 22:20:00 +03:00
Menithal
03e076046b
Added Joint Name check for translations
...
This way if there is a mismatch in the skeleton, the translations are
applied to the models correctly
2017-09-04 22:16:02 +03:00
beholder
c62f9007e9
7196 Mouse pointer no longer visible in HMD mode
...
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.
The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
2017-09-03 15:20:59 +03:00
Seth Alves
0855dfc1c6
PR-11290 didn't actually bump protocol version
2017-09-01 17:26:32 -07:00
Menithal
5506520226
Fixed missing semi colon
2017-09-01 08:20:54 +03:00
Bradley Austin Davis
d0fdf175fd
Fix access to menu on background thread
2017-08-31 16:30:17 -07:00
Brad Davis
65b49a958f
Merge branch 'master' into 21484
2017-08-31 14:59:30 -07:00
Menithal
0e3fc64f63
Fixed Inverse logic and Cleanup
2017-09-01 00:35:56 +03:00
