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

15507 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
b7b89dcbec move glow effect to property of all entities, add tools for editing boxes 2014-08-06 12:29:09 -07:00
ZappoMan
ebe7182ab6 get models actually rendering again 2014-08-06 10:25:44 -07:00
ZappoMan
e540bef672 more hacking on rendering of virtual entities 2014-08-06 09:12:14 -07:00
ZappoMan
a194db837f first cut at registered EntityType renderers 2014-08-05 16:06:21 -07:00
ZappoMan
50309ef371 added other types, just stubs for now 2014-08-05 14:20:24 -07:00
ZappoMan
e9db4fd120 registration of multiple entity types: Model and Box 2014-08-05 12:10:17 -07:00
ZappoMan
273853ef24 more work on virtual entities 2014-08-04 16:18:24 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
Philip Rosedale
5a51950771 Merge pull request #3239 from lzuwei/add_cara_face_tracker 
Reduce Jerks in head rotation when using Cara Face Tracker
 2014-08-04 07:55:33 -07:00
Philip Rosedale
69558dc574 Merge pull request #3245 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats
 2014-08-04 07:49:31 -07:00
Philip Rosedale
321b8de898 Merge pull request #3230 from Barnold1953/rockPaperScissors 
Rock Paper Scissors CA script
 2014-08-03 13:03:11 -07:00
barnold1953
5829e3ad1e Forgot to save header 2014-08-02 16:03:13 -07:00
barnold1953
bd1fbaaf76 Made static mutex into member variable 2014-08-02 16:02:08 -07:00
wangyix
99df05f770 forgot member in reset() 2014-08-01 16:54:29 -07:00
wangyix
1d74ae8197 code cleanup 2014-08-01 16:49:21 -07:00
wangyix
fc670d9edb minor threshold change 2014-08-01 16:44:01 -07:00
Brad Hefta-Gaub
e9286e5700 Merge pull request #3238 from ctrlaltdavid/19824 
Code Review for Job #19824
 2014-08-01 16:35:16 -07:00
Brad Hefta-Gaub
211bed946f Merge pull request #3232 from huffman/19783 
Code Review for Job #19783
 2014-08-01 16:34:50 -07:00
Brad Hefta-Gaub
d86f6c42b2 Merge pull request #3244 from ZappoMan/jittertesttool 
updated formatting added reporting interval to quiet the noise
 2014-08-01 16:32:20 -07:00
wangyix
f9ec7b6c18 redesiged SequenceNumberStats child instance handling 2014-08-01 16:13:52 -07:00
ZappoMan
66d45d3544 tweak format of report 2014-08-01 15:25:03 -07:00
ZappoMan
cb02ac16b6 tweak format of report 2014-08-01 15:23:52 -07:00
ZappoMan
ce46e8b812 tweak format of report 2014-08-01 15:14:43 -07:00
ZappoMan
34ca5ded72 add reporting interval 2014-08-01 15:09:11 -07:00
Brad Hefta-Gaub
398424b44a Merge pull request #3243 from ZappoMan/jittertesttool 
fix 30 second averages
 2014-08-01 14:59:18 -07:00
ZappoMan
60899d2a00 oops 2014-08-01 14:55:14 -07:00
Philip Rosedale
ea40943206 Merge pull request #3242 from ZappoMan/jittertesttool 
added a simple udp send/receive jitter test tool
 2014-08-01 14:40:13 -07:00
ZappoMan
ca4bca7042 more windows headaches memset instead of bzero 2014-08-01 14:11:24 -07:00
ZappoMan
36f635ed8d change stats to display difference between gap and expected gap 2014-08-01 14:07:14 -07:00
ZappoMan
8db66e4322 use our ported version of usecTimestampNow cause windows sucks 2014-08-01 13:58:38 -07:00
Ryan Huffman
d01d605b40 Add ModelItemProperties::copyFromNewModelItem 2014-08-01 13:52:00 -07:00
ZappoMan
48b73e3f0e windows build 2014-08-01 13:42:37 -07:00
ZappoMan
e0946838f3 windows build 2014-08-01 13:34:01 -07:00
ZappoMan
ad4dd9404d windows build 2014-08-01 13:26:56 -07:00
ZappoMan
ddfdfc9242 windows build 2014-08-01 13:21:46 -07:00
ZappoMan
8c14f948f2 handle first packet stats better 2014-08-01 13:15:57 -07:00
ZappoMan
8359ebb82f use c std version of usecTimestampNow() 2014-08-01 13:12:37 -07:00
Ryan Huffman
b98ee351a5 Remove unused ModelTree::getModelAt 2014-08-01 13:04:03 -07:00
Ryan Huffman
355cf07443 Fix style issue 2014-08-01 13:03:10 -07:00
ZappoMan
68074cb22a added a simple udp send/receive jitter test tool 2014-08-01 12:59:10 -07:00
Philip Rosedale
b38edd0022 Merge pull request #3241 from AndrewMeadows/ragdoll 
Ragdoll Part 7: introduction of ContactConstraint
 2014-08-01 12:13:48 -07:00
wangyix
eba07b03e2 recursive SequenceNumberStats; untested 2014-08-01 12:00:41 -07:00
Andrew Meadows
3305f5edf9 merge upstream/master into andrew/ragdoll 2014-08-01 11:13:18 -07:00
Andrew Meadows
789eeed760 limit action of ContactConstraint to penetration 2014-08-01 11:11:41 -07:00
wangyix
cdcc6ece04 fixed compile errors caused by SequenceNumberStats changes 2014-08-01 10:34:19 -07:00
Clément Brisset
b27fa6b13a Merge pull request #3240 from ZappoMan/additionalAudioStats 
added some additional audio stats
 2014-08-01 10:30:31 -07:00
wangyix
e1f905cb36 fixed >100% loss rate bug in SequenceNumberStats 2014-08-01 10:27:51 -07:00
ZappoMan
fa5a2b9a4d reset sent time gap stats on reset 2014-08-01 10:04:35 -07:00
ZappoMan
7e51ebea49 added some additional audio stats 2014-08-01 09:42:31 -07:00
Zu
4aa5fb2795 fix: comments, extra white spaces 2014-08-01 16:12:17 +08:00