ZappoMan
|
666393fdad
|
removed dead code
|
2014-02-06 20:05:48 -08:00 |
|
ZappoMan
|
77e7f336d5
|
scriptable camera
|
2014-02-06 20:03:57 -08:00 |
|
Philip Rosedale
|
4d55f35b1b
|
Merge pull request #1903 from ZappoMan/delete_voxel_glitch
fix slight glitch in last child delete from larger voxel
|
2014-02-06 08:17:51 -08:00 |
|
Brad Hefta-Gaub
|
8fbce35944
|
fix slight glitch in last child delete from larger voxel
|
2014-02-06 03:44:21 -08:00 |
|
Brad Hefta-Gaub
|
a16b3a34e4
|
fix stutter while spinning
|
2014-02-06 02:18:28 -08:00 |
|
ZappoMan
|
1c47ab9fcb
|
Merge branch 'master' of https://github.com/worklist/hifi into remove_local_cache
|
2014-02-05 20:57:47 -08:00 |
|
ZappoMan
|
4410fbb3f2
|
Merge branch 'master' of https://github.com/worklist/hifi into remove_local_cache
|
2014-02-05 20:47:35 -08:00 |
|
Brad Hefta-Gaub
|
4f5a27796f
|
fix warning
|
2014-02-05 20:46:17 -08:00 |
|
ZappoMan
|
6e6eece814
|
Merge pull request #1894 from AndrewMeadows/issue-1880
fix for visibility of head geometry when in first-person
|
2014-02-05 20:34:05 -08:00 |
|
ZappoMan
|
f657a3efe9
|
remove local cache option
|
2014-02-05 20:02:01 -08:00 |
|
Andrew Meadows
|
4e8dd7c92a
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into issue-1880
|
2014-02-05 15:37:12 -08:00 |
|
Andrew Meadows
|
aa3a1a9a72
|
Stop rendering our head in first person camera mode.
|
2014-02-05 15:35:57 -08:00 |
|
ZappoMan
|
8cc4666f2a
|
fix spacing
|
2014-02-05 14:00:17 -08:00 |
|
ZappoMan
|
b0ccedd1a6
|
fix spacing
|
2014-02-05 13:59:17 -08:00 |
|
Brad Hefta-Gaub
|
a05e07460f
|
fix windows build errors and warnings
|
2014-02-05 13:54:17 -08:00 |
|
Stephen Birarda
|
96fd73a766
|
fixed wrapped read of samples from end of buffer
|
2014-02-05 11:39:03 -08:00 |
|
Stephen Birarda
|
cff4994c01
|
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-fixes
|
2014-02-05 11:04:24 -08:00 |
|
Stephen Birarda
|
6b3b03228e
|
audio repairs so buffers do not climb
|
2014-02-05 10:22:07 -08:00 |
|
AndrewMeadows
|
42528be7ca
|
Merge pull request #1846 from ZappoMan/fixdebugoutput
fix debug to properly work with outputBufferBits()
|
2014-02-05 10:03:09 -08:00 |
|
ZappoMan
|
38c180065d
|
Merge pull request #1863 from AndrewMeadows/stable-camera
Fix #1862 camera should not follow head orientation when using faceshift
|
2014-02-05 09:58:05 -08:00 |
|
Stephen Birarda
|
c194ad1b2d
|
Merge pull request #1873 from ZappoMan/bugfixes
Fix corruption in voxel packets
|
2014-02-04 23:17:45 -08:00 |
|
ZappoMan
|
b0c41b086d
|
fix voxel packet corruption
|
2014-02-04 22:54:55 -08:00 |
|
ZappoMan
|
2f14b265a8
|
make sure SVO files with version details are supported
|
2014-02-04 20:24:08 -08:00 |
|
ZappoMan
|
305e34e834
|
more tweaks to particles with models rendering to make space invaders work
|
2014-02-04 20:18:45 -08:00 |
|
Andrew Meadows
|
1ad2171952
|
Fix #1862 camera should not follow head orientation when using faceshift
|
2014-02-04 15:23:10 -08:00 |
|
ZappoMan
|
055dae5f78
|
tweak modelScale to 2.0 for better space invaders
|
2014-02-04 14:04:21 -08:00 |
|
ZappoMan
|
468cd0d8bb
|
temporary hack to work around model scale data corruption
|
2014-02-04 13:21:31 -08:00 |
|
ZappoMan
|
2cf2e693b9
|
fix debug to properly work with outputBufferBits()
|
2014-02-04 12:29:55 -08:00 |
|
ZappoMan
|
c739c2452a
|
Merge pull request #1832 from birarda/script-timer
hide ScriptEngine calls from JS
|
2014-02-03 12:45:41 -08:00 |
|
Andrew Meadows
|
cb186b10db
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup
Conflicts:
interface/src/Application.cpp
|
2014-02-03 12:29:44 -08:00 |
|
Stephen Birarda
|
028eec7164
|
don't allow calls to init, run, evaluate from JS
|
2014-02-03 10:33:31 -08:00 |
|
Andrzej Kapolka
|
2b4876181a
|
Different take on the transform fix.
|
2014-01-31 19:38:45 -08:00 |
|
Andrzej Kapolka
|
ee0b6fad55
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-01-31 19:00:58 -08:00 |
|
Andrzej Kapolka
|
e1350f8e24
|
Trying out a transform tweak.
|
2014-01-31 19:00:24 -08:00 |
|
ZappoMan
|
ed3f7b9d28
|
Merge pull request #1822 from birarda/cleanup
application destructor cleanup, spacing cleanup
|
2014-01-31 18:03:19 -08:00 |
|
Andrew Meadows
|
32df731aae
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup
|
2014-01-31 17:55:05 -08:00 |
|
AndrewMeadows
|
867b66e73e
|
Merge pull request #1817 from ZappoMan/more_scripting_work
More scripting work
|
2014-01-31 17:54:44 -08:00 |
|
Stephen Birarda
|
40a963cf92
|
some application destructor cleanup
|
2014-01-31 17:50:51 -08:00 |
|
Andrew Meadows
|
a5aff81881
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup
|
2014-01-31 17:44:13 -08:00 |
|
Andrew Meadows
|
ed93d8db39
|
Moving headMouse, transmitter, and touchYaw/Pitch stuff into MyAvatar.
|
2014-01-31 17:42:48 -08:00 |
|
Stephen Birarda
|
d65a3ee174
|
spacing cleanup in Application and ScriptEngine
|
2014-01-31 17:38:53 -08:00 |
|
ZappoMan
|
289be04f0f
|
use tryLock in some cases where we don't want to block and pass already locked to the findParticleByID() in scripting interface
|
2014-01-31 17:12:50 -08:00 |
|
Andrzej Kapolka
|
ff2afca50e
|
Special handling for blendshapes in Blender exports. They're under the model,
like the geometry.
|
2014-01-31 15:24:54 -08:00 |
|
Stephen Birarda
|
8fc55bd196
|
add user UUID to application window title
|
2014-01-31 14:56:04 -08:00 |
|
Andrew Meadows
|
a7ffb7df1d
|
Moved LookAtTargetAvatar stuff from AvatarManager to MyAvatar.
|
2014-01-31 13:17:12 -08:00 |
|
Stephen Birarda
|
b16d03c42a
|
remove an unneeded todo
|
2014-01-31 12:46:03 -08:00 |
|
Stephen Birarda
|
2cc6d22181
|
fix push bytesRead when creating dummy Avatar packets, closes #1794
|
2014-01-31 12:44:09 -08:00 |
|
Stephen Birarda
|
4573eaebc6
|
fix multiple avatar parsing in AvatarManager
|
2014-01-31 12:02:24 -08:00 |
|
AndrewMeadows
|
f277e00780
|
Merge pull request #1785 from birarda/post-event
repairs to VoxelImporter to remove warning, closes #1758
|
2014-01-31 11:23:01 -08:00 |
|
Stephen Birarda
|
217135a8d6
|
repairs to VoxelImporter to remove QCoreApplication warning
|
2014-01-31 11:00:44 -08:00 |
|