Leonardo Murillo
|
eb52ded4ad
|
Styling + others
|
2014-01-09 20:34:02 -06:00 |
|
Leonardo Murillo
|
664a1a7677
|
Checkpoint
|
2014-01-09 20:12:39 -06:00 |
|
Leonardo Murillo
|
9dd37344b8
|
checkpoint
|
2014-01-09 16:14:51 -06:00 |
|
Leonardo Murillo
|
efb173e1d4
|
Preliminary update dialog work
|
2014-01-08 21:20:43 -06:00 |
|
Leonardo Murillo
|
d44126ac33
|
Get version XML and store latest version as application property
|
2014-01-08 08:30:50 -06:00 |
|
Leonardo Murillo
|
251416ab0a
|
Merge branch 'master' of github.com:/worklist/hifi
|
2014-01-07 14:39:18 -06:00 |
|
Andrzej Kapolka
|
8b2212b6cf
|
Fix for "red ball" issue with no skeleton: use avatar position for head
position.
|
2014-01-06 12:08:42 -08:00 |
|
Leonardo Murillo
|
314c4ffcfa
|
Using applicationVersion() instead of const wherever version is specified
|
2014-01-06 09:24:29 -06:00 |
|
Leonardo Murillo
|
ba79b1b329
|
Using BUILD_VERSION to setApplicationVersion
|
2014-01-06 09:18:10 -06:00 |
|
Brad Hefta-Gaub
|
0df02618ee
|
use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces
|
2014-01-04 03:16:47 -08:00 |
|
Andrzej Kapolka
|
2b15fdf78f
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-03 17:49:34 -08:00 |
|
Andrzej Kapolka
|
aa9fc290a5
|
Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior.
|
2014-01-03 16:46:11 -08:00 |
|
Andrew Meadows
|
6518e70688
|
Minor cast enforcement during initialization.
|
2014-01-03 16:27:57 -08:00 |
|
Andrew Meadows
|
1882c9e43b
|
Merge branch 'elasticity' of https://github.com/PhilipRosedale/hifi into elasticity-fix
Conflicts:
libraries/particles/src/ParticleCollisionSystem.cpp
|
2014-01-03 16:26:17 -08:00 |
|
Philip Rosedale
|
83101d3d11
|
reduce elasticity to be less than 1
|
2014-01-03 15:31:16 -08:00 |
|
Philip Rosedale
|
2cf5efc4a8
|
Merge pull request #1449 from PhilipRosedale/mirror
Mirror
|
2014-01-03 15:25:28 -08:00 |
|
Philip Rosedale
|
2286916fbb
|
Don’t render head if inside it!
|
2014-01-03 15:00:42 -08:00 |
|
Philip Rosedale
|
65340f1667
|
Tweaked mirror distances
|
2014-01-03 14:33:54 -08:00 |
|
Stephen Birarda
|
91b07d93c8
|
Merge pull request #1440 from PhilipRosedale/buckyballs
Removed some more old balls/hair/particle code, added local-only version of buckyballs to try playing with
|
2014-01-03 14:21:29 -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 |
|
Philip Rosedale
|
3fe972791c
|
remove unused mohawk and hair physics
|
2014-01-02 17:12:34 -08:00 |
|
Philip Rosedale
|
2ad3aea729
|
Cleanup to move BuckyBalls prototype to own class file
|
2014-01-02 17:02:04 -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 |
|
Philip Rosedale
|
b9d68ec087
|
removed old ParticleSystem class
|
2014-01-02 15:53:11 -08:00 |
|
Philip Rosedale
|
739a02c022
|
merge fixes
|
2014-01-02 15:46:37 -08:00 |
|
Andrzej Kapolka
|
460a9aacb8
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-02 15:45:27 -08:00 |
|
Philip Rosedale
|
c286f84d97
|
removed trigger being used for toy ball catching
|
2014-01-02 15:38:21 -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 |
|