Andrzej Kapolka
|
38118fdab0
|
When we start setting the fake coefficients after we set the real ones, make
sure all of the other coefficients are zero.
|
2014-01-10 14:42:05 -08:00 |
|
stojce
|
d5e07a5c75
|
Add import configuration
remove unused icons
remove redundant QLabels
|
2014-01-10 23:26:58 +01:00 |
|
Andrzej Kapolka
|
4ae5203f38
|
Remove unused constant.
|
2014-01-10 14:10:33 -08:00 |
|
Andrzej Kapolka
|
9fa170494c
|
I believe what we really want to decay is the mouse pitch.
|
2014-01-10 14:04:46 -08:00 |
|
Andrzej Kapolka
|
e97970d961
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-10 12:27:04 -08:00 |
|
Andrzej Kapolka
|
131af0cf16
|
I believe this should fix the "Joint/model not in model list" errors.
|
2014-01-10 12:26:11 -08:00 |
|
Andrew Meadows
|
c4c0c389ae
|
Temporarily disabling DAMPING and non-unity ELASTICITY during particle-particle collisions
|
2014-01-10 11:42:23 -08:00 |
|
Andrew Meadows
|
71e5de8420
|
Adding Particle::_mass and correct elastic collisions between particles
|
2014-01-10 11:37:01 -08:00 |
|
Philip Rosedale
|
f0460bac5f
|
Merge pull request #1492 from stojce/19466
Code Review for Job #19466
|
2014-01-10 11:19:43 -08:00 |
|
Brad Hefta-Gaub
|
50fa6be829
|
Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache
|
2014-01-09 19:41:15 -08:00 |
|
ZappoMan
|
88232f320c
|
Merge pull request #1469 from birarda/kill-leap
remove leap integration
|
2014-01-09 19:40:58 -08:00 |
|
Brad Hefta-Gaub
|
e908121bcd
|
fix bug in Octree server that wasn't properly surpressing duplicate packets
|
2014-01-09 19:13:17 -08:00 |
|
Brad Hefta-Gaub
|
5787d3d9e9
|
more cast coding standard fixes
|
2014-01-09 19:00:57 -08:00 |
|
Brad Hefta-Gaub
|
cdb4b8c5f3
|
Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache
|
2014-01-09 18:52:34 -08:00 |
|
Brad Hefta-Gaub
|
5b14a4eed3
|
removed dead code
|
2014-01-09 14:52:40 -08:00 |
|
Brad Hefta-Gaub
|
6e95c52444
|
make local voxel cache properly switch to different cache file when switching domains
|
2014-01-09 14:51:04 -08:00 |
|
Brad Hefta-Gaub
|
c181d0a849
|
first cut at local voxel cache
|
2014-01-09 12:05:09 -08:00 |
|
Brad Hefta-Gaub
|
03794f7218
|
make casts float match coding standard
|
2014-01-09 10:07:51 -08:00 |
|
Lucas Crisman
|
e1aa74a5df
|
equal sign key as shortcut for Reset Avatar Size
|
2014-01-09 15:00:55 -03:00 |
|
stojce
|
5b678cb24d
|
Layout fix
|
2014-01-09 18:15:39 +01:00 |
|
stojce
|
6dc9ea8a2e
|
Merge branch 'master' of https://github.com/worklist/hifi into 19483
|
2014-01-08 19:25:00 +01:00 |
|
Stephen Birarda
|
9e49f200a6
|
Merge pull request #1468 from ey6es/master
Fix for "red ball" issue with no skeleton: use avatar position for head
|
2014-01-06 16:15:44 -08:00 |
|
stojce
|
cc543f4313
|
Added custom icons (QFileIconProvider)
|
2014-01-07 00:41:11 +01: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 |
|
Stephen Birarda
|
133ba3a230
|
remove Leap integration from CMakeLists
|
2014-01-06 11:13:19 -08:00 |
|
Stephen Birarda
|
9eb31b48cc
|
remove the Leap integration
|
2014-01-06 11:09:59 -08:00 |
|
stojce
|
f6927bae10
|
Merge branch 'master' of https://github.com/worklist/hifi into 19483
|
2014-01-06 11:33:36 +01:00 |
|
stojce
|
8855a32526
|
removed unused widgets
|
2014-01-06 11:15:15 +01:00 |
|
Philip Rosedale
|
61d3f63f9c
|
Merge pull request #1458 from birarda/master
fix random UUID creation for injector, assume RAW passed to sound is 48Khz
|
2014-01-05 21:37:47 -08:00 |
|
Stephen Birarda
|
32be6199fd
|
fix reference to downloaded byte array samples
|
2014-01-05 17:41:33 -08:00 |
|
Stephen Birarda
|
a06f18328c
|
add downsampling so RAW audio for sound assumed to be 48Khz
|
2014-01-05 17:40:37 -08:00 |
|
Stephen Birarda
|
5b272bfd6a
|
fix random UUID creation for injected audio
|
2014-01-05 17:09:57 -08:00 |
|
stojce
|
11bf9b8a50
|
Merge branch 'master' of https://github.com/worklist/hifi into 19483
|
2014-01-05 23:45:37 +01:00 |
|
stojce
|
f0015939c4
|
removed unused elements from import dialog (preview box and import to clipboard checkbox)
|
2014-01-05 23:45:22 +01:00 |
|
Philip Rosedale
|
7c97247a92
|
Merge pull request #1455 from ZappoMan/more_scripting
change particle update to support full script engine
|
2014-01-05 13:50:49 -08:00 |
|
Brad Hefta-Gaub
|
7ce774da70
|
change particle update to support full script engine
|
2014-01-05 10:39:58 -08:00 |
|
Philip Rosedale
|
909663fe96
|
Merge pull request #1454 from ZappoMan/bugfixes
fixes to scriptable particle collisions
|
2014-01-04 16:28:48 -08:00 |
|
Brad Hefta-Gaub
|
0252e7f95e
|
use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces
|
2014-01-04 03:17:02 -08: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 |
|
Brad Hefta-Gaub
|
3efc1ea410
|
Merge branch 'master' of git://github.com/worklist/hifi into bugfixes
|
2014-01-04 01:47:49 -08:00 |
|
Brad Hefta-Gaub
|
207ea30c6d
|
fix delete problem with voxels
|
2014-01-04 01:10:48 -08:00 |
|
Philip Rosedale
|
607d8332e3
|
Merge pull request #1452 from ey6es/master
First cut at orbit behavior (plus ray/capsule intersection test for avatar picking).
|
2014-01-03 20:02:11 -08:00 |
|
Andrzej Kapolka
|
02adcbc309
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-03 18:17:20 -08:00 |
|
Andrzej Kapolka
|
35009c384f
|
Merge pull request #1453 from PhilipRosedale/master
two new scripts: Clap, PlaySound
|
2014-01-03 18:16:52 -08:00 |
|
Brad Hefta-Gaub
|
e97e211bc4
|
quiet down some debugging
|
2014-01-03 18:10:30 -08:00 |
|
Andrzej Kapolka
|
e37203d833
|
The overloaded function should be const, true.
|
2014-01-03 17:59:15 -08:00 |
|
Philip Rosedale
|
a2c33aadba
|
two script example files
|
2014-01-03 17:58:00 -08:00 |
|
Andrzej Kapolka
|
1bd069c4e2
|
Removed unused variable.
|
2014-01-03 17:56:55 -08:00 |
|
Andrzej Kapolka
|
2b15fdf78f
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-03 17:49:34 -08:00 |
|
Andrzej Kapolka
|
c2af9becba
|
Ray/capsule intersection test.
|
2014-01-03 17:48:58 -08:00 |
|