Commit graph

47901 commits

Author SHA1 Message Date
howard-stearns
90ebbb79c1 centered toolbar 2016-11-02 15:37:53 -07:00
Brad Hefta-Gaub
56b3ac8c89 Merge pull request #8972 from sethalves/fix-for-2159
lock around audio-client quit flag to avoid shutdown race
2016-11-02 00:14:33 -07:00
Howard Stearns
486cf01a55 Merge pull request #8975 from zfox23/AddSnapshotText
Add "Snapshot" text to snapshot cards in Address Bar Dialog
2016-11-01 15:33:53 -07:00
Anthony Thibault
a9c88f2383 Merge pull request #8957 from AndrewMeadows/dont-mirror-eyes
fix broken eyes in mirrored animations
2016-11-01 15:28:48 -07:00
Zach Fox
b98c6cb50f Change 'Snapshot' to 'snapshot' and use smaller font 2016-11-01 14:49:18 -07:00
Zach Fox
c4b59eafbb Add 'Snapshot' text. My very first commit! 2016-11-01 14:09:25 -07:00
Seth Alves
137730dc50 coding standard 2016-11-01 11:59:28 -07:00
Chris Collins
3625f329d9 Merge pull request #8971 from hyperlogic/bug-fix/deterministic-plugin-load-order
Load plugins in alphabetical order.
2016-11-01 11:30:04 -07:00
Seth Alves
ae17135a07 lock around quit flag to avoid shutdown race 2016-11-01 11:14:16 -07:00
Anthony J. Thibault
09511111cf Load plugins in alphabetical order. 2016-11-01 10:23:54 -07:00
Chris Collins
a49669a975 Merge pull request #8955 from sethalves/fix-obj-textures
fix obj textures
2016-10-31 11:52:25 -07:00
Chris Collins
0520aa9ad5 Merge pull request #8948 from samcake/blue
Avoid messaging for render targets generating mip maps
2016-10-31 11:09:06 -07:00
Chris Collins
6698b1617b Merge pull request #8945 from thoys/patch-8
Fix Oculus hand controllers to only work in HMD
2016-10-31 11:02:40 -07:00
Chris Collins
dc8d0bf31c Merge pull request #8935 from zzmp/log/silence-udt-socket
group udt::Socket errors as debug logs
2016-10-31 10:31:10 -07:00
Chris Collins
3b6faefe05 Merge pull request #8931 from sethalves/possible-fix-for-2068
Possible fix for 2069
2016-10-31 10:21:01 -07:00
Brad Hefta-Gaub
a79541a83a Merge pull request #8962 from ZappoMan/removeFaceMute
remove mute icons
2016-10-30 13:12:23 -07:00
Brad Hefta-Gaub
8fbac58091 remove mute icons 2016-10-30 09:33:02 -07:00
Andrew Meadows
c8d4146351 don't mirror eye animations 2016-10-28 17:08:43 -07:00
Seth Alves
3ad748cfe2 Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 16:41:39 -07:00
Clément Brisset
95c175ae74 Merge pull request #8950 from huffman/tutorial/gotoentrystep
Add tutorial tracking for going through the welcome portal
2016-10-28 16:26:40 -07:00
Ryan Huffman
4148abe28f Add comment to tutorial.js generateUUID usage 2016-10-28 16:17:54 -07:00
Chris Collins
1ba5a5d5d7 Merge pull request #8947 from huffman/fix/script-include-race
Fix race condition in BatchLoader
2016-10-28 16:17:46 -07:00
David Kelly
a8832fafeb Merge pull request #8934 from howard-stearns/more-reliable-crowds
More reliable crowds
2016-10-28 16:17:35 -07:00
Ryan Huffman
214d8ebc33 Merge pull request #8954 from Atlante45/sandbox
Exit Sandbox instead of asking to quit
2016-10-28 16:09:03 -07:00
Ryan Huffman
8fe6278831 Update wentToEntry tutorial step to #9 2016-10-28 16:01:52 -07:00
Seth Alves
43536e0046 in C, order of argument evaluation isn't defined 2016-10-28 15:48:54 -07:00
Stephen Birarda
207d26091c Merge pull request #8953 from Atlante45/being-of-light
Update being of light model
2016-10-28 15:36:19 -07:00
Chris Collins
d9d9119dcb Merge pull request #8951 from zzmp/fix/crash-on-web-wasapi
fix crash on shutdown from web audio captures
2016-10-28 15:23:39 -07:00
Atlante45
e1ed7929e3 exit sandbox instead of asking to quit 2016-10-28 15:10:27 -07:00
Stephen Birarda
142fc99ef0 Merge pull request #8946 from birarda/master
make the socket readyRead check fire more frequently
2016-10-28 15:02:15 -07:00
Zach Pomerantz
e2826d311f fix test interface 2016-10-28 14:57:18 -07:00
Atlante45
8ebe92487a Update being of light model 2016-10-28 14:56:36 -07:00
Brad Hefta-Gaub
cec982b004 Merge pull request #8952 from jherico/openvr_min_spec
Updating min spec overlay image
2016-10-28 14:47:21 -07:00
Brad Davis
93be00fe79 Updating min spec overlay 2016-10-28 14:45:24 -07:00
Zach Pomerantz
be23668ca8 delete websurfaces on shutdown 2016-10-28 14:29:52 -07:00
Ryan Huffman
dd4e06e5de Add wentToEntry step to tutorial 2016-10-28 13:42:38 -07:00
Ryan Huffman
e3ee7a2a11 Remove stepRaiseAboveHead 2016-10-28 13:42:17 -07:00
Ryan Huffman
dd1a23ea01 Add Script.generateUUID 2016-10-28 13:42:03 -07:00
Brad Hefta-Gaub
dc836cbefc Merge pull request #8949 from ctrlaltdavid/21090
Fix comment typo
2016-10-28 13:29:47 -07:00
David Rowe
9a79345493 Fix comment typo 2016-10-29 09:04:50 +13:00
Ryan Huffman
9a99cd0ec6 Add tutorialID and tutorialVersion to tutorial progress event 2016-10-28 12:53:16 -07:00
Ryan Huffman
52c74f776c Fix race condition in BatchLoader 2016-10-28 11:40:50 -07:00
samcake
c21fe00cfc Avoid messaging for render targets 2016-10-28 11:40:10 -07:00
Seth Alves
e15043754c Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 11:36:09 -07:00
Andrew Meadows
fe716b3641 Merge pull request #8941 from thoys/patch-7
QuickFix for weird avatar when switch Vive -> Desktop mode
2016-10-28 11:14:40 -07:00
Stephen Birarda
7ddfddc567 make the socket readyRead check fire after 2s of no packets 2016-10-28 10:30:20 -07:00
Thijs Wenker
597e52636a Fix Oculus hand controllers to only work in HMD 2016-10-28 19:22:44 +02:00
howard-stearns
a64a1e2ee0 update agent script reference 2016-10-28 10:20:29 -07:00
howard-stearns
3d8bf7f11c Merge branch 'master' of https://github.com/highfidelity/hifi into more-reliable-crowds 2016-10-28 10:18:46 -07:00
Zach Pomerantz
55a4210053 Merge pull request #8927 from davidkelly/dk/moreACAudioArtifacts
More AC Audio Artifacts
2016-10-28 09:03:43 -07:00