Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-15 04:44:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
13489 commits 75 branches 59 tags 1.2 GiB
Commit graph

677 commits

Author SHA1 Message Date
Mohammed Nafees
29d64373b4 Merge branch master 2014-04-24 18:52:59 +05:30
Mohammed Nafees
dd74ea64e7 Further changes for child like behaviour 2014-04-24 17:18:24 +05:30
Clément Brisset
d441e6a453 Merge pull request #2717 from AndrewMeadows/inertia 
avatar bounding capsule collision against voxels
 2014-04-23 16:06:14 -07:00
Ryan Huffman
0cba95e7ad Reorder property initialization in FramelessDialog 2014-04-23 15:37:49 -07:00
Ryan Huffman
1774f6c9bd Add threshold to auto scroll 2014-04-23 15:37:28 -07:00
Ryan Huffman
d56a4e169e Add ChatInputArea 2014-04-23 15:24:21 -07:00
Ryan Huffman
5fd585aab1 Fix error with cursor format getting reset when sending chat message 2014-04-23 12:26:59 -07:00
Ryan Huffman
951d5004e1 Add ChatInputArea with custom paste 2014-04-23 11:57:43 -07:00
Ryan Huffman
c65d5f08ca Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-23 10:54:51 -07:00
Ryan Huffman
9bea70ac54 Revert "Add emoticons to chat" 
This reverts commit 3c9b6264a8.
 2014-04-23 10:49:22 -07:00
Andrew Meadows
f46a5dc966 fix #2718 for warning about unused variable 2014-04-23 10:13:05 -07:00
Stojce Slavkovski
e9962241be Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-23 18:12:49 +02:00
Atlante45
ddf14b0842 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-22 10:22:30 -07:00
Thijs Wenker
6c89521f1d Style 2014-04-22 13:12:21 +02:00
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -07:00
Thijs Wenker
70ac93c20d Style 2014-04-21 21:44:50 +02:00
Thijs Wenker
9faee0d82d - Style 
- Script Editor can run script file once at time, but you can still start multiple scripts through the original ways.
 2014-04-21 21:37:49 +02:00
Thijs Wenker
c1ed38f4de Style 2014-04-21 21:23:39 +02:00
Thijs Wenker
77994ae0cb header cleanup (hopefully the ubuntu test-build will like this) 2014-04-21 06:20:18 +02:00
Thijs Wenker
5bffb17643 #include <QMessageBox.h> -> #include <QMessageBox> 2014-04-21 05:51:34 +02:00
Thijs Wenker
23068b0356 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-21 05:26:42 +02:00
Thijs Wenker
c016d6557e - few Adjustments in Application class for Script editor 
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
 2014-04-21 05:25:28 +02:00
Stojce Slavkovski
550cf6b8ea Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-19 18:05:01 +02:00
Atlante45
8a7a590602 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 
Conflicts:
	interface/src/ui/Stats.cpp
 2014-04-18 16:07:08 -07:00
Atlante45
b098a7a294 Fixed wire cube overlay not drawn with right line width 2014-04-18 15:59:37 -07:00
Atlante45
aa73527157 Some code cleaning 2014-04-18 15:58:56 -07:00
Thijs Wenker
d2d3937e08 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-18 20:58:36 +02:00
ZappoMan
fa787adce2 added wet/dry mix, and alternate distance attenuation features 2014-04-18 08:55:32 -07:00
Ryan Huffman
a552d48401 Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-17 20:02:05 -07:00
Ryan Huffman
3c9b6264a8 Add emoticons to chat 2014-04-17 19:51:25 -07:00
Ryan Huffman
6437f76ed2 Update username/location match in chat to be more lenient 2014-04-17 15:50:40 -07:00
Ryan Huffman
4f236c6bf4 Add hifi link handling in chat for usernames and locations 2014-04-17 15:20:12 -07:00
Ryan Huffman
795ddbc7bf Update ChatMessageArea to open urls via Menu::openUrl 2014-04-17 15:19:13 -07:00
Ryan Huffman
e2954f8614 Fix color and size of font in timestamp chat messages 2014-04-17 13:49:10 -07:00
Ryan Huffman
48a7561644 Fix chat messages not being html escaped 2014-04-17 13:38:13 -07:00
Ryan Huffman
7a25d0661f Update style of chat messages 2014-04-17 13:20:00 -07:00
Ryan Huffman
c1fa6b41e4 Update chat window to use vertical layout 2014-04-17 13:19:36 -07:00
Stojce Slavkovski
27c2255adf Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-17 20:52:30 +02:00
Ryan Huffman
606a48d555 Fix issue with pref dialog disappearing 
With the frameless dialog being updated to support different types of
window, the pref dialog was no longer able to rely on it to keep itself
open in certain cases.  The window flags were also updated to update
after a "browse" call rather than in the slot so that it would still
execute in the case of cancelled selection.
 2014-04-17 09:36:17 -07:00
Thijs Wenker
b2e969d1c5 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-17 13:03:44 +02:00
ZappoMan
4c6471caa4 fix typo 2014-04-16 16:43:01 -07:00
ZappoMan
836913f1f0 Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-16 15:21:15 -07:00
ZappoMan
2e0c5fc81b implement support for comb filter suppression window 2014-04-16 15:13:20 -07:00
Ryan Huffman
2de9848a37 Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-16 14:42:20 -07:00
Thijs Wenker
154176402e Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-16 23:41:58 +02:00
Ryan Huffman
23d68d538c Fix bug where multiple user/location popups appear 2014-04-16 14:05:38 -07:00
Ryan Huffman
e8b6b7ab4d Update style of chat message links 2014-04-16 13:22:22 -07:00
AndrewMeadows
7dc8f2ae3c Merge pull request #2657 from ey6es/master 
Added tools to adjust avatar LOD to LOD tools dialog.  Closes #2624.
 2014-04-16 12:59:47 -07:00
Ryan Huffman
bfb879d3e6 Update chat textbox to use correct line height 2014-04-16 10:03:22 -07:00
Ryan Huffman
8aee81ae7c Update username in chat to use correct line height 2014-04-16 10:02:54 -07:00
Ryan Huffman
cb1408d26d Update chat window to use new Frameless Dialog 
The new dialog class needed to be updated to handle windows in different
positions and windows that don't delete on close.
 2014-04-16 10:01:35 -07:00
Ryan Huffman
4afea2d228 Remove chat window docking 2014-04-16 09:55:12 -07:00
Thijs Wenker
8e6130091d Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-16 11:28:46 +02:00
ZappoMan
ba361b0f62 add local audio stats 2014-04-15 21:50:44 -07:00
ZappoMan
bdf39186de Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-15 21:04:15 -07:00
Thijs Wenker
e66822c6ee ScriptEditor: Syntax highlighting update 2014-04-16 00:55:06 +02:00
Stojce Slavkovski
1a3e6595c5 Allow users to set the destination of Snapshots 2014-04-15 19:36:02 +02:00
ZappoMan
8a16986294 add sliders for reflection, diffusion, absorption 2014-04-15 09:58:35 -07:00
ZappoMan
1ed5512925 remove old mode, replaced by new mode 2014-04-14 21:02:09 -07:00
Thijs Wenker
1634e574d7 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-15 00:40:48 +02:00
Thijs Wenker
af47510b05 Initial script editor widget / icons made by MaximillianMerlin ty 2014-04-15 00:30:01 +02:00
Ryan Huffman
06235decae Move ChatWindow isAtBottom and moveToBottom outside of HAVE_QXMPP 2014-04-14 14:10:12 -07:00
ZappoMan
0d308e7cb9 more cleanup add support for enable/disable rendering of paths 2014-04-14 11:58:49 -07:00
Ryan Huffman
4ae148ff19 Update chat window to not allow movement while docked 2014-04-14 11:34:35 -07:00
Ryan Huffman
aaddecd024 Merge remote-tracking branch 'upstream/master' into 19554 
Conflicts:
	interface/resources/resources.qrc
	interface/ui/chatWindow.ui
 2014-04-14 11:20:49 -07:00
Andrzej Kapolka
880736c30e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-14 10:24:58 -07:00
Stephen Birarda
5904d19603 Merge pull request #2637 from birarda/authentication 
add optional DTLS option for domain-server to node communication
 2014-04-14 10:24:17 -07:00
ZappoMan
d3a9c6940c some audio reflection cleanup 2014-04-14 10:12:08 -07:00
ZappoMan
7a993939bf Merge branch 'master' of https://github.com/worklist/hifi into moonshot 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.h
	libraries/shared/src/SharedUtil.h
 2014-04-14 09:43:29 -07:00
Ryan Huffman
2c10b55858 Remove extraneous debug messages 2014-04-12 01:09:29 -07:00
Ryan Huffman
8b904b91ea Cleanup ChatMessageArea.cpp 2014-04-12 00:53:43 -07:00
Ryan Huffman
45402336ac Add chat window dragging 
This was originally implemented by Mohammed Nafees, shared on Basecamp.

I've noticed an issue with dragging across screens (monitors) where the
chat window will jump vertically.  I've tried debugging it, and
ultimately it looks like an issue with the `move` method.  The
coordinates are valid (I tried using global coordinates as well), and
the amount to move is correct, but when moving to coordinates on a
different screen it doesn't do the right thing.
 2014-04-12 00:25:58 -07:00
Ryan Huffman
13cf0c80e6 Fix chat message formatting and word wrapping 
By switching from a QLabel to a QTextBrowser widget more formatting
options and word wrapping that breaks words is possible.  It comes with
an issue I have been unable to resolve

 * Selecting text and going down with the cursor will cause it to
   scroll.  It's possible to increase padding to remove this behavior,
   but it doesn't look great.
 2014-04-12 00:20:43 -07:00
Stojce Slavkovski
4d0ed5796e Merge branch 'master' of https://github.com/worklist/hifi into 19507 
Conflicts:
	interface/interface_en.ts
 2014-04-12 08:45:23 +02:00
Andrzej Kapolka
0ca68e4cb4 Adjust the size when we toggle the avatar LOD options. 2014-04-11 17:53:02 -07:00
Andrzej Kapolka
39135d3d5f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-11 16:37:49 -07:00
Andrzej Kapolka
2fdb8d935b Merge pull request #2654 from Atlante45/remove_qrc_from_sources 
Remove qrc from sources
 2014-04-11 16:35:48 -07:00
Andrzej Kapolka
4265617c3e Add missing include. 2014-04-11 16:02:46 -07:00
Andrzej Kapolka
fe7a359545 Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624. 2014-04-11 15:55:48 -07:00
Andrew Meadows
5ac7be8945 merge upstream/master -> andrew/inertia 2014-04-11 12:20:00 -07:00
Atlante45
c39434f4e3 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources 
Conflicts:
	interface/resources/resources.qrc
 2014-04-11 12:08:17 -07:00
Atlante45
100c3f8da4 Modify UIs that were using the qrc 2014-04-11 11:59:23 -07:00
Philip Rosedale
8ccc0a2081 Merge pull request #2650 from thoys/chatwindow-docking-feature 
Fixed docking of ChatWindow
 2014-04-11 07:21:53 -07:00
Thijs Wenker
f0463a5679 Fixed docking of ChatWindow 
Temporary Pin Icon, replace with a nice looking one please
 2014-04-11 00:45:38 +02:00
Stojce Slavkovski
459fed5c7b Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-10 21:52:37 +02:00
Ryan Huffman
16a2367b29 Update chat window to only scroll when at the bottom 
It can be frustrating when scrolling up to read a message to have the
window forcibly scrolled to the bottom when a new message appears.
 2014-04-10 12:34:45 -07:00
Ryan Huffman
37f9f47488 Fix odd resizing of chat messages 
When calling updateGeometry on the message labels the layout system
seems to resize the widgets in weird ways.  There may be a different way
to keep it from doing this.
 2014-04-10 12:09:06 -07:00
Ryan Huffman
ff3ebd1eda Fix centering of timestamp in chat window 2014-04-10 12:04:30 -07:00
Stephen Birarda
3651eff3d6 cleanup Systime to gettimeofday without lean and mean windows 2014-04-10 11:24:54 -07:00
Stephen Birarda
cf47418d58 remove the audio scope 2014-04-09 17:16:29 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Stephen Birarda
d4f2c9e631 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-09 14:40:14 -07:00
stojce
9ab61faacb additional CR fixes 2014-04-09 22:32:15 +02:00
stojce
a1c6843bd4 CR Fixes 2014-04-09 22:14:35 +02:00
stojce
c9605be193 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-09 21:57:56 +02:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
0a9c7e3d74 add an include guard to Stats 2014-04-09 11:35:20 -07:00
stojce
8d45a53af9 Merge branch 'master' of https://github.com/worklist/hifi into 19507 
Conflicts:
	interface/interface_en.ts
 2014-04-09 19:53:48 +02:00
Stephen Birarda
86d236faef repairs to date and author name in RearMirrorTools 2014-04-09 10:13:06 -07:00
stojce
7b26317eaf Merge branch 'master' of https://github.com/worklist/hifi into 19548 2014-04-09 18:55:17 +02:00
stojce
ce85e67a42 Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
stojce
cc2f03fb49 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-09 08:19:41 +02:00
Stephen Birarda
7ce91b3f96 fix headers who had their comments removed 2014-04-08 17:43:35 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Stephen Birarda
f3cbd120ce header comment tweaks prior to regex match 2014-04-08 17:19:23 -07:00
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00
Mohammed Nafees
ba7c696786 child like behaviour for the widget 2014-04-08 23:38:49 +05:30
Andrzej Kapolka
ccd7106527 Include "InterfaceConfig" before QOpenGLFramebufferObject to fix Windows 
build.
 2014-04-08 10:54:41 -07:00
Stephen Birarda
080b0d7221 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 10:28:14 -07:00
Andrzej Kapolka
d4706bba8a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 10:21:13 -07:00
Andrzej Kapolka
5a61009099 Add metavoxel bandwidth to details. 2014-04-08 10:19:39 -07:00
Andrzej Kapolka
0011276b0b Added back the download stats, which got lost in a merge. 2014-04-07 14:19:17 -07:00
Stephen Birarda
efcf506383 resolve conflicts on merge with upstream master 2014-04-07 09:32:08 -07:00
stojce
dd5a198740 Models browser fixes 2014-04-06 16:13:15 +02:00
stojce
ba5a092ad7 Frameless dialog position/size fixes 
Fixed frameless dialog size and position on main window resize and move
 2014-04-06 15:30:30 +02:00
stojce
b45f61ec54 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-05 16:29:57 +02:00
Andrzej Kapolka
2d535f3b86 Removed debugging code. 2014-04-04 16:36:58 -07:00
Andrzej Kapolka
d2b0cc43dd Extent tweaks. 2014-04-04 16:32:14 -07:00
Andrzej Kapolka
1c822542c1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-04 15:29:13 -07:00
Andrzej Kapolka
1f3a5d09d9 Merge pull request #2593 from Atlante45/display_models_metadata 
Display models metadata
 2014-04-04 15:18:18 -07:00
Andrzej Kapolka
a2b94aa433 Working on render modes. 2014-04-04 14:22:01 -07:00
Mohammed Nafees
7b5c733d9e Fixed spacing of number and script name in recently loaded list. 2014-04-05 01:10:02 +05:30
stojce
8dc6ca75a4 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
	interface/resources/resources.qrc
	interface/src/Menu.cpp
 2014-04-04 21:16:29 +02:00
Andrzej Kapolka
a0c7e4d3cc Working on model rendering modes. 2014-04-04 11:45:03 -07:00
Mohammed Nafees
eae95a57b7 UI alignment changes 2014-04-04 23:12:56 +05:30
Mohammed Nafees
1ecdec7a5e Minor changes. Added a sweet tooltip :) 2014-04-04 19:52:37 +05:30
Andrzej Kapolka
38022d2440 Fix for voxelizing models. 2014-04-04 00:33:33 -07:00
Andrzej Kapolka
1bf19111dc Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-03 23:57:30 -07:00
Andrzej Kapolka
dfaa98cc34 Blend when setting. 2014-04-03 23:51:49 -07:00
Andrzej Kapolka
d706e23012 Basic voxelization. 2014-04-03 23:47:31 -07:00
AndrewMeadows
4a98f9f159 Merge pull request #2485 from kordero/19498 
Code Review for Job #19498
 2014-04-03 12:58:47 -07:00
Lucas Crisman
793179dc72 Merge branch 'master' of git://github.com/worklist/hifi into 19498 
Conflicts:
	interface/src/Application.cpp
 2014-04-03 16:24:32 -03:00
Andrzej Kapolka
061d7719d4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-03 11:55:50 -07:00
Andrzej Kapolka
22710af111 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/interface_en.ts
 2014-04-03 11:37:27 -07:00
Andrzej Kapolka
df4fd9df5f Remove translations for now, but use correct translation keys for the only 
translations we had (days/weeks/etc.)
 2014-04-03 11:30:06 -07:00
Andrzej Kapolka
407a6ecc70 More work on voxelizing. 2014-04-03 11:26:54 -07:00
Atlante45
df718c430a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-03 11:20:24 -07:00
Dimitar Dobrev
716858e6f6 Informed users who want to chat they have to log in first. 2014-04-03 20:09:54 +03:00
Mohammed Nafees
f3121e1bf6 Removed the animation, placed UI elements according to mockup 2014-04-03 22:33:45 +05:30
Mohammed Nafees
2ef8277d0f Make the widget move and resize along with the main window 2014-04-03 18:04:26 +05:30
Mohammed Nafees
e5d9812742 Major changes to the running scripts widget 2014-04-03 13:21:27 +05:30
Andrzej Kapolka
4375fe85f1 Working on voxelizing spanners using a set of six rendered images. 2014-04-02 18:56:18 -07:00
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Atlante45
c2f0545d96 Setup for actual metadata 2014-04-02 17:12:11 -07:00
Atlante45
cf20c448a3 Few tweaks before PR 2014-04-02 16:46:03 -07:00
Atlante45
52df77b4b5 Final work on models metadata support 2014-04-02 16:25:35 -07:00
Lucas Crisman
76921d9b52 Merge branch 'master' of git://github.com/worklist/hifi into 19498 2014-04-02 17:18:27 -03:00
Atlante45
b73598ae8a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-02 11:40:41 -07:00
Atlante45
e60e1929f3 Review comments 2014-04-02 11:36:52 -07:00
Mohammed Nafees
c358c6ff99 fixed signal parameter 2014-04-02 15:55:47 +05:30
Mohammed Nafees
5e8bd8d050 Resolve conflicts 2014-04-02 13:00:48 +05:30
Mohammed Nafees
d85d4fea5d Added the new Running Scripts widget 2014-04-02 12:46:57 +05:30
Lucas Crisman
1a468ab8ca Merge branch 'master' of git://github.com/worklist/hifi into 19498 
Conflicts:
	interface/src/Application.cpp
 2014-04-02 01:26:25 -03:00
Philip Rosedale
389091ace6 Merge pull request #2587 from matsukaze/nocrAudioFixes 
Audio fixes for win OS.
 2014-04-01 21:03:26 -07:00
matsukaze
d28d686ceb Fix for missing voxel system on domain change. Fix for assertion failure thrown by Qt on exit. 2014-04-02 17:45:22 -07:00
Stephen Birarda
62041d91a8 rename NodeList DomainInfo to DomainHandler 2014-04-01 13:09:35 -07:00
Atlante45
f87c82450a Modified dialog default size 2014-04-01 12:20:08 -07:00
Atlante45
bdd5c291b0 Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-01 12:03:45 -07:00
Atlante45
03958f2fa0 work on metadata in the model browser + real time updates 2014-04-01 12:02:47 -07:00
Andrzej Kapolka
005ae79928 Various fixes and what-not, got the basic spanner clipping working. 2014-03-31 18:21:28 -07:00
Andrzej Kapolka
78896d6af9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 13:29:11 -07:00
Dimitar Dobrev
f9cee2ccfa Fixed a typo that resulted in a wrong padding of a widget. 2014-03-28 22:21:55 +02:00
Andrzej Kapolka
cc5ea2a465 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 11:19:58 -07:00
Dimitar Dobrev
6fd1bf7edb Simplified the new goToUser function. 2014-03-28 18:44:06 +02:00
Dimitar Dobrev
4374e28e9c Changed the highlighting of own messages to occupy the whole row. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
e27f191413 Changed the dock widget for the chat so that it replicates the agreed 
upon design.
 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
5073439007 Highlighted the user's own chat messages. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
d764ef79ed Gave more space to the user in sent messages so that resizing of the 
column for messages occurs for really long user names.
 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
a48ca65236 Enabled going to the clicked user in the chat. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
65f912249d Moved user names in the char 1 pixel to the bottom. 2014-03-28 18:36:52 +02:00
stojce
8b6db350da Switched to QDockWidget 2014-03-27 21:50:41 +01:00
Andrew Meadows
4c64c11144 making some type casts abide by coding standard 2014-03-26 16:58:47 -07:00
Andrzej Kapolka
5934a7fbea Working on voxelizing spanners. 2014-03-25 20:41:19 -07:00
stojce
22a8693b89 Overlay behaviour 2014-03-26 00:05:11 +01:00
stojce
547f33f4d6 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
 2014-03-25 22:15:52 +01:00
stojce
e5a66ddb90 New layout behaviour 2014-03-25 21:56:20 +01:00
Lucas Crisman
8ed30d9da2 Merge branch 'master' of git://github.com/worklist/hifi into 19498 
Conflicts:
	interface/src/Application.cpp
 2014-03-25 14:43:40 -03:00
stojce
5e350df128 Merge branch 'master' of https://github.com/worklist/hifi into 19507 
Conflicts:
	interface/interface_en.ts
 2014-03-25 17:47:05 +01:00
Lucas Crisman
9af1ddb37a Stats: fix for stats panels positioning when mirror is enabled 2014-03-24 15:27:17 -03:00
Lucas Crisman
e545c2ac65 Stats tweaks: fonts adjustments 2014-03-24 14:57:40 -03:00
stojce
32502d7b0d layout improvements 2014-03-23 16:20:29 +01:00
stojce
7c36c4a2b7 Layout fixes 2014-03-23 13:20:24 +01:00
stojce
e2eb34b6c9 Layout setup 
image ratio fixed
image centre position
 2014-03-23 07:03:20 +01:00
ZappoMan
938959a9f6 expose application settings to JS 2014-03-22 21:20:35 -07:00
ZappoMan
b7243b0bfe more cleanup 2014-03-22 20:42:34 -07:00
ZappoMan
a56b7e341d reorganize files in interface directory 2014-03-22 20:22:05 -07:00
stojce
6520a76f0c Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-03-21 22:53:20 +01:00
stojce
9077a05f9d - Layout fix 
- Model browsers
- merge
 2014-03-21 22:34:10 +01:00
Lucas Crisman
5fe59acb87 Stats variable width for panels 2014-03-21 14:10:00 -03:00
stojce
a0a6e537f0 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-19 14:21:48 +01:00
stojce
913783c0f1 resizing 
- fixed layout
 2014-03-16 22:47:03 +01:00
stojce
ebd7dff4b9 QSpinBox, QDoubleSpinBox styling 2014-03-15 22:07:29 +01:00
stojce
716979071c Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-15 19:35:34 +01:00
Brad Hefta-Gaub
c958ae8cfb fix LocalVoxelsOverlay types to match 2014-03-14 17:47:19 -07:00
Andrew Meadows
ab84526a1b removing compile warnings 2014-03-14 16:12:32 -07:00
stojce
4e2d3c9549 styling QSlider 2014-03-14 23:24:32 +01:00
stojce
6d15fb548c Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
 2014-03-14 21:05:30 +01:00
Andrzej Kapolka
5f7e41b79b More dock widget tweaks. 2014-03-14 10:55:27 -07:00
Andrzej Kapolka
a7d35944cc Use an inner widget for the dock. 2014-03-14 10:48:57 -07:00
Andrzej Kapolka
b721533f0b Make chat a dock widget, since that's the behavior it's emulating anyway 
(and for some reason, the current strategy causes a problem on at least Ryan's
and my machine).
 2014-03-14 10:43:12 -07:00
Dimitar Dobrev
85a15a2284 Moved the chat from a window to a built-in panel. 2014-03-14 01:12:25 +02:00
stojce
af8f93830a Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-03-13 18:50:14 +01:00
stojce
939c17d0be Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/src/Menu.h
 2014-03-13 18:41:58 +01: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
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
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
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
43ad9b4048 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-12 13:54:45 -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
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
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
AndrewMeadows
0d38f1c320 Merge pull request #2260 from ey6es/metavoxels 
Yet another metavoxel checkpoint: work on streaming spanners, LOD/subdivision bits, etc.
 2014-03-12 11:34:59 -07:00
ZappoMan
4b60c549e7 add LOD to overlay display 2014-03-12 11:10:52 -07:00
Dimitar Dobrev
4c26f025ac Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry. 2014-03-12 20:04:22 +02:00
Atlante45
5ccba0b080 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-12 10:27:27 -07:00
Dimitar Dobrev
acb4047b54 Increased the right margin of sent messages for better visibility. 2014-03-12 17:33:25 +02:00
ZappoMan
86feabee99 add last scene packets, bytes and pps 2014-03-12 02:22:24 -07:00
ZappoMan
7ce741762e Merge branch 'master' of https://github.com/worklist/hifi into server_scale_testing 2014-03-12 01:21:33 -07:00
Atlante45
72e1810df5 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-11 18:15:58 -07:00
Andrzej Kapolka
6c4223bcdf Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 18:12:12 -07:00
Atlante45
6fcb802a94 Added preview deplacement + fixed locking issue 2014-03-11 18:01:38 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07: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
12becb9d19 improve octree stats display 2014-03-11 16:22:35 -07:00
Clement
dcaef45f2e More work on editVoxel.js 2014-03-11 16:01:21 -07:00
Andrzej Kapolka
81e3197751 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:03:30 -07:00
Andrzej Kapolka
9e5aae4a39 Remove spanner bits. 2014-03-10 17:01:27 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
stojce
874536d75e Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-03-09 10:15:47 +01:00