Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 02:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10542 commits 25 branches 0 tags 1.1 GiB
Commit graph

222 commits

Author SHA1 Message Date
Dimitar Dobrev
4c26f025ac Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry. 2014-03-12 20:04:22 +02:00
Dimitar Dobrev
acb4047b54 Increased the right margin of sent messages for better visibility. 2014-03-12 17:33:25 +02:00
Dimitar Dobrev
52c8ccb698 Added a define to ensure the build works without qxmpp. 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
fe2f9f5253 Prevented empty time stamps - when less then a minute has passed - from 
appearing.
 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
858e9fa7df Ensured sent chat messages are always wholly visible. 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
ed90e45c96 Ensured messages are always aligned at the top to user names, and users 
onine are deleted.
 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
60bf473be7 Improved the adherence to code conventions after a code review. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
acb2793053 Ensured messages are sent to the group chat rather than to individual 
users.
 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
86643803cf Moved the connection and configuration of XMPP to the log-in process. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
9eb217794c Added time stamps to the chat. Enabled translations. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
437cadf360 Added a basic version of the chat window. 2014-03-12 01:24:30 +02:00
ZappoMan
7fb872c1d7 remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats 2014-03-08 23:53:44 -08:00
Stephen Birarda
1ef780c6cb make headers coding standard compliant 2014-03-06 16:24:58 -08:00
Stephen Birarda
7ef882c525 make sure InterfaceConfig is included before Qt headers 2014-03-06 16:14:18 -08:00
Stephen Birarda
27d486c0a1 resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
Stephen Birarda
1bcb595f57 add missing interface config includes for windows 2014-03-06 13:52:06 -08:00
Stephen Birarda
04807dd5d1 include cstdio for snprintf call in BandwidthDialog 2014-03-06 13:31:08 -08:00
Stephen Birarda
b670859aaa reference SharedUtil from LogDialog as a library header 2014-03-06 12:46:06 -08:00
Stephen Birarda
e7b166a304 Revert "include InterfaceConfig before Application to fix win build" 
This reverts commit dde2b199c9.
 2014-03-06 12:35:20 -08:00
Stephen Birarda
dde2b199c9 include InterfaceConfig before Application to fix win build 2014-03-06 12:14:14 -08:00
Stephen Birarda
b705ec560f cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Atlante45
66b0590509 Review fixes 2014-03-04 10:48:53 -08:00
Atlante45
bb3c8f2a7a Removed ClipboardOverlay 2014-03-03 17:54:58 -08:00
Atlante45
ef9ff0fa74 Put initialization and deletion of localVoxelSystems on render thread 2014-03-03 16:46:25 -08:00
Atlante45
4bcb43f7dd Added an overlay system for local trees 2014-02-28 15:10:53 -08:00
Philip Rosedale
bae16e24e8 new audio buffer display text, cleanup drawText() 2014-02-27 23:17:39 -08:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Andrzej Kapolka
e470b1c41d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-02-21 18:26:40 -08:00
Atlante45
e66ec6b702 Final fix for clipboard preview 2014-02-21 15:47:40 -08:00
Atlante45
e8c9dc50d0 Hack to get preview working 2014-02-21 15:23:28 -08:00
Atlante45
fc7692417f Fix is3D not set to true 2014-02-21 15:15:16 -08:00
Andrzej Kapolka
b408e31d91 More work on spanners. 2014-02-20 17:18:15 -08:00
Atlante45
989a76fe6e Hooked up Clipboard preview 2014-02-20 16:56:40 -08:00
Andrzej Kapolka
25ae81e2de More work on spanners. 2014-02-19 15:25:21 -08:00
Stephen Birarda
0b4021ea43 switch to ini settings file by default for Interface, closes #2029 2014-02-19 13:17:53 -08:00
Stephen Birarda
78c246f1ba repair to saveSnapshot call from interface 2014-02-19 13:08:57 -08:00
Stephen Birarda
ff7a49d8c2 resolve conflicts on merge with upstream master 2014-02-19 13:07:26 -08:00
Andrzej Kapolka
4e7a7892ec Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 12:06:55 -08:00
Andrzej Kapolka
0138ecb3b2 Layout tweaks. 2014-02-19 11:35:45 -08:00
Andrzej Kapolka
3c4d2aa199 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 10:29:57 -08:00
Andrew Meadows
4010f3ab3f Remove Avatar::_head, use AvatarData::_headData 2014-02-18 17:41:46 -08:00
Andrzej Kapolka
55e2ebd92f More spanner bits. 2014-02-18 13:58:44 -08:00
stojce
7621d70c24 use base class - replaced MyAvatar with Avatar 2014-02-18 08:11:59 +01:00
Andrzej Kapolka
5513524705 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-17 21:48:37 -08:00
Andrzej Kapolka
494685140b Various bits of work on spanners. 2014-02-17 21:44:32 -08:00
stojce
6c2f3b687e removed unnecessary references 2014-02-18 01:50:55 +01:00
stojce
0df0c23c32 Windows build fix (3) 2014-02-17 21:14:28 +01:00
stojce
677e6f5ce9 windows build fix (2) 2014-02-17 20:19:35 +01:00