ZappoMan
2cc42f6773
support piggybacking voxel and voxel stats messages into single packet
2013-07-19 15:59:47 -07:00
ZappoMan
d9c8a59929
send voxel scene stats from server to client
2013-07-19 15:09:38 -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
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
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
Jeffrey Ventrella
b765de6990
Merge remote-tracking branch 'upstream/master' into particles
2013-07-15 17:58:38 -07:00
Jeffrey Ventrella
0481a81ca7
moved finger particles over to hand.cpp
2013-07-15 17:58:17 -07:00
ZappoMan
a3009981d0
added Import Voxels to Clipboard
2013-07-15 17:54:50 -07:00
Stephen Birarda
9f9d8e59bd
don't accept voxel packet if rendering is turned off, correct boolean for kill
2013-07-15 17:12:44 -07:00
Stephen Birarda
38d8041bfb
kill local voxels when voxel rendering is turned off
2013-07-15 17:12:24 -07:00
ZappoMan
01b7f3868b
Merge pull request #672 from birarda/domain-switch
...
add an option in preferences to dynamically switch domain servers
2013-07-15 17:10:18 -07:00
ZappoMan
31875abcab
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
2013-07-15 17:05:10 -07:00
Stephen Birarda
c27cd7ae42
couple of type squishes in NodeList
2013-07-15 16:49:36 -07:00
ZappoMan
1fb1622beb
added sleep to sendVoxelOperation() to keep from overwhelming server
2013-07-15 16:27:23 -07:00
atlante45
bf328c8532
Improved import system copying to clipboard
2013-07-15 16:07:50 -07:00
Stephen Birarda
9fe1c7c63d
lock the voxel server when receiving data to avoid race crash
2013-07-15 15:59:31 -07:00
Stephen Birarda
6c2682833e
lock on the solo voxelServer before deleting local voxels
2013-07-15 15:53:25 -07:00
Stephen Birarda
6b83f95f9e
conditionally set a new hostname on preferences save
2013-07-15 15:46:04 -07:00
Jeffrey Ventrella
56d0c7d7e4
added array of finger emitters for particle system
2013-07-15 15:45:31 -07:00
Stephen Birarda
d389dc6e3a
add method to NodeList to set domain IP to local, move mutex lock to node
2013-07-15 15:17:10 -07:00
Jeffrey Ventrella
c0f319f077
merge
2013-07-15 14:36:11 -07:00
Jeffrey Ventrella
f75ce72aca
Merge remote-tracking branch 'upstream/master' into particles
2013-07-15 14:30:19 -07:00
