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

15373 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Clément Brisset
b27fa6b13a Merge pull request #3240 from ZappoMan/additionalAudioStats 
added some additional audio stats
 2014-08-01 10:30:31 -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
David Rowe
f3b4f708a5 Add Script.load() JavaScript method 2014-07-31 21:50:07 -07:00
Stephen Birarda
8be42bf305 Merge pull request #3237 from birarda/domain-server-auth 
@birarda is dumb, fix an order mistake
 2014-07-31 15:23:41 -07:00
Stephen Birarda
e846fd24f7 fix an order mistake in DS handling HTTP requests 2014-07-31 15:23:15 -07:00
Leonardo Murillo
d89a373e12 Merge pull request #3236 from birarda/domain-server-auth 
allow assignments to pull script without session cookie
 2014-07-31 16:15:46 -06:00
Stephen Birarda
5b18d42940 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-31 15:13:44 -07:00
Stephen Birarda
f0e7bf0462 allow assignments to pull script without session cookie 2014-07-31 15:13:33 -07:00
Stephen Birarda
7d0bf5ea4c Merge pull request #3235 from birarda/domain-server-auth 
remove unused variable in VoxelEditPacketSender
 2014-07-31 14:12:02 -07:00
Stephen Birarda
2f0f5d2c28 remove unused variable in VoxelEditPacketSender 2014-07-31 14:11:36 -07:00
Brad Hefta-Gaub
9c1362d7f4 Merge pull request #3234 from birarda/domain-server-auth 
clear domain settings on NodeList reset
 2014-07-31 14:11:11 -07:00
Stephen Birarda
6024b90932 remove extra debug line 2014-07-31 14:08:52 -07:00
Stephen Birarda
8986e62b8a add distinction between hard reset and soft reset for DomainHandler 2014-07-31 14:08:25 -07:00
Stephen Birarda
adcf45583e clear domain settings on NodeList reset 2014-07-31 14:06:43 -07:00
Andrew Meadows
9d2744296e update physics stats names 2014-07-31 13:33:46 -07:00
Andrew Meadows
fc1d805d54 add ContactConstraint and use to impede muscles 2014-07-31 13:16:06 -07:00
Andrew Meadows
0f82236f2c minor cleanup 2014-07-31 13:09:10 -07:00
Andrew Meadows
0b9f246661 set the shape ID in the ctor's NOT the dtor 2014-07-31 13:08:27 -07:00
Leonardo Murillo
c4751d7dd7 Merge pull request #3231 from birarda/domain-server-auth 
add some error messages to PaymentManager
 2014-07-31 13:40:56 -06:00
Philip Rosedale
fe6278f797 Merge pull request #3227 from ey6es/metavoxels 
Basic metavoxel-based heightfields.
 2014-07-31 12:34:45 -07:00