Atlante45
423f26f669
Review comments
2014-03-13 15:26:02 -07:00
Atlante45
0748682119
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
2014-03-13 15:04:49 -07:00
Atlante45
e5b5778caf
Upload FST
2014-03-13 15:04:22 -07:00
Andrzej Kapolka
95f1351f8c
Merge pull request #2299 from ey6es/master
...
Fixes for Linux build: now that the resources are copied, use the resource directory next to the binary. Because the resource compiler puts a file into resources, don't delete the resources before copying.
2014-03-13 10:59:03 -07:00
Andrzej Kapolka
b2a29cb84f
Fixes for Linux build.
2014-03-13 10:56:19 -07:00
Atlante45
51585acd25
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
2014-03-13 10:53:24 -07:00
Stephen Birarda
e8a6ab6831
Merge pull request #2297 from ddobrev/xmppchat
...
Hid the chat window rather than close it in order to preserve sent messages.
2014-03-13 09:40:23 -07:00
Dimitar Dobrev
442ca145da
Hid the chat window rather than close it in order to preserve sent
...
messages.
2014-03-13 14:07:21 +02:00
Brad Hefta-Gaub
cbe9480171
Merge pull request #2293 from ddobrev/xmppchat
...
Changed the chat window to a popup with a custom closing button.
2014-03-12 20:15:29 -07:00
Dimitar Dobrev
727903b216
Changed the chat window to a popup with a custom closing button.
2014-03-13 04:07:33 +02:00
Brad Hefta-Gaub
79b1465cb0
Merge pull request #2275 from Atlante45/editVoxels
...
Edit voxels
2014-03-12 18:52:55 -07:00
Philip Rosedale
e9b622361a
Merge pull request #2292 from birarda/agent-audio
...
add sendAvatarAudioStream option to Agent
2014-03-12 18:05:10 -07:00
Stephen Birarda
54d73d4a64
use floor since round is missing on windows
2014-03-12 17:50:58 -07:00
Stephen Birarda
bd6c42a685
define roundf for use on Win from ScriptEngine
2014-03-12 17:32:52 -07:00
Stephen Birarda
060d8be9f4
Merge branch 'master' of https://github.com/highfidelity/hifi into agent-audio
2014-03-12 17:07:21 -07:00
Stephen Birarda
3b653ca542
add a sendAvatarAudioStream option to Agent for mixer load testing, closes #2291
2014-03-12 17:00:12 -07:00
Stephen Birarda
0a69b1b038
Merge pull request #2290 from ddobrev/xmppchat
...
Removed the double border between the sent messages and the entry.
2014-03-12 16:28:48 -07:00
Dimitar Dobrev
6d4d61c38a
Removed the double border between the sent messages and the entry.
2014-03-13 01:06:11 +02:00
Atlante45
424afaa36b
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
...
Conflicts:
interface/interface_en.ts
2014-03-12 15:59:17 -07:00
AndrewMeadows
5ab97d0228
Merge pull request #2284 from ey6es/master
...
Xcode/GCC warning fixes.
2014-03-12 15:53:13 -07:00
Andrzej Kapolka
9ad2ea9059
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-12 15:30:39 -07:00
AndrewMeadows
bed8617846
Merge pull request #2277 from ZappoMan/server_scale_testing
...
Voxel/Particle Server Scaling Work
2014-03-12 15:24:29 -07:00
Andrzej Kapolka
ffe3717573
Enable back face culling on the opaque parts of avatars.
2014-03-12 15:10:33 -07:00
Stephen Birarda
a998307a23
Merge pull request #2289 from ddobrev/xmppchat
...
Changed the font used in the chat to Helvetica, with Arial as a fallback
2014-03-12 15:06:25 -07:00
Andrzej Kapolka
bab74e9cd4
Push the distance back even more.
2014-03-12 15:01:09 -07:00
Andrzej Kapolka
889c1358fc
Increase the distance at which avatars glow when moving.
2014-03-12 14:56:52 -07:00
Dimitar Dobrev
d67381d85e
Changed the font used in the chat to Helvetica, with Arial as a
...
fallback.
2014-03-12 23:45:10 +02:00
Atlante45
728a5f6251
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
2014-03-12 14:09:27 -07:00
Atlante45
5941ad0dd1
Changed lockForWrite() to lockForRead()
2014-03-12 14:08:23 -07:00
Andrzej Kapolka
f85f49caa6
Might as well update this.
2014-03-12 14:03:22 -07:00
Andrzej Kapolka
43ad9b4048
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-12 13:54:45 -07:00
Stephen Birarda
9ec2f2acde
Merge pull request #2283 from ddobrev/xmppchat
...
Filtered received messages, accepting only group ones.
2014-03-12 13:52:20 -07:00
Andrzej Kapolka
800be7eef4
One more degree conversion.
2014-03-12 13:38:16 -07:00
Dimitar Dobrev
6caf6b2c31
Filtered received messages, accepting only group ones.
2014-03-12 22:36:50 +02:00
Andrzej Kapolka
6fb313cc43
Allow streaming uints.
2014-03-12 13:03:59 -07:00
Andrzej Kapolka
f088912ecf
More GCC warning fixes.
2014-03-12 12:51:43 -07:00
Andrzej Kapolka
f1145272eb
Signed/unsigned fix.
2014-03-12 12:29:01 -07:00
Andrzej Kapolka
064f784db1
More OS X warning fixes.
2014-03-12 12:23:23 -07:00
Atlante45
a2acdc01ab
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
...
Conflicts:
interface/interface_en.ts
2014-03-12 12:21:56 -07:00
Atlante45
9402a5852c
Fixed review comments
2014-03-12 12:20:43 -07:00
Andrzej Kapolka
ffb9273da8
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-12 12:11:43 -07:00
Andrzej Kapolka
4c7737443e
Fix for OS X warning.
2014-03-12 12:11:30 -07:00
Andrzej Kapolka
e249b29b45
Merge pull request #2268 from AndrewMeadows/radians
...
prefer radians over degrees
2014-03-12 12:10:29 -07:00
Andrew Meadows
e68241d2a9
using glm::degrees() instead of DEGREES_PER_RADIAN
2014-03-12 12:08:27 -07:00
Andrew Meadows
c3e8d51694
orientation stored in dataserver is in degrees
2014-03-12 12:06:59 -07:00
AndrewMeadows
b1f4edb3a5
Merge pull request #2271 from ZappoMan/QWaitCondition
...
Fix runaway JurisdictionListener thread and other improvements
2014-03-12 11:54:48 -07:00
Atlante45
5cb9ea8402
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
2014-03-12 11:49:20 -07:00
Atlante45
3aa534d47c
Added the send method
2014-03-12 11:48:41 -07:00
Atlante45
b9ee60ba41
FstReader not a member anymore
2014-03-12 11:47:47 -07:00
Atlante45
855f6fcf59
Moved Avatar upload to file Menu
2014-03-12 11:46:41 -07:00
