Commit graph

10754 commits

Author SHA1 Message Date
ZappoMan
029b25ad29 make domain server less noisy about Agent assignments 2014-03-11 16:45:15 -07:00
Dimitar Dobrev
f427f524bf Patched the Qt CMake function for auto-translations so that *.ts files
are not deleted on clean.
2014-03-12 01:24:31 +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
e10dacdbfe Changed the searcning for qxmpp to include debug libraries as well. 2014-03-12 01:24:30 +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
12becb9d19 improve octree stats display 2014-03-11 16:22:35 -07:00
Dimitar Dobrev
1c2e752f3c Integrated QXmpp in the build system. 2014-03-12 01:16:10 +02:00
Dimitar Dobrev
07d3eb886a Added reading and storing of the XMPP password of the current user. 2014-03-12 01:16:10 +02:00
Clement
be6e7d0e97 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-11 16:03:43 -07:00
Clement
dcaef45f2e More work on editVoxel.js 2014-03-11 16:01:21 -07:00
Andrzej Kapolka
5bfe2c2ed5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-11 15:42:07 -07:00
Andrzej Kapolka
9798767261 Merge pull request #2267 from ey6es/visagefix
Two more Visage compilation fixes.
2014-03-11 15:39:50 -07:00
Andrzej Kapolka
8d69eff867 Need to reorder includes due to HANDLE definition conflict. 2014-03-11 15:38:19 -07:00
Andrzej Kapolka
ecb54600eb Another compile fix. 2014-03-11 15:34:41 -07:00
Andrzej Kapolka
f8e6593bcf Turn off mipmaps. Performance is actually substantially better without them. 2014-03-11 15:24:14 -07:00
Andrzej Kapolka
3d9d89e4a7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-11 15:11:32 -07:00
Andrzej Kapolka
1cf559208e Merge pull request #2266 from ey6es/visagefix
Fixes for Visage compile.
2014-03-11 14:43:27 -07:00
Andrzej Kapolka
a4fc2397c7 Fixed Visage includes. 2014-03-11 14:36:29 -07:00
Andrzej Kapolka
e96e591481 Build fix for Visage: added missing include. 2014-03-11 14:25:34 -07:00
Andrzej Kapolka
bc3bba9240 Get rid of unused, expensive "average color" nonsense. 2014-03-11 14:01:23 -07:00
Andrzej Kapolka
35d0fa7189 Don't render avatars until they've been simulated, init before first simulate.
Closes #2262.
2014-03-11 13:46:58 -07:00
Clement
ca0cd2d9d0 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-11 13:46:48 -07:00
Andrzej Kapolka
7d1a44fbea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 12:52:13 -07:00
Brad Hefta-Gaub
c09b5aec5e Merge pull request #2257 from ey6es/master
Applied Ryan's tweaks to Visage mapping and config file.
2014-03-11 12:39:23 -07:00
Brad Hefta-Gaub
df4128a2dd Merge pull request #2255 from ey6es/joints
Rather than unloading resources immediately when unused, use a simple LRU cache.
2014-03-11 12:38:42 -07:00
Brad Hefta-Gaub
82cfa41cbe Merge pull request #2263 from birarda/master
fixes for warnings produced by Xcode 5.1
2014-03-11 12:37:24 -07:00
Andrzej Kapolka
66e322ec55 Added per-attribute LOD threshold multiplier; things like spanners need
different LOD thresholds than, say, voxels.
2014-03-11 12:21:58 -07:00
Stephen Birarda
d1623e6e4d fixes for warnings produced by Xcode 5.1 2014-03-11 11:45:13 -07:00
Andrzej Kapolka
35be8cd941 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:23:13 -07:00
Andrzej Kapolka
4e37586577 Merge pull request #2250 from birarda/windows-build
windows build cleanup after dependencies work, BUILD guide updates
2014-03-11 10:22:53 -07:00
Andrzej Kapolka
81e3197751 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:03:30 -07:00
Stephen Birarda
2f95f3b3a2 Merge pull request #2245 from ZappoMan/cruft_cleanup
Cruft cleanup
2014-03-11 09:45:40 -07:00
Stephen Birarda
f3e8e68457 fix a typo for path to tapped qxmpp formula 2014-03-11 09:41:33 -07:00
Stephen Birarda
dc0b9712bb updates to BUILD guide to suggest using tapped formulas 2014-03-11 09:40:54 -07:00
Stephen Birarda
778ad1411f resolve conflicts on merge with upstream master 2014-03-11 09:39:00 -07:00
Andrzej Kapolka
52a831d3f5 Merge pull request #2258 from ZappoMan/bugfixes
remove space bar behavior from editrVoxels.js
2014-03-10 18:04:00 -07:00
Andrzej Kapolka
ae6a59ef78 Ray intersections for models, don't load resources if there's no network
manager installed.
2014-03-10 17:53:20 -07:00
Stephen Birarda
0b8852cfbe clarify when it is possible to drag-and-drop external dependency 2014-03-10 17:40:06 -07:00
Stephen Birarda
9053379a88 updates to BUILD for addition of qxmpp 2014-03-10 17:36:34 -07:00
Andrzej Kapolka
78957e42be Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 17:19:03 -07:00
Stephen Birarda
933d0d21ed Merge pull request #2259 from birarda/master
remove homebrew formula to place in separate repo
2014-03-10 17:10:09 -07:00
Stephen Birarda
8f13f38502 update the BUILD guide to point to the new formula location 2014-03-10 17:09:32 -07:00
Stephen Birarda
7080a5f503 remove qt5 homebrew formula - it lives at highfidelity/homebrew-formulas 2014-03-10 17:08:57 -07:00