Brad Hefta-Gaub
89a6ecd1c1
Merge pull request #2301 from Geenz/19514
...
Code Review for Job #19514
2014-03-13 16:31:06 -07:00
Dimitar Dobrev
85a15a2284
Moved the chat from a window to a built-in panel.
2014-03-14 01:12:25 +02:00
Geenz
55d0835ba1
Indentation!
2014-03-13 19:08:18 -04:00
Dimitar Dobrev
881ecb07cd
Changed the font of the entire chat window to Helvetica/Arial.
2014-03-14 01:07:21 +02:00
Geenz
b34921ea6d
Merge branch 'master' of https://github.com/Geenz/hifi into 19514
2014-03-13 18:55:36 -04:00
Geenz
4523ae742e
Tweak in code styling per Brad’s feedback, along with using SIGNAL and SLOT instead of function pointers directly.
2014-03-13 18:51:14 -04:00
Atlante45
423f26f669
Review comments
2014-03-13 15:26:02 -07:00
Atlante45
0748682119
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
2014-03-13 15:04:49 -07:00
Geenz
4d5b4081e1
Merge branch 'master' of https://github.com/Geenz/hifi into 19514
2014-03-13 14:40:10 -04:00
Andrzej Kapolka
b2a29cb84f
Fixes for Linux build.
2014-03-13 10:56:19 -07:00
Atlante45
51585acd25
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
2014-03-13 10:53:24 -07: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
Geenz
f9be989a98
Merge branch 'master' of https://github.com/Geenz/hifi into 19514
2014-03-13 11:43:43 -04:00
Geenz
2e119fa0fe
Skip rendering when we're minimized.
2014-03-13 11:41:15 -04: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
Brad Hefta-Gaub
79b1465cb0
Merge pull request #2275 from Atlante45/editVoxels
...
Edit voxels
2014-03-12 18:52:55 -07:00
Geenz
d580f177a3
Refactor if..else into a switch.
...
Also support the hidden and suspended states.
2014-03-12 21:17:54 -04:00
Geenz
292f37154b
Use the applicationStateChanged signal.
2014-03-12 21:08:55 -04:00
Geenz
e27af75ad2
Use QApplication::applicationState to detect if we're in the background.
...
May want to expand upon this at some point; if we’re hidden we most
definitely *do not* want to render anything
2014-03-12 20:49:58 -04:00
Geenz
9c61f12926
Support for an idle render time step.
...
The basics of this is, if the application has changed its active state
then we only call paintGL every N milliseconds. Currently the default
time step is 100 milliseconds.
2014-03-12 19:10:26 -04:00
Dimitar Dobrev
6d4d61c38a
Removed the double border between the sent messages and the entry.
2014-03-13 01:06:11 +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
Andrzej Kapolka
ffe3717573
Enable back face culling on the opaque parts of avatars.
2014-03-12 15:10:33 -07:00
Andrzej Kapolka
bab74e9cd4
Push the distance back even more.
2014-03-12 15:01:09 -07:00
Andrzej Kapolka
889c1358fc
Increase the distance at which avatars glow when moving.
2014-03-12 14:56:52 -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
f85f49caa6
Might as well update this.
2014-03-12 14:03:22 -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
Andrzej Kapolka
f088912ecf
More GCC warning fixes.
2014-03-12 12:51:43 -07:00
Andrzej Kapolka
f1145272eb
Signed/unsigned fix.
2014-03-12 12:29:01 -07: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
Andrew Meadows
e68241d2a9
using glm::degrees() instead of DEGREES_PER_RADIAN
2014-03-12 12:08:27 -07:00
Andrew Meadows
c3e8d51694
orientation stored in dataserver is in degrees
2014-03-12 12:06:59 -07:00
Atlante45
5cb9ea8402
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
2014-03-12 11:49:20 -07:00
Atlante45
b9ee60ba41
FstReader not a member anymore
2014-03-12 11:47:47 -07:00
Atlante45
855f6fcf59
Moved Avatar upload to file Menu
2014-03-12 11:46:41 -07:00
AndrewMeadows
1f80a5a074
Merge pull request #2269 from ey6es/master
...
Fix for white flashes when loading avatars, performance improvements.
2014-03-12 11:43:13 -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
