Andrzej Kapolka
|
9c3624d0d9
|
Fix for texture on jellyrob_blue_blender.fbx; apparently you can map textures,
as well as materials, by polygon. Closes #1844.
|
2014-02-07 14:25:48 -08:00 |
|
Andrzej Kapolka
|
3e2ba9fb7e
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-02-07 11:26:55 -08:00 |
|
Andrzej Kapolka
|
67bef20f93
|
Have eyes converge on hovered avatar/voxel. Closes #1883.
|
2014-02-07 11:26:15 -08:00 |
|
Philip Rosedale
|
72de486671
|
Merge pull request #1920 from ZappoMan/scriptable_camera
Scriptable camera
|
2014-02-07 11:21:12 -08:00 |
|
ZappoMan
|
2157349804
|
added Camera.computePickRay()
|
2014-02-07 09:40:52 -08:00 |
|
ZappoMan
|
41f6650b20
|
implement movable independent camera with hydra
|
2014-02-07 01:23:30 -08:00 |
|
ZappoMan
|
7379f9c923
|
tweaks to scriptable camera
|
2014-02-06 23:59:46 -08:00 |
|
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 |
|
Andrzej Kapolka
|
0a6288bda4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-06 15:42:37 -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 |
|
Andrzej Kapolka
|
ca52d67041
|
Basic script guides now working.
|
2014-02-04 15:40:17 -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 |
|
Andrzej Kapolka
|
a043278f03
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-04 11:25:18 -08:00 |
|
Andrzej Kapolka
|
7dfb83b6cc
|
Fix for obtaining values from editor.
|
2014-02-03 14:35:29 -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 |
|
Andrzej Kapolka
|
8df6d2bb6b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-03 11:21: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
|
ca9e82e2cb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-01-31 19:42:21 -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 |
|