Andrzej Kapolka
|
aa9fc290a5
|
Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior.
|
2014-01-03 16:46:11 -08:00 |
|
Andrzej Kapolka
|
1003393101
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-03 11:11:04 -08:00 |
|
Stephen Birarda
|
a61e214c9a
|
simplify loopback trigger for injected audio
|
2014-01-03 10:16:59 -08:00 |
|
ZappoMan
|
ec1f08b140
|
Merge pull request #1443 from birarda/master
open up more audio to JS
|
2014-01-03 10:12:44 -08:00 |
|
Stephen Birarda
|
f24eff33fe
|
open up ASI playSound method to ScriptEngine
|
2014-01-03 09:38:05 -08:00 |
|
Stephen Birarda
|
443c94a88f
|
repairs to AudioMixer and audio injection flow
|
2014-01-02 17:15:46 -08:00 |
|
ZappoMan
|
696afd7875
|
more warnings fixes
|
2014-01-02 16:18:49 -08:00 |
|
ZappoMan
|
f1da6bf90b
|
fix various compiler warnings on gcc
|
2014-01-02 15:58:03 -08:00 |
|
Andrzej Kapolka
|
460a9aacb8
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-02 15:45:27 -08:00 |
|
ZappoMan
|
366209668d
|
Merge pull request #1431 from stojce/19463
Code Review for Job #19463
|
2014-01-02 15:38:15 -08:00 |
|
Andrzej Kapolka
|
f03139dbe5
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-02 15:38:07 -08:00 |
|
Andrzej Kapolka
|
ed4ad1cea9
|
Removed some unused code.
|
2014-01-02 15:37:56 -08:00 |
|
Stephen Birarda
|
594bd58774
|
add AudioScriptingInterface to expose playSound to JS
|
2014-01-02 15:35:28 -08:00 |
|
Philip Rosedale
|
8f48ca0e95
|
Merge pull request #1437 from ey6es/master
Restore bent arm behavior when pointing (lost in ball removal). Fix compile warning.
|
2014-01-02 15:26:33 -08:00 |
|
Philip Rosedale
|
c47ace6d7f
|
Merge pull request #1436 from birarda/master
changes to audio injector for overlapped sounds in preparation for JS
|
2014-01-02 15:24:47 -08:00 |
|
Stojce Slavkovski
|
3848028365
|
changed locking to QMutexLocker
|
2014-01-03 00:11:24 +01:00 |
|
Andrzej Kapolka
|
0461335887
|
Align hand with forearm in mouse-pointing mode.
|
2014-01-02 14:56:29 -08:00 |
|
Stojce Slavkovski
|
b7bcdf8f8c
|
QMutex reference
|
2014-01-02 23:56:28 +01:00 |
|
Stojce Slavkovski
|
f583013776
|
Merge branch 'master' of https://github.com/worklist/hifi into 19463
|
2014-01-02 23:19:07 +01:00 |
|
Stojce Slavkovski
|
c0fcecad2c
|
Jenkins build fix
|
2014-01-02 23:18:39 +01:00 |
|
Stojce Slavkovski
|
27e211de8d
|
possible fix for jenkins build error
|
2014-01-02 23:10:21 +01:00 |
|
Andrzej Kapolka
|
7178147535
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-02 13:23:39 -08:00 |
|
Andrzej Kapolka
|
6c27569e9b
|
Fix arm bending, compile warning.
|
2014-01-02 13:23:15 -08:00 |
|
Stephen Birarda
|
3a45fb8533
|
cleanup new API for sound injection
|
2014-01-02 12:31:01 -08:00 |
|
Stephen Birarda
|
674c19a570
|
leverage new AudioInjector API for throw and catch sounds
|
2014-01-02 12:17:18 -08:00 |
|
Stojce Slavkovski
|
31fa8ad1fb
|
Merge branch 'master' of https://github.com/worklist/hifi into 19463
|
2014-01-02 21:06:28 +01:00 |
|
Andrew Meadows
|
68c09c5b74
|
Merge 'threedtv' of https://github.com/ZappoMan/hifi for pull 1430
|
2014-01-02 11:59:57 -08:00 |
|
Stephen Birarda
|
a0cf2c8fb1
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-02 09:00:14 -08:00 |
|
ZappoMan
|
48b2d7d3fa
|
scripting for particle to voxel collisions
|
2013-12-31 11:33:43 -08:00 |
|
ZappoMan
|
651d2d0c81
|
rename voxels and particles scripting interfaces
|
2013-12-31 09:41:35 -08:00 |
|
ZappoMan
|
9194a53410
|
change to setScript() since it does more than update
|
2013-12-30 15:55:57 -08:00 |
|
Stojce Slavkovski
|
cd4fcb993f
|
removed unused 'LogDisplay' class
|
2013-12-29 23:52:26 +01:00 |
|
Stojce Slavkovski
|
2b92194d35
|
sytle changes on log dialog
|
2013-12-29 23:45:24 +01:00 |
|
Stojce Slavkovski
|
aa75763b27
|
Merge branch 'master' of https://github.com/worklist/hifi into 19463
|
2013-12-29 22:54:41 +01:00 |
|
ZappoMan
|
788bb530f8
|
added comment
|
2013-12-28 13:02:27 -08:00 |
|
ZappoMan
|
47f45c3af1
|
make sure camera is configured on connect
|
2013-12-28 13:00:25 -08:00 |
|
ZappoMan
|
6f2a1b9802
|
cleanup
|
2013-12-28 12:51:50 -08:00 |
|
ZappoMan
|
32b2fb8f21
|
cleanup
|
2013-12-28 12:08:24 -08:00 |
|
ZappoMan
|
a43844447c
|
first cut at 3D TV support
|
2013-12-28 10:07:33 -08:00 |
|
Philip Rosedale
|
e3a77ef139
|
tuning
|
2013-12-26 20:20:57 -08:00 |
|
Philip Rosedale
|
74380260b3
|
Grab includes rotation
|
2013-12-26 19:07:02 -08:00 |
|
Stojce Slavkovski
|
e0255721da
|
Search keyword highlighter
|
2013-12-24 22:15:19 +01:00 |
|
Stojce Slavkovski
|
840d1a33ef
|
Reveal log file
- change log location lo application data folder
- reveal file in Finder (Explorer) implementation
|
2013-12-23 21:23:47 +01:00 |
|
Stojce Slavkovski
|
505ed5bc64
|
Storing log to file - initial
|
2013-12-22 23:55:21 +01:00 |
|
Stojce Slavkovski
|
ee1eb25dfa
|
replace LogDisplay with File logger
- added abstract logger interface
|
2013-12-22 18:56:53 +01:00 |
|
Stojce Slavkovski
|
3d44ab9939
|
Dialog layout
|
2013-12-22 15:06:40 +01:00 |
|
Philip Rosedale
|
9b3973c2e4
|
removed headers
|
2013-12-21 18:07:40 -08:00 |
|
Philip Rosedale
|
58a73dfede
|
yet again remove the test _balls now that we have a particle server
|
2013-12-21 18:06:04 -08:00 |
|
Philip Rosedale
|
03d192574d
|
typo
|
2013-12-20 22:57:35 -08:00 |
|
Philip Rosedale
|
bad47bd527
|
Fixed chat height
|
2013-12-20 15:33:56 -08:00 |
|