Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 06:11:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9257 commits 75 branches 59 tags 1.2 GiB
Commit graph

9257 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
6129f07ed4 Merge pull request #1806 from birarda/ds-icons 
fix missing font-icon in DS web interface
 2014-01-31 14:57:40 -08:00
Stephen Birarda
8fc55bd196 add user UUID to application window title 2014-01-31 14:56:04 -08:00
Stephen Birarda
9015b24aa5 update the script examples for new nomenclature 2014-01-31 14:41:24 -08:00
Stephen Birarda
dd83ff0538 move isAvatar property access to Agent object 2014-01-31 14:36:50 -08:00
Stephen Birarda
4b18e37dfb fix for ttf return in DS, closes #1769 2014-01-31 14:13:05 -08:00
ZappoMan
9798538ea5 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting_work 
Conflicts:
	libraries/particles/src/Particle.cpp
	libraries/particles/src/ParticlesScriptingInterface.cpp
 2014-01-31 14:10:45 -08:00
ZappoMan
7a3ce7c89d Merge pull request #1805 from birarda/master 
remove unused UUID from OctreeQuery
 2014-01-31 13:48:49 -08:00
Stephen Birarda
9b549723d3 remove unused UUID from OctreeQuery 2014-01-31 13:47:59 -08:00
ZappoMan
599e57b5c2 Merge pull request #1804 from birarda/master 
remove a double push in OctreeQuery parsing
 2014-01-31 13:45:03 -08:00
Stephen Birarda
254a0c0aed remove a double push on UUID in OctreeQuery 2014-01-31 13:44:24 -08:00
Stephen Birarda
685f9ebb5b Merge pull request #1798 from ZappoMan/master 
check against NULL node from nodeWithUUID()
 2014-01-31 13:30:36 -08:00
ZappoMan
5caaf0dc7f check against NULL node from nodeWithUUID() 2014-01-31 13:28:56 -08:00
Andrew Meadows
a7ffb7df1d Moved LookAtTargetAvatar stuff from AvatarManager to MyAvatar. 2014-01-31 13:17:12 -08:00
ZappoMan
cea2f9414a Merge pull request #1790 from kordero/master 
Readme: Updated Ubuntu dependencies
 2014-01-31 13:09:02 -08:00
ZappoMan
a5271108fb Merge pull request #1795 from birarda/master 
fix push of bytes read during creation of dummy packets
 2014-01-31 13:08:35 -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
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
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
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
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