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
AndrewMeadows
89c2812551
Merge pull request #2631 from birarda/master
...
move repo over to Apache 2.0 license
2014-04-09 15:34:00 -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
Stephen Birarda
49a9653399
Merge pull request #2619 from Atlante45/master
...
Moved ModelUploader to interface + New error messages
2014-04-09 14:38:36 -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
Andrew Meadows
698e3783e0
fixing formatting
2014-04-09 13:06:29 -07:00
Stephen Birarda
a33263ec22
Merge pull request #2594 from Forceflow/master
...
GLEW detection on Win32 fix
2014-04-09 13:03:00 -07:00
Andrew Meadows
7304049f83
update boiler plate to abide by new standard
2014-04-09 12:55:29 -07:00
Clément Brisset
184718318c
Merge pull request #2634 from stojce/19548
...
#19548 Modify icons in Interface "mirror"
2014-04-09 12:32:04 -07:00
Stephen Birarda
29f8ed3c09
manually fix Plane include guard since regex did not catch
2014-04-09 12:03:57 -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
ced5e72d39
add date to capsule shape
2014-04-09 10:46:36 -07:00
Stephen Birarda
2d755adfc0
repairs to good code blown away by regex
2014-04-09 10:46:20 -07:00
Stephen Birarda
11c235a29e
fixes to source files for code remove in regex replace
2014-04-09 10:16:56 -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
619e9d7cd3
more header repairs caught via find
2014-04-09 09:52:00 -07:00
Stephen Birarda
c9b58c0ee9
fix headers in h files in tests, fix Andrew's dates
2014-04-09 09:49:47 -07:00
Stephen Birarda
cb402e3eb3
run apache header script on tests
2014-04-09 09:46:43 -07:00
Stephen Birarda
6ce5a24460
missed copyright cleanups in apache header
2014-04-09 09:44:38 -07:00
Stephen Birarda
a65f8faea9
fix Plane header that was not caught
2014-04-09 09:36:13 -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
Stephen Birarda
fbd2066b0c
more apache licensing for cmake files
2014-04-09 09:25:34 -07:00
Stephen Birarda
067ea5b5b6
add a missing space in company name in paintGun
2014-04-09 09:22:19 -07:00
Stephen Birarda
4a398494b1
ensure spacing in company name for JS licenses
2014-04-09 09:21:54 -07:00
Stephen Birarda
9950845566
more apache licensing tweaks to JS files
2014-04-09 09:19:29 -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
0f204f932c
add apache license information to more js files
2014-04-08 18:00:24 -07:00
Stephen Birarda
8ff244cc1a
add missing space for example replace in javascripts
2014-04-08 17:58:02 -07:00
Stephen Birarda
71c3443614
mass replacement of js of hifi with examples
2014-04-08 17:56:56 -07:00
