Atlante45
6a00dcbf0a
More switches to new Settings
2015-01-20 00:30:29 -08:00
Atlante45
c2b7ff1b54
Totally removed Application's setting memember
2015-01-18 19:10:30 -08:00
Stephen Birarda
7beb3a7b62
resolve conflicts on merge with upstream master
2014-12-17 16:57:35 -08:00
Atlante45
11a2ecab56
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.cpp
interface/src/entities/EntityTreeRenderer.h
interface/src/ui/ApplicationOverlay.cpp
libraries/render-utils/src/GlowEffect.cpp
libraries/render-utils/src/Model.cpp
2014-12-16 15:02:37 -08:00
ZappoMan
bfcc78c57d
replaced Application::resourcesPath() with PathUtils::resourcesPath()
2014-12-15 15:20:18 -08:00
Stephen Birarda
1b48cf7f5a
use DependencyManager for AddressManager
2014-12-15 14:54:20 -08:00
Atlante45
25df784f43
Headers cleanup
2014-12-15 10:56:42 -08:00
ZappoMan
ec54b609df
dry up code and make chat window avoid the hmd screen
2014-12-10 17:23:39 -08:00
David Rowe
a619d0460d
Show chat alerts in icon tray only if not already seen
2014-10-14 11:08:24 -07:00
David Rowe
5151563b79
Coding standard
2014-10-14 11:08:02 -07:00
Stephen Birarda
88a75a3585
fix for goToUser from ChatWindow
2014-09-12 11:27:54 -07:00
Stephen Birarda
7964180905
handle place creation at new API endpoint
2014-09-11 17:33:01 -07:00
Stephen Birarda
71f2c0b542
initial addition of the AddressManager with location switch hooked up
2014-09-11 10:14:00 -07:00
Brad Hefta-Gaub
d342f9281f
Merge pull request #3357 from huffman/19968
...
Code Review for Job #19968
2014-09-06 15:42:02 -07:00
Ryan Huffman
2b5759bb39
Update chat to close on ESC
2014-09-04 10:53:51 -07:00
Ryan Huffman
51e616d122
Add margin to chat window for titlebar + menu
2014-09-04 07:20:27 -07:00
Ryan Huffman
f1aaea0ffa
Fix bug with chat scrolling randomly
2014-08-27 12:05:57 -07:00
Ryan Huffman
31d198a7a9
Remove custom behavior from chat window
2014-08-21 15:37:12 -07:00
wangyix
6764ace8eb
droppable silent packets are added for dropped packets;
...
_currentJitterBufferFrames replaced with moving average of frames
available. Downstream framesAvailable stat now includes the frames in
QAudioOutput as well as the ringbuffer.
2014-07-16 14:41:24 -07:00
Mohammed Nafees
d5d2107b97
Merge remote-tracking branch 'upstream/master' into 19765
2014-06-25 01:50:29 +05:30
Mohammed Nafees
7271f85041
Change font size values from pt to px in Chat Window.
2014-06-25 01:49:17 +05:30
Ryan Huffman
0e6abe3359
Update inactive chat window opacity to 0.8
2014-06-20 16:31:22 -07:00
Ryan Huffman
0c87f0aabc
Update chat window behavior
...
Lower opacity when inactive
Move focus to main window when pressing escape, instead of hiding
2014-06-19 19:45:43 -07:00
Brad Hefta-Gaub
13366d9ba1
Merge pull request #2926 from ctrlaltdavid/chat_window
...
Fix chat window scrolling
2014-05-27 10:07:34 -07:00
David Rowe
7c3d3976ee
Fix chat window scrolling to stay at bottom
...
Stay at bottom window when:
- There is new chat.
- People come and go from online list.
- Chat window hides and restores when application focus changes.
- Interface is minimized and restored.
2014-05-25 16:42:36 -07:00
David Rowe
97e5c928a4
Fix chat scroll bar widget jumping
...
Hovering over the chat window's scroll bar was causing it to jump
around. Replaced the 12px style spacing that was causing the problem
with a widget-based solution.
2014-05-25 16:41:01 -07:00
Kai Ludwig
78e311f885
separate style handling for chat area and its context menu.
2014-05-25 20:24:15 +02:00
Stojce Slavkovski
7ffb700564
fixed mention sounds dir for deployment
2014-05-12 20:55:24 +02:00
Ryan Huffman
fdaa42b219
Add hifi:// clickable links to chat
...
The handling also needed to be updated to handle domains correctly -
just routing to goToURL instead of gTo fixes this.
2014-05-08 07:54:49 -07:00
Andrew Meadows
2ea10428c8
properly wrap XMPP stuff with "#ifdef HAVE_XMPP"
2014-05-06 09:34:44 -07:00
Stojce Slavkovski
0b03421046
trivial commit - trigger build
2014-05-06 08:37:49 +02:00
Stojce Slavkovski
14fee3b727
trivial commit - trigger build
2014-05-06 08:27:46 +02:00
Stojce Slavkovski
56e7900aa6
Merge fix
2014-05-05 21:36:05 +02:00
Stojce Slavkovski
37664d3877
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-04 18:32:01 +02:00
Stojce Slavkovski
4d8e1b5bd4
repled audio files
2014-05-02 23:52:12 +02:00
Stephen Birarda
4936fb3857
expose access token from AccountManager
2014-05-02 10:34:29 -07:00
Stojce Slavkovski
785c9a3024
improved mention positioning
...
removed achive manager
2014-04-30 00:25:27 +02:00
Stojce Slavkovski
029e20edda
Added XMPP archive manager
2014-04-29 20:40:12 +02:00
Stojce Slavkovski
963ad64d07
Fixed online user presence in chat window
2014-04-28 23:49:59 +02:00
Stojce Slavkovski
5c7fb3eca5
Add chat mention notifications
2014-04-26 22:19:33 +02:00
Stojce Slavkovski
91d7bd252d
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-04-26 08:03:52 +02:00
Stojce Slavkovski
b02883f84d
add limits to QXmppArchiveManager
2014-04-24 22:47:42 +02:00
Stojce Slavkovski
c968a4bdb6
set QXmppArchiveManager limits
2014-04-24 22:45:25 +02:00
Stojce Slavkovski
2c35fe433d
Try to load past messages with QXmppArchiveManager
2014-04-24 22:44:52 +02:00
Ryan Huffman
1774f6c9bd
Add threshold to auto scroll
2014-04-23 15:37:28 -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
9bea70ac54
Revert "Add emoticons to chat"
...
This reverts commit 3c9b6264a8
2014-04-23 10:49:22 -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
