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

15298 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
7e51ebea49 added some additional audio stats 2014-08-01 09:42:31 -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
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
Stephen Birarda
7860aa5b87 add some error messages to PaymentManager 2014-07-31 11:41:49 -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
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
Stephen Birarda
453c37f4b9 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-31 10:05:40 -07:00
Stephen Birarda
eadae8ed1a allow unauthenticated redemptions of signed transactions from octree server 2014-07-31 10:05:26 -07:00
Stephen Birarda
ce4336894a actually send signed transaction from PaymentManager 2014-07-31 09:26:18 -07:00
Stephen Birarda
350c759618 add a method to SignedWalletTransaction to return binary message 2014-07-31 09:18:57 -07:00
Brad Hefta-Gaub
d4d4069f11 Merge pull request #3225 from birarda/master 
cmake file cleanup to suppress warnings on cmake 3.0
 2014-07-30 19:20:18 -07:00
Brad Hefta-Gaub
faa25af0e2 Merge pull request #3228 from Barnold1953/dancerScript 
Procedural Animation
 2014-07-30 19:19:10 -07:00
barnold1953
a65f81c71a Random start position for bot 2014-07-30 18:25:58 -07:00
Andrzej Kapolka
f2a72aa5a9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-30 18:17:28 -07:00
Stephen Birarda
631977bac2 setup a SignedTransaction from PaymentManager 2014-07-30 18:15:20 -07:00
Andrzej Kapolka
c3c2265ddd Hide the unset (black) bits. 2014-07-30 18:14:11 -07:00
Stephen Birarda
ef58453fda turn off verbose octree packet debug 2014-07-30 18:10:11 -07:00
Stephen Birarda
db25cd9d2c call PaymentManager when an OctreeEditPacketSender needs to pay 2014-07-30 18:07:08 -07:00
Brad Hefta-Gaub
d6e6cfd585 Merge pull request #3216 from wangyix/inbound_audio_stream 
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
 2014-07-30 18:00:17 -07:00
barnold1953
b6c0b4fd21 Random mood in procedural bot 2014-07-30 17:39:24 -07:00
Stephen Birarda
9c1dd7c4a4 fix call to connect in Application 2014-07-30 17:35:49 -07:00
Stephen Birarda
99daa062c0 trigger domainSettingsReceived slot when connected to domain 2014-07-30 17:35:33 -07:00
Stephen Birarda
363cef6d8a move satoshi costs to VoxelEditPacketSender 2014-07-30 17:33:37 -07:00
wangyix
8d6896a1da forgot an arg in Agent.cpp 2014-07-30 17:26:58 -07:00
Andrzej Kapolka
6c15468c87 Fix for sizing. 2014-07-30 17:21:31 -07:00
Stephen Birarda
eba92eb517 have the OctreeEditPacketSender emit a signal when payment is required 2014-07-30 17:21:04 -07:00
wangyix
7281eca5a4 fixed inj crash; added statcDesired to MixedAudioStream 2014-07-30 17:20:05 -07:00
Stephen Birarda
04effabe48 Merge branch 'master' into domain-server-auth 2014-07-30 17:14:03 -07:00
Stephen Birarda
ac3a5de06c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-30 17:09:21 -07:00
Leonardo Murillo
e32e950e55 Merge pull request #3226 from birarda/oculus 
fix set of LIBOVR_LIBRARIES in FindLibOVR module
 2014-07-30 18:09:07 -06:00
Stephen Birarda
b502ee618e Merge branch 'oculus' 2014-07-30 17:05:51 -07:00
barnold1953
8bb5c2b84c Small improvements to script, renamed to bot_procedural 2014-07-30 16:59:15 -07:00
Andrzej Kapolka
f356f0652b Collapse nodes when they fall out of LOD. 2014-07-30 16:36:40 -07:00
Stephen Birarda
5b371cedb9 Revert "remove useless lib prefix in oculus find module" 
This reverts commit ff1ae43474.
 2014-07-30 16:18:04 -07:00
Stephen Birarda
ff1ae43474 remove useless lib prefix in oculus find module 2014-07-30 16:16:50 -07:00