Commit graph

9418 commits

Author SHA1 Message Date
ZappoMan
53e7cd7797 fix particle init 2014-02-05 10:16:43 -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
Philip Rosedale
4cba03dd67 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-05 07:29:15 -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
1b9cc4f5a5 more fixup to octree packets 2014-02-04 23:02:56 -08:00
ZappoMan
b0c41b086d fix voxel packet corruption 2014-02-04 22:54:55 -08:00
Philip Rosedale
d88d598e2b Merge branch 'master' of https://github.com/worklist/hifi 2014-02-04 21:29:38 -08:00
Philip Rosedale
d416f33e67 Merge pull request #1872 from ZappoMan/invaders_tweaks
Invaders tweaks
2014-02-04 21:29:23 -08:00
ZappoMan
5afe184c3b removed debug 2014-02-04 21:16:07 -08:00
ZappoMan
7ffe73bf6e added the cannon as voxels 2014-02-04 21:14:49 -08:00
ZappoMan
15be49cb8d latest changes to space invaders 2014-02-04 21:08:12 -08:00
ZappoMan
758c1e0817 add examples for setting model scale and translation 2014-02-04 20:28:11 -08:00
ZappoMan
2f14b265a8 make sure SVO files with version details are supported 2014-02-04 20:24:08 -08:00
ZappoMan
13d9b710f1 bump packet version 2014-02-04 20:23:12 -08:00
ZappoMan
a35e5eeb92 move modelScale before translation and rotation since that seems to fix the corruption 2014-02-04 20:20:06 -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
be4f081465 More work on editing parameterized URLs. 2014-02-04 19:55:11 -08:00
Andrzej Kapolka
4f4c4c68d9 Streaming cleanup, streaming script strings as repeated values. 2014-02-04 18:31:18 -08:00
Stephen Birarda
53170d3fe2 fix skeleton setting on parsing of identity packet 2014-02-04 16:49:21 -08:00
Stephen Birarda
6e0f484bdc Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-04 15:54:15 -08:00
Stephen Birarda
092c969e75 more repairs to face and skeleton model passing 2014-02-04 15:48:31 -08:00
Andrzej Kapolka
ca52d67041 Basic script guides now working. 2014-02-04 15:40:17 -08:00
Stephen Birarda
adaa36a51d repairs to key-framed URL sending through avatar-mixer 2014-02-04 15:28:27 -08:00
Andrew Meadows
1ad2171952 Fix #1862 camera should not follow head orientation when using faceshift 2014-02-04 15:23:10 -08:00
Stephen Birarda
7e3442cbd0 repair to PacketType so interface parses AM packet 2014-02-04 14:57:14 -08:00
Stephen Birarda
3959209bc2 complete movement of URLs to AvatarData for re-usability 2014-02-04 14:49:56 -08:00
Stephen Birarda
2b80a5fbb8 move face/skeleton model URLs to AvatarData 2014-02-04 14:40:41 -08:00
Philip Rosedale
7935e68e7a Merge branch 'master' of https://github.com/worklist/hifi 2014-02-04 14:33:33 -08:00
Philip Rosedale
29af3d7833 Merge pull request #1854 from ZappoMan/invaders_tweaks
Invaders tweaks
2014-02-04 14:30:53 -08:00
Stephen Birarda
26c961dc66 send identity packets when changes occur between keyframes 2014-02-04 14:24:13 -08:00
ZappoMan
785e76102f change game at for space invaders to be close to avatar 2014-02-04 14:22:22 -08:00
Andrzej Kapolka
3af86cb1a4 Working on script loading. 2014-02-04 14:07:01 -08:00
Andrzej Kapolka
fd31cc02ad Working on loading scripts. 2014-02-04 14:06:17 -08:00
Stephen Birarda
06a3da2b25 store and load face/skeleton meshes in local settings 2014-02-04 14:06:08 -08:00
ZappoMan
461a600d7f add sounds to space invaders 2014-02-04 14:04:33 -08:00
ZappoMan
055dae5f78 tweak modelScale to 2.0 for better space invaders 2014-02-04 14:04:21 -08:00
Stephen Birarda
33305ad111 have the avatar-mixer broadcast identity packets every 5 seconds 2014-02-04 13:42:22 -08:00
Stephen Birarda
31bd5f7ce8 add parsing of PacketTypeAvatarIdentity to AvatarMixer 2014-02-04 13:27:05 -08:00
ZappoMan
468cd0d8bb temporary hack to work around model scale data corruption 2014-02-04 13:21:31 -08:00
ZappoMan
2b429ba2d3 downward motion to space invaders 2014-02-04 13:18:19 -08:00
Philip Rosedale
7937ab0a1b Merge branch 'master' of https://github.com/worklist/hifi 2014-02-04 13:05:01 -08:00
Stephen Birarda
e879a7f18d remove some extra spacing 2014-02-04 13:04:51 -08:00
Stephen Birarda
8bf3b7586b initial movement of mesh/skeleton URLs out of data-server through avatar-mixer 2014-02-04 13:02:33 -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
cfbe4de647 Progress on shared object attributes; basic "throbbing" guide working. 2014-02-03 19:46:22 -08:00
Andrzej Kapolka
3f529e37b5 Working on streaming objects. 2014-02-03 16:34:04 -08:00
Stephen Birarda
f1b612d8d8 Merge pull request #1835 from birarda/master
fix for toyball crash
2014-02-03 16:27:01 -08:00
Stephen Birarda
d563c89482 fix for ScriptEngine crash 2014-02-03 16:25:38 -08:00