Jeffrey Ventrella
d2d8019e73
Merge remote-tracking branch 'upstream/master' into particles
2013-07-19 15:51:14 -07:00
Jeffrey Ventrella
87d9aae328
improvements to particle system
2013-07-19 15:50:40 -07:00
Mark Peng
ceb743a65d
Remove unncessary import math.h (for reals).
2013-07-19 00:56:12 -07:00
Mark Peng
fc22240525
Remove unnecessary import math.h.
2013-07-19 00:55:31 -07:00
Mark Peng
a84c1c9e21
Merge remote-tracking branch 'upstream/master'
2013-07-19 00:46:52 -07:00
Mark Peng
927aea8bb4
Bug fix on lookatVectors (fixed scale in head.cpp). Added bool
...
isLookingAtOtherAvatar. Basic halo indicator in Application.cpp.
2013-07-19 00:44:23 -07:00
Mark Peng
cfcb31172c
Merge remote-tracking branch 'upstream/master'
2013-07-18 21:08:08 -07:00
Stephen Birarda
ef7dc4a39a
if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME
2013-07-18 17:42:25 -07:00
Stephen Birarda
01e6891fd3
save custom domain server hostname to QSettings
2013-07-18 17:23:52 -07:00
Stephen Birarda
a00b95666a
don't listen to VS packets not from current VS
2013-07-18 15:49:07 -07:00
Stephen Birarda
45d82dc97c
correct reference to new hostname for Qt temp variable changes
2013-07-18 15:20:05 -07:00
Stephen Birarda
4dd6afc08f
fix grabbing of domain server hostname from QString
2013-07-18 14:59:11 -07:00
Stephen Birarda
04a2dd3b86
clear environment data on domain server switch
2013-07-18 14:36:55 -07:00
Mark Peng
fe01067473
Merge remote-tracking branch 'upstream/master'
2013-07-18 14:35:41 -07:00
Mark Peng
7ee0d8da2e
Render circle in 3D space for lookatIndicator. Still not normal to the screen.
2013-07-18 14:34:51 -07:00
Philip Rosedale
e6cd90fa37
Merge pull request #704 from Ventrella/particles
...
more code cleanup
2013-07-18 11:08:18 -07:00
Stephen Birarda
2ad99f3129
point to stars file on non-SSL for easier RV redirect
2013-07-18 10:26:08 -07:00
Jeffrey Ventrella
f89b1fcd4c
more clean up of particle system
2013-07-17 18:10:30 -07:00
Mark Peng
6006b8e96b
Merge remote-tracking branch 'upstream/master'
2013-07-17 17:28:12 -07:00
Mark Peng
125bcc46f4
Circle drawn with camera orientation as its normal for lookatIndicator.
2013-07-17 17:27:15 -07:00
Jeffrey Ventrella
9c2ea6e7e4
more clean up
2013-07-17 17:07:53 -07:00
Jeffrey Ventrella
ea7e16660c
Merge remote-tracking branch 'upstream/master' into particles
2013-07-17 16:43:57 -07:00
Jeffrey Ventrella
be5612711b
clean up of particle system
2013-07-17 16:43:34 -07:00
Eric Johnston
57c2f16894
Merge branch 'master' of https://github.com/worklist/hifi into dev4
...
Conflicts:
interface/src/Hand.cpp
2013-07-17 16:42:11 -07:00
Jeffrey Ventrella
1f1259cec5
added particle life stages
2013-07-17 16:03:10 -07:00
Jeffrey Ventrella
d0dffb464b
added emitter particle
2013-07-17 14:51:11 -07:00
Mark Peng
0bbea078b5
Merge remote-tracking branch 'upstream/master'
2013-07-17 13:52:46 -07:00
Mark Peng
5ffe3fa4b4
Rendering of indicator circle in 3D space. Spacing edits in util.
2013-07-17 13:52:05 -07:00
Jeffrey Ventrella
202fb95102
turned off setShowingEmitter
2013-07-17 13:51:00 -07:00
Jeffrey Ventrella
5a0fcb7f6c
adding more behavior to the particle system
2013-07-17 13:47:18 -07:00
Jeffrey Ventrella
98dd83dde8
ahibfasubhdf
2013-07-17 10:02:23 -07:00
Jeffrey Ventrella
0be15231b9
ahibfasubhdf
2013-07-17 10:01:23 -07:00
Eric Johnston
39130aef58
Rave Glove demo: activation mode and stage (dark backdrop) drawing.
2013-07-16 18:10:54 -07:00
Stephen Birarda
7cec2f5ffd
use fprintf instead of printf and flush for qDebug
2013-07-16 15:27:14 -07:00
Stephen Birarda
1e0f3e4d1c
Merge pull request #686 from Atlante45/few_avatar_resizing_correction
...
Few avatar resizing correction
2013-07-16 14:31:27 -07:00
Stephen Birarda
8464a013fe
fix format string warnings in Application
2013-07-16 13:39:24 -07:00
Stephen Birarda
c78759da16
cleanup printLogs reintroduce on merge with upstream master
2013-07-16 13:37:16 -07:00
Stephen Birarda
9d62e7f187
Merge remote-tracking branch 'upstream/master' into qdebug
2013-07-16 13:34:42 -07:00
Stephen Birarda
ce0c9e2e1a
flush stdout in case non new-line output is received
2013-07-16 12:58:16 -07:00
Stephen Birarda
16d603e203
clean up extra new lines and LogDisplay line break
2013-07-16 12:53:43 -07:00
Stephen Birarda
1b48d4f0fc
revert removal of extraneous newlines
2013-07-16 12:46:32 -07:00
atlante45
13762da7d8
Changed shortcuts to ALT+ +/-
2013-07-16 12:03:07 -07:00
Stephen Birarda
51d1e6ae80
add a message handler to send messages over to LogDisplay
2013-07-16 11:50:40 -07:00
Stephen Birarda
89d3cfdb6f
remove now extraneous newlines after switch to QDebug
2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756
switch calls to printLog to QDebug
2013-07-16 11:07:22 -07:00
Stephen Birarda
3f9865759c
Merge pull request #682 from ZappoMan/bug_fixes
...
Import Voxels and Paste Bug fixes
2013-07-16 10:11:11 -07:00
ZappoMan
440352c584
white space
2013-07-16 10:02:27 -07:00
ZappoMan
42e5440b7b
CR feedback
2013-07-16 10:00:55 -07:00
Eric Johnston
802abade4f
Fixed problem in idle(), causing events to stack up.
...
The problem was that idle() was set on a zero-ms timer (using idleTimer->start(0)), and the time is then self-regulated by returning early if it's not time yet.
Because of this, Qt stays perpetually in the timer servicing, instead of processing events. This causes keys and menu items to be delayed if the user drags the mouse before activating them, especially at low frame rates. It also causes very-delayed multitouch response.
The fix I've applied is to reset the idle timer after servicing the idle. I've set it to 2ms because I noticed that 1ms didn't always clear out all of the events. We can tune it to whatever we need, or even calculate it based on the time it took us to service the idle.
2013-07-15 18:16:50 -07:00
ZappoMan
e4b7ba7428
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
2013-07-15 17:58:45 -07:00
