Commit graph

24480 commits

Author SHA1 Message Date
Seth Alves
bc9e818b95 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-07 11:12:16 -07:00
Philip Rosedale
fff4c040a0 Merge pull request #4606 from ctrlaltdavid/20444
CR for Job #20444 - Add everyone / friends filter to users list
2015-04-07 10:55:07 -07:00
Brad Davis
f6fba05e18 Merge pull request #4603 from sethalves/logging-cleanup
Logging cleanup
2015-04-07 10:54:51 -07:00
David Rowe
7acc413c66 Change visibility radio buttons to pop-up menu 2015-04-07 10:43:50 -07:00
Eric Levin
7d2fa8d7ce Updated lightcontroller.js logic to find the nearest light when user clicks on light switch entity- this will allow lights to work even when a user has disabled other users from spawning items in his domain 2015-04-07 10:20:19 -07:00
Sam Gateau
88afb3cedc solution to the color attribute case 2015-04-07 10:04:51 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
David Rowe
a844b73fcc Move widget parameters into propeties 2015-04-07 09:27:53 -07:00
Seth Alves
e63b39f061 oops missed one 2015-04-07 09:15:40 -07:00
Seth Alves
fc5b442e12 interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging 2015-04-07 09:15:11 -07:00
Thijs Wenker
af34add63c added example for the new Scripts functions:
example\misc\scriptsExample.js
2015-04-07 17:39:50 +02:00
Atlante45
5e3ed1c8e4 Compute correct mouse position 2015-04-07 17:15:16 +02:00
Atlante45
1cc4384404 Add new frame of reference for cursor 2015-04-07 17:13:30 +02:00
Atlante45
ae6ee54569 Fix ray collision not using inverse rot 2015-04-07 17:11:02 +02:00
Atlante45
73f9276c74 Fix warning 2015-04-07 17:10:31 +02:00
Thijs Wenker
a783f03025 New scripting functions Scripts.getPublic(), Scripts.getLocal() and Scripts.getRunning() functional. 2015-04-07 16:48:11 +02:00
David Rowe
187ca2a403 Widgetize pop-up menu 2015-04-07 00:38:07 -07:00
Sam Gateau
dee651069c adding support for color attribute in FBX, and displaying it correctly 2015-04-06 23:33:13 -07:00
David Rowe
0cbe4d3673 Apply users filter per control value 2015-04-06 22:09:03 -07:00
David Rowe
798d6437b1 Add pop-up menu of "show me" values 2015-04-06 21:54:15 -07:00
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