Commit graph

24059 commits

Author SHA1 Message Date
David Rowe
6cd512762d Add "Show me" prompt, value, and button to users online window 2015-04-06 20:51:17 -07:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
David Rowe
5a86f21506 Remove "2D" from identifiers 2015-04-06 18:39:30 -07:00
Seth Alves
cd5245d0d6 logging group for render-utils 2015-04-06 18:16:01 -07:00
Seth Alves
55bab2efd6 put physics into its own logging group 2015-04-06 18:09:45 -07:00
Sam Gateau
7f46736bb4 playing with the shadwos 2015-04-06 17:17:25 -07:00
Seth Alves
3efcc3684e split out octree logging 2015-04-06 17:05:09 -07:00
Seth Alves
91861e9e5a split out octree logging 2015-04-06 17:04:49 -07:00
Seth Alves
8bd77fbcc7 separate out logging for fbx and gpu libraries 2015-04-06 16:52:31 -07:00
Seth Alves
074e476797 put entities-renderer logging into its own QLoggingCategory 2015-04-06 16:30:20 -07:00
Seth Alves
d4461f1ecb put avatars and embedded-webserver and entities logging into their own QLoggingCategory 2015-04-06 16:22:54 -07:00
Andrew Meadows
e2ea940249 more cleanup 2015-04-06 16:21:04 -07:00
Andrew Meadows
23951620bb cleanup DynamicCharacterController 2015-04-06 16:19:14 -07:00
Thijs Wenker
484b014fa7 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-07 01:07:04 +02:00
Thijs Wenker
2b23108e61 ScriptsScripting Interface 2015-04-07 01:06:39 +02:00
Seth Alves
257d66441a put audio-client logging into its own QLoggingCategory 2015-04-06 16:03:28 -07:00
Andrew Meadows
435ce106eb Add DynamicCharacterController prototype 2015-04-06 16:03:13 -07:00
Seth Alves
7af32bd67a put audio and script-engine logging into their own QLoggingCategory 2015-04-06 15:57:18 -07:00
Sam Gateau
07e7f6ea1d FIx review comments 2015-04-06 15:40:29 -07:00
David Rowe
ce104e8c40 Merge branch 'master' into 20447 2015-04-06 15:18:19 -07:00
Seth Alves
cb7ff86386 put networking library into its own QLoggingCategory 2015-04-06 15:11:48 -07:00
Seth Alves
d5832f04dc Merge branch 'master' of github.com:highfidelity/hifi into logging-cleanup 2015-04-06 14:45:00 -07:00
Bradley Austin Davis
1a02255033 Remove the console window created when you start interface on win32 platforms
Fixing cmake typo
2015-04-06 12:59:44 -07:00
Sam Gateau
4abc760db1 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-06 12:24:41 -07:00
Sam Gateau
4aa695d5f3 fixed an issue with skinned normaled map models not doing the correct transformation 2015-04-06 12:24:01 -07:00
Brad Davis
74cf4b57b3 Ensure the frame timer doesn't re-engage on exit 2015-04-06 11:25:47 -07:00
Andrew Meadows
f51a259909 Merge pull request #4598 from sethalves/fix-linux-audio
avoid repeatedly calling QAudioDeviceInfo::availableDevices on linux
2015-04-06 10:51:24 -07:00
Sam Gateau
7de54917b8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Andrew Meadows
b9310f67f8 Merge pull request #4596 from samcake/orange
On my quest for fixing the shadows i found a few syntax issues
2015-04-06 10:16:09 -07:00
Sam Gateau
a85daaee41 COmmented the review questions in code 2015-04-06 10:03:47 -07:00
Sam Gateau
d6f74aa0ad Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-06 09:56:16 -07:00
Atlante45
a120e50cc0 Account for actual eye position in oculus pick ray 2015-04-06 18:29:02 +02:00
Andrew Meadows
96a834183f Merge pull request #4594 from jherico/oculus3
Enable Direct HMD mode only on windows
2015-04-06 09:24:53 -07:00
Seth Alves
2fbfa34c5c removed uneeded logging 2015-04-06 09:14:53 -07:00
Seth Alves
347603269b Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-06 09:07:36 -07:00
Atlante45
a3f8076641 Quit VRMode before aboutToQuit runs 2015-04-06 17:55:48 +02:00
Clément Brisset
efbd74f539 Merge pull request #4597 from huffman/light-overlays
Light overlays
2015-04-06 16:02:44 +02:00
Sam Gateau
10269bd556 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-05 18:37:28 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
David Rowe
765d66eee5 Fix running without DDE available 2015-04-04 19:20:44 -07:00
David Rowe
65c1fea689 Increase DDE head translation to make avatar better reflect RL 2015-04-04 19:08:23 -07:00
David Rowe
1eb5716ab7 Shut down DDE when Interface shuts down 2015-04-04 19:04:47 -07:00
David Rowe
00f5469fa8 Add menu item that resets DDE tracking 2015-04-04 17:31:32 -07:00
Seth Alves
076209ab74 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-04 15:01:26 -07:00
Seth Alves
e06dada756 Merge pull request #4592 from AndrewMeadows/thermonuclear
profiling for physics simulation
2015-04-04 15:00:44 -07:00
Andrew Meadows
568050686d replace tabs with spaces for indentation 2015-04-04 13:50:16 -07:00
Seth Alves
61fb9adfca avoid calling QAudioDeviceInfo::availableDevices once per second on linux because it blocks the audio thread for ~1 second each time 2015-04-03 19:36:22 -07:00
Seth Alves
fb2f33d037 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-03 19:30:15 -07:00
Seth Alves
1a7bdee180 added code to split an fbx into one obj file per mesh-part 2015-04-03 19:30:05 -07:00