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
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
de475ee46c
Update behavior of chat window close button
...
Use a stylesheet to suppress highlighting of the background when
pressing the button down. Instead, it will change the image.
Unfortunately I wasn't able to find a way to do this without requiring
an extra image, or by doing it through the icon system. The different
icon states didn't seem to take effect for button presses, and using
opacity in the stylesheet doesn't work yet for `QPushButton`s.
2014-04-10 12:19:27 -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
Ryan Huffman
2d481dda4e
Update chat menu to properly position itself when opening
...
The previous implementation seemed to assume a full-screen main window -
it will now open on the right side of the window, vertically centered,
regardless of where the main window is.
2014-04-10 11:46:28 -07:00
Ryan Huffman
5099a0e061
Remove chat window opening animation
2014-04-10 11:41:10 -07:00
Stephen Birarda
11d8d0596a
fix ModelUploader header after move
2014-04-09 15:15:43 -07:00
Stephen Birarda
c208af2246
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-09 15:10:48 -07:00
Stephen Birarda
7dec499b79
fix accidental changes to Audio.cpp
2014-04-09 14:52:01 -07:00
Atlante45
7578b282e2
CR
2014-04-09 14:12:11 -07:00
Atlante45
b05b5a1c7b
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-09 14:11:22 -07:00
Stephen Birarda
973fb95c9d
Merge pull request #2630 from AndrewMeadows/scripting
...
Expose MyAvatar.sessionUUID to JS
2014-04-09 13:07:37 -07: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
Andrew Meadows
4b306401af
use slot to change AvatarData::_sessionUUID
2014-04-09 11:32:52 -07:00
Stephen Birarda
2d755adfc0
repairs to good code blown away by regex
2014-04-09 10:46:20 -07:00
Stephen Birarda
86d236faef
repairs to date and author name in RearMirrorTools
2014-04-09 10:13:06 -07:00
Stephen Birarda
d2c6ea238e
repairs to starfield headers
2014-04-09 10:10:00 -07:00
Stephen Birarda
b5a641d60f
add back Util code blown away in merge
2014-04-09 10:04:19 -07:00
Stephen Birarda
b8bfe325a0
add back code blow away in regex replacements
2014-04-09 10:03:26 -07:00
Stephen Birarda
f969e050cd
add apache license to shader headers
2014-04-09 09:59:05 -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
6ce5a24460
missed copyright cleanups in apache header
2014-04-09 09:44:38 -07: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
Andrew Meadows
2f97dd2574
sessionID --> sessionUUID for consistency
2014-04-09 08:22:35 -07:00
Andrew Meadows
229d6cefa2
merge upstream/master into andrew/scripting
2014-04-09 08:17:33 -07:00
Andrew Meadows
b8232b5dfd
AvatarData now stores sessionUUID
2014-04-09 08:11:15 -07:00
Brad Hefta-Gaub
dc89026215
Merge pull request #2607 from thoys/hifi-win-default-device-fix
...
windows default device fix
2014-04-08 15:30:02 -10:00
Stephen Birarda
7ce91b3f96
fix headers who had their comments removed
2014-04-08 17:43:35 -07:00
Stephen Birarda
387179b38f
add Norman's tagline back to PrimitiveRenderer
2014-04-08 17:31:53 -07:00
Stephen Birarda
ab3a9af6bf
repair the starfield renderer
2014-04-08 17:31:30 -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
Atlante45
7e33ed0c91
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-08 16:35:46 -07:00
Atlante45
039450aeec
Checking model name is present in the .fst file
2014-04-08 16:35:07 -07:00
Andrzej Kapolka
597d750af9
Better radius.
2014-04-08 15:25:10 -07:00
Andrzej Kapolka
083e9076a9
Missed a spot.
2014-04-08 15:17:05 -07:00
Andrzej Kapolka
faf8c35358
Head height's kind of screwy; let's use the eye position.
2014-04-08 15:01:56 -07:00
Andrzej Kapolka
add7bb26ed
Use the head height to determine the pushback amount.
2014-04-08 14:55:46 -07:00
Andrzej Kapolka
5776514e6a
Working on pushing the mirror camera back to prevent intersecting the near
...
clip plane. Closes #2617 .
2014-04-08 14:48:01 -07:00
Thijs Wenker
6754a6ca69
Fixed some style
2014-04-08 23:45:27 +02:00
Atlante45
8ad7c3b239
Moved ModelUploader to interface + New error messages
2014-04-08 14:03:27 -07:00
Brad Hefta-Gaub
8e097be28d
Merge pull request #2614 from Atlante45/undo_redo_system
...
Undo redo system
2014-04-08 08:30:29 -10:00
Brad Hefta-Gaub
c865df8b82
Merge pull request #2613 from Atlante45/more_upload_work
...
More upload work
2014-04-08 08:16:07 -10:00
Andrzej Kapolka
ccd7106527
Include "InterfaceConfig" before QOpenGLFramebufferObject to fix Windows
...
build.
2014-04-08 10:54:41 -07:00
Atlante45
eaca699a6d
Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_work
2014-04-08 10:35:23 -07:00
Andrzej Kapolka
d4706bba8a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-08 10:21:13 -07:00