Commit graph

9352 commits

Author SHA1 Message Date
Stephen Birarda
2cc6d22181 fix push bytesRead when creating dummy Avatar packets, closes #1794 2014-01-31 12:44:09 -08:00
Stephen Birarda
0fea0964f0 Merge pull request #1791 from birarda/master
fix multiple avatar parsing in AvatarManager
2014-01-31 12:04:10 -08:00
Lucas Crisman
18ce012d7a simplifying text 2014-01-31 17:03:57 -03:00
Stephen Birarda
4573eaebc6 fix multiple avatar parsing in AvatarManager 2014-01-31 12:02:24 -08:00
Lucas Crisman
73aa73fd58 joining paragraphs 2014-01-31 17:00:27 -03:00
Lucas Crisman
fd07449195 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-31 16:52:57 -03:00
Lucas Crisman
bd1d0201e0 Updated Ubuntu package requirements 2014-01-31 16:52:20 -03:00
Andrzej Kapolka
f85542e0e7 Working on a test guide. 2014-01-31 11:39:16 -08:00
AndrewMeadows
9021ccef89 Merge pull request #1789 from birarda/assert-crash
add back old HandData parsing
2014-01-31 11:33:31 -08:00
Stephen Birarda
9d82347994 add a missing return 2014-01-31 11:32:23 -08:00
Stephen Birarda
4bf8f3a465 reinstate old HandData parsing 2014-01-31 11:29:15 -08:00
AndrewMeadows
19e8ddd202 Merge pull request #1788 from birarda/assert-crash
fix incorrect packet position in AvatarData
2014-01-31 11:24:43 -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
4ed748752f fix incorrect packet position in AvatarData, closes #1786 2014-01-31 11:20:36 -08:00
Andrzej Kapolka
ba2ab7e83a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-31 11:06:10 -08:00
Stephen Birarda
217135a8d6 repairs to VoxelImporter to remove QCoreApplication warning 2014-01-31 11:00:44 -08:00
AndrewMeadows
9a4e8103e2 Merge pull request #1782 from birarda/bent-avatars
fixes craned avatar neck and blinking
2014-01-31 10:48:01 -08:00
AndrewMeadows
fd698d7aba Merge pull request #1784 from birarda/audio-render-crash
fix audio render crash when audio output setup failed
2014-01-31 10:45:31 -08:00
AndrewMeadows
bed63513a9 Merge pull request #1745 from ZappoMan/scripting_work
support for global collision callbacks in JS
2014-01-31 10:42:44 -08:00
Stephen Birarda
c70633e5d1 don't render any audio stats if no _audioOutput, closes #1783 2014-01-31 10:40:10 -08:00
Stephen Birarda
29abd2500f revert to old parsing of AvatarData 2014-01-31 10:34:16 -08:00
AndrewMeadows
0badc02a93 Merge pull request #1776 from birarda/bent-avatars
repair ping packet parsing in creation of reply, fix AvatarMixer crash with UNIX client
2014-01-31 10:25:20 -08:00
ZappoMan
514c845b9a Merge pull request #1764 from stojce/19493
Code Review for Job #19493
2014-01-31 10:20:43 -08:00
ZappoMan
bb3c1f253c Merge pull request #1765 from ey6es/master
Fixes for FBX exports from Blender.
2014-01-31 10:18:26 -08:00
Stephen Birarda
79c8f91c78 instantiate isAvatar in ScriptEngine to false, closes #1779 2014-01-31 10:15:17 -08:00
Stephen Birarda
59a528f096 remove another unneeded line 2014-01-31 10:06:26 -08:00
Stephen Birarda
a07511ed2c remove an unecessary line 2014-01-31 10:05:46 -08:00
Stephen Birarda
a5b0675f24 sendPingPackets method need not be static 2014-01-31 09:58:29 -08:00
Stephen Birarda
ddbcfbd02f remove an extra debug for ping packets 2014-01-31 09:56:18 -08:00
Stephen Birarda
c989a64e90 repair ping packet parsing in creation of reply 2014-01-31 09:54:52 -08:00
AndrewMeadows
0f747600a9 Merge pull request #1775 from birarda/toy-ball
fix a double push in add particle response
2014-01-31 09:36:46 -08:00
Stephen Birarda
dc70c74733 fix a double push in added particle response 2014-01-31 09:30:26 -08:00
Andrzej Kapolka
fcbf09508e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-30 18:56:30 -08:00
Andrzej Kapolka
da18b6e92a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-30 18:54:18 -08:00
Andrzej Kapolka
5a194c4c01 Working on parameterizable URLs, etc. 2014-01-30 18:53:51 -08:00
Andrew Meadows
1b99bc90cf Removing AvatarManager::clear() as unecessary during class destruction. 2014-01-30 18:02:04 -08:00
Leonardo Murillo
821e25a72a Merge pull request #1771 from birarda/domain-file
properly replace UUID in domain server assignment hash
2014-01-30 17:53:39 -08:00
Stephen Birarda
703b654728 make sure UUID key changes in static assignment hash, closes #1770 2014-01-30 17:39:37 -08:00
Andrew Meadows
a8bdc874ee MyAvatar doesn't need to be a friend of its base class Avatar. 2014-01-30 17:13:39 -08:00
Andrew Meadows
d0a4d6a614 Moving MyAvatar specific code out of Avatar and into MyAvatar. 2014-01-30 17:10:00 -08:00
AndrewMeadows
8b934eed2e Merge pull request #1766 from birarda/domain-file
patches to broken domain-server pool and payload passing
2014-01-30 16:37:15 -08:00
ZappoMan
3b17550d92 make sure to flush edit queue on script shutdown 2014-01-30 16:36:26 -08:00
Stephen Birarda
f853e34ab1 fix unix complaint for no postfix for enum 2014-01-30 15:49:05 -08:00
Stephen Birarda
984fb1a5df fix config parsing from command line and json 2014-01-30 15:22:03 -08:00
Stephen Birarda
55049eeb6b fix assignment packing and unpacking from DS to AC 2014-01-30 14:54:52 -08:00
Stephen Birarda
356222ba15 removal of persistence in DS for static assignments 2014-01-30 14:33:36 -08:00
Andrzej Kapolka
c9fe5e1037 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-30 13:42:29 -08:00
Andrzej Kapolka
899daeb531 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-30 13:34:47 -08:00
Andrzej Kapolka
78d9b79805 Another fix for Blender exports. Closes #1762. 2014-01-30 13:24:30 -08:00
stojce
21ab08b31a Merge branch 'master' of https://github.com/worklist/hifi into 19493 2014-01-30 22:23:54 +01:00