Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 08:53:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9220 commits 25 branches 0 tags 1.1 GiB
Commit graph

9220 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
ZappoMan
a6934605a4 implement a basic exampple of ride along with a particle 2014-01-30 12:33:57 -08:00
ZappoMan
8b9f6813ca add easier support for key codes in JS by adding text property and auto-detecting isShifted 2014-01-30 12:28:58 -08:00
ZappoMan
da5e0f55b6 add easier support for key codes in JS by adding text property and auto-detecting isShifted 2014-01-30 12:26:50 -08:00
Stephen Birarda
2294b3a2cd use a proper string list in DataServer for values 2014-01-30 12:14:28 -08:00
Andrzej Kapolka
a7ebcf5a96 Layout fix. 2014-01-30 11:24:24 -08:00
Andrzej Kapolka
1bcf12ed3d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-30 11:15:42 -08:00
Andrzej Kapolka
8df4e884e4 Fix box color on hovering. 2014-01-30 11:15:03 -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
01c369716e implement a basic exampple of ride along with a particle 2014-01-29 20:55:12 -08:00
ZappoMan
a048799367 fix header comment 2014-01-29 20:54:22 -08:00
ZappoMan
ed0a2a5a18 Merge branch 'master' of https://github.com/worklist/hifi into scripting_work 
Conflicts:
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2014-01-29 19:49:36 -08:00
Andrzej Kapolka
a9905cf870 Working on editing QObjects. 2014-01-29 19:35:43 -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
ZappoMan
08b06cc59c support for global collision callbacks in JS 2014-01-29 17:52:17 -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
Andrzej Kapolka
54aef15d29 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-29 16:37:01 -08:00
Andrzej Kapolka
64df9718f2 Working on object attributes. 2014-01-29 16:36:44 -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