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

9095 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
dc70c74733 fix a double push in added particle response 2014-01-31 09:30:26 -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
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
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
AndrewMeadows
4ff400f59f Merge pull request #1725 from birarda/packet-changes 
I looked it over but did not test.  A lot of uint64_t --> qint64 and name changes.
 2014-01-29 13:13:20 -08:00
Stephen Birarda
7d8b7a79ac fix Particle update signature 2014-01-29 12:30:20 -08:00
Stephen Birarda
2dd71435ee fix build breakers for new packet type 2014-01-29 12:25:05 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
Andrew Meadows
d757f20d22 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 
Conflicts:
	interface/src/Application.cpp
 2014-01-29 11:41:39 -08:00
AndrewMeadows
3cfca795e2 Merge pull request #1731 from ZappoMan/more_scripting 
I looked the code over and also did some basic testing (started servers on localhost, logged in with interface).
 2014-01-29 11:34:52 -08:00
ZappoMan
616cfac293 fix init bug 2014-01-29 11:21:45 -08:00
Andrzej Kapolka
69a727c3e1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-29 11:14:48 -08:00
Andrzej Kapolka
154deccbc6 Pass in the starting minimum/size. 2014-01-29 11:14:10 -08:00
Andrew Meadows
43f965c90a Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 2014-01-29 09:25:00 -08:00
ZappoMan
b36cc0bcf9 removed old cruft around mousePitch in Head and unified pitch 2014-01-29 02:09:49 -08:00
ZappoMan
ecd2477007 adding lookWithMouse.js example that uses mouse instead of multi-touch to add the look around feature 2014-01-29 01:01:41 -08:00
ZappoMan
98cdc656c4 more scripting support, including adding a Quat helper class that makes JS quat math easier 2014-01-29 00:56:08 -08:00
ZappoMan
434756a40f removed some dead comments 2014-01-28 20:40:00 -08:00
ZappoMan
bcc7cfb15e removed some debug 2014-01-28 20:38:47 -08:00
ZappoMan
9d87d58723 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting 
Conflicts:
	libraries/particles/src/ParticlesScriptingInterface.cpp
 2014-01-28 20:36:35 -08:00
ZappoMan
39a33b8c7d Merge pull request #1723 from ey6es/master 
Fixes for translucent textures (such as that used in jellyhead.fbx).
 2014-01-28 19:57:40 -08:00