Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 21:55:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
9112 commits 71 branches 56 tags 1.2 GiB
Commit graph

9112 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
c70633e5d1 don't render any audio stats if no _audioOutput, closes #1783 2014-01-31 10:40:10 -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
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
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
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
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
stojce
d2464d89e3 #19493 - @ function can jump to locations as well as avatars 2014-01-30 22:23:31 +01:00
AndrewMeadows
51d994d8ca Merge pull request #1763 from birarda/master 
use a proper string list in DataServer for values
 2014-01-30 12:55:54 -08:00
Andrzej Kapolka
181670f5d7 Fixes for parsing FBX text encoding. 2014-01-30 12:53:02 -08:00
Stephen Birarda
ac780df8a6 fix appending of QString value to valueList 2014-01-30 12:44:43 -08:00
Stephen Birarda
2294b3a2cd use a proper string list in DataServer for values 2014-01-30 12:14:28 -08:00
AndrewMeadows
910b97de21 Merge pull request #1759 from birarda/master 
data-server repairs for get responses
 2014-01-30 10:56:29 -08:00
Stephen Birarda
49d04ce14e data-server repairs for get responses 2014-01-30 10:42:29 -08:00
AndrewMeadows
d556119087 Merge pull request #1755 from birarda/master 
fix for HandData crash
 2014-01-30 09:56:17 -08:00
Stephen Birarda
84ef757af4 fix avatar count, HandData crash (closes #1754) 2014-01-30 09:45:09 -08:00
ZappoMan
c58f44f54a Merge pull request #1735 from AndrewMeadows/fix-particle-avatar-collisions 
Fix crash on shutdown caused by duplicate delete on a QObject
 2014-01-29 17:54:23 -08:00
Stephen Birarda
740d11027c add QDataStream >> operator to Assignment 2014-01-29 17:20:32 -08:00
Stephen Birarda
fe192ca2de domain-server patches while looking for payload/pool errors 2014-01-29 17:16:54 -08:00
ZappoMan
44d60614bc Merge pull request #1743 from birarda/dataserver 
fix for data-server crashes
 2014-01-29 16:22:07 -08:00
Stephen Birarda
2f6961f455 remove debug and wrong data-server address 2014-01-29 16:06:12 -08:00
Stephen Birarda
810877b8e4 fix some silly data-server mistakes 2014-01-29 16:05:21 -08:00
Stephen Birarda
d6431a3e7a remove an extra gs 2014-01-29 15:09:46 -08:00
Stephen Birarda
dbecb96a58 remove assignmentQueueMutex now that DS concurrency is gone 2014-01-29 15:08:50 -08:00
Stephen Birarda
e700a39c3c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-29 14:23:49 -08:00
Stephen Birarda
7d27830064 domain-server patches while looking for payload/pool errors 2014-01-29 14:23:39 -08:00
AndrewMeadows
6a017e93f1 Merge pull request #1721 from ey6es/metavoxels 
Basic editing and delta streaming for metavoxels.
 2014-01-29 14:21:53 -08:00
Andrzej Kapolka
c456f684b4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-29 13:48:47 -08:00
Stephen Birarda
15ba5f7ab1 correct OctreeServer config parsing 2014-01-29 13:48:31 -08:00
Andrzej Kapolka
2c08254bf7 Merge pull request #1738 from ey6es/master 
Missing includes.
 2014-01-29 13:48:20 -08:00
Andrzej Kapolka
1e9e298a75 Missing includes. 2014-01-29 13:47:13 -08:00
Andrzej Kapolka
e99b7ea92c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-01-29 13:34:19 -08:00
Andrzej Kapolka
4c70af51e8 Expand data automatically to encompass edits. 2014-01-29 13:30:54 -08:00
Andrew Meadows
82a4b7a4d1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 
Conflicts:
	interface/src/Application.cpp
 2014-01-29 13:20:42 -08:00