Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-06-04 13:30:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15562 commits 6 branches 1 tag 1.1 GiB
Commit graph

15562 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
00e4e20bcb Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-01 11:22:42 -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
Zu
779298b7dc improve: reduce animation jerks in avatar head rotation 2014-08-01 14:12:43 +08: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
Thijs Wenker
fe3f1dbe83 forgot to put back one line of code 2014-07-31 22:56:47 +02:00
Thijs Wenker
11b1425196 Windows requires ws2_32.lib for LIBOVR 0.4 2014-07-31 22:51:23 +02:00
Atlante45
ee4b7664b0 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-07-31 13:39:23 -07:00
Thijs Wenker
e6571d334a Oculus SDK 0.4 support for Windows (tested with DK2 HMD) 2014-07-31 22:37:02 +02: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
Andrzej Kapolka
53fc31353d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-31 12:06:01 -07:00
Andrzej Kapolka
a0886d4301 Use raw OpenGL textures rather than QOpenGLTexture, since that we're having 
issues with constants in that class.
 2014-07-31 11:55:52 -07:00
Atlante45
c65dc3fb1e Various tweaks to ModelReferentials 2014-07-31 11:55:28 -07:00
Atlante45
5fd3fd9f8f Moved MyAvatar update at the end of Application::update() to have latest data for simulation 2014-07-31 11:54:39 -07:00
Atlante45
490dad6bbd Work on network streaming of referentials 2014-07-31 11:52:03 -07:00
Stephen Birarda
7860aa5b87 add some error messages to PaymentManager 2014-07-31 11:41:49 -07:00
Ryan Huffman
054e832cf8 Fix misspelled variable names 2014-07-31 11:32:17 -07:00
Philip Rosedale
204595a742 Merge pull request #3229 from birarda/domain-server-auth 
introduce the option to require payment for voxels
 2014-07-31 11:30:13 -07:00
barnold1953
ab52f384b7 Improvements on RPS script 2014-07-31 11:15:20 -07:00
Stephen Birarda
3c459d8460 fix include of tgmath for windows 2014-07-31 11:12:41 -07:00
Andrzej Kapolka
90ce73823a Attempting to fix the Linux build error. 2014-07-31 11:03:50 -07:00
Stephen Birarda
e1ba076a71 complete redemption of signed transactions from octree server 2014-07-31 11:03:12 -07:00
Ryan Huffman
aa1c9d88dd Cleaup several qDebug calls and commented lines 2014-07-31 10:48:26 -07:00
Ryan Huffman
a670889ffb Remove TODO comment 2014-07-31 10:44:36 -07:00
Ryan Huffman
85ed18fd41 Cleanup editModels.js 2014-07-31 10:43:44 -07:00
Ryan Huffman
3e2bb0f168 Add more complete error handling for import/export models 2014-07-31 10:40:45 -07:00
barnold1953
2c04963242 Merge branch 'master' of https://github.com/highfidelity/hifi into rockPaperScissors 2014-07-31 10:16:35 -07:00
Stephen Birarda
453c37f4b9 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-31 10:05:40 -07:00