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
Atlante45
18b364d9d9
Removed QResources from Interface
2014-04-11 11:57:25 -07:00
Stephen Birarda
1cd5fec71c
push packet version for assignments
2014-04-11 11:42:33 -07:00
Andrzej Kapolka
d6534d6026
Tweak to zoom on pushback.
2014-04-11 11:10:22 -07:00
Stephen Birarda
6431d35f86
add a missing newline to DomainHandler
2014-04-11 10:19:31 -07:00
Andrzej Kapolka
b7725f094d
Trying the narrowing effect with pushback for other avatars.
2014-04-11 10:19:16 -07:00
Andrzej Kapolka
00e2ff93e3
Playing around with zooming in while pulling back.
2014-04-11 10:08:44 -07:00
Stephen Birarda
9fcb656027
add a newline to FindGnuTLS and fix filename in header
2014-04-11 09:26:45 -07:00
Andrew Meadows
f7862eb600
check for bad deltaTime during avatar-avatar collisions
2014-04-11 08:58:26 -07:00
AndrewMeadows
e850faee79
Merge pull request #2649 from ey6es/master
...
Experimental "pushback" to avoid other avatars' intersecting the near clip plane.
2014-04-11 07:50:52 -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
Andrzej Kapolka
806bcc8e6f
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-10 18:49:52 -07:00
Andrzej Kapolka
d712588b36
Better rolloff.
2014-04-10 17:35:47 -07:00
Andrew Meadows
af158a3a94
save settings when any checkable menu item changes
2014-04-10 17:34:12 -07:00
Andrew Meadows
a436b59971
save settings for change in: identity, position
2014-04-10 17:14:51 -07:00
Andrzej Kapolka
197adce4de
Fall intersection off with angle to other avatar.
2014-04-10 17:14:49 -07:00
Andrew Meadows
66b6328687
protection against bad avatar-avatar collisions
...
Also with logging if we encounter incorrectly large penetration depths
2014-04-10 16:58:52 -07:00
Clément Brisset
5f6dee6c64
Merge pull request #2635 from thoys/windows-script-path-fix
...
Fixed loading local stored scripts on Windows machines
2014-04-10 16:40:47 -07:00
Clément Brisset
d7c2b44ad4
Merge pull request #2633 from stojce/19508
...
#19508 Implement a new UI for Preferences
2014-04-10 16:33:38 -07:00
Stojce Slavkovski
3af3b29588
removed dependency on QT resource
2014-04-11 00:54:54 +02: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
Andrzej Kapolka
475528f112
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-10 15:00:32 -07:00
Andrzej Kapolka
6cf971c849
More intersection-avoidance tweaks.
2014-04-10 14:51:43 -07:00
Stojce Slavkovski
112c8946d6
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-10 23:46:22 +02:00
Stephen Birarda
5f1e63bb4a
Merge pull request #2647 from AndrewMeadows/fix-crash
...
fix crash: don't access null action
2014-04-10 14:44:01 -07:00
Stephen Birarda
11f5ee202a
Merge pull request #2646 from Atlante45/master
...
Fixed dometime using wrong texdir
2014-04-10 14:43:36 -07:00
Stephen Birarda
fbb0e01f2c
Merge pull request #2648 from Atlante45/glow_when_talking
...
Modified max glow + don't glow you own avatar
2014-04-10 14:43:13 -07:00
Atlante45
9c662acc9d
Modified max glow + don't glow you own avatar
2014-04-10 14:40:35 -07:00
Philip Rosedale
3f0793286f
Merge pull request #2644 from Atlante45/glow_when_talking
...
Glow when you talk, flash when you clip
2014-04-10 13:46:52 -07:00
Andrew Meadows
ac9ead36e2
fix crash: don't access null action
...
In particular, don't crash on pressing Enter when lacking qxmpp support
2014-04-10 13:10:24 -07:00
Stojce Slavkovski
459fed5c7b
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-10 21:52:37 +02:00
Atlante45
ea93be15f1
Fixed dometime using wrong texdir
2014-04-10 12:44:51 -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
Stephen Birarda
86b0b78692
add a missing semi-colon for windows build
2014-04-10 12:27:52 -07:00
Stephen Birarda
9912c4c9a7
just call free instead of gnutls_free on windows
2014-04-10 12:24:41 -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
Stephen Birarda
38867a2f09
fix for re-declarations of xgnutls_free
2014-04-10 12:14:37 -07:00
Stephen Birarda
97444eac1c
put gnutls_free fix in DTLSSession header
2014-04-10 12:11:41 -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
Andrzej Kapolka
873541dd7b
Trying out basic pushback for other avatars.
2014-04-10 11:56:17 -07:00
Atlante45
2cc2149647
Glow when you talk, flash when you clip
...
closes #2592
2014-04-10 11:55:30 -07:00
Stephen Birarda
2c96ce08ae
add stackoverflow fix for lnk2001 error in gnutls_free
2014-04-10 11:50:26 -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
cfc2431a59
don't be a dummy and include Systime header from implementation
2014-04-10 11:37:09 -07:00
Stephen Birarda
00a826330e
use GetSystemTimeAsFileTime with previous gettimeofday setup
2014-04-10 11:34:43 -07:00
Stephen Birarda
ea8f0df17d
use extern C in Systime header
2014-04-10 11:30:20 -07:00
Stephen Birarda
885cee28c5
guard Systime against being included on UNIX/OS X
2014-04-10 11:28:22 -07:00
