Commit graph

15266 commits

Author SHA1 Message Date
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
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
Stephen Birarda
631977bac2 setup a SignedTransaction from PaymentManager 2014-07-30 18:15:20 -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
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
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
Stephen Birarda
4f6a86fc6c tweak to help windows find oculus libraries 2014-07-30 16:15:28 -07:00
wangyix
24be668d36 added check before pushAudioToOutput to prevent starvecount buildup 2014-07-30 15:47:49 -07:00
wangyix
636b6d3307 Merge branch 'pull_mode_audio_output' into inbound_audio_stream 2014-07-30 15:37:18 -07:00
wangyix
daeb2a898d added staticDesiredJitterBufferFrames feature; AudioMixer crashing
moved some callbacks from Application::updateAvatar() to
Application::update()
2014-07-30 15:35:40 -07:00
Stephen Birarda
d101d321da add a missing closing bracket 2014-07-30 15:32:45 -07:00
Stephen Birarda
4e27738cb1 don't apply udev and xinerama libraries to APPLE 2014-07-30 15:31:47 -07:00
Stephen Birarda
e702738694 only add udev and xinerama on UNIX 2014-07-30 15:31:05 -07:00
Stephen Birarda
f25e8b0b75 add NAMES to find_library commands 2014-07-30 15:28:45 -07:00
barnold1953
66c1aba7f7 Animation improvements, exposed roll/yaw head control. 2014-07-30 15:23:03 -07:00
barnold1953
c4a7c2783c Merge branch 'master' of https://github.com/highfidelity/hifi into dancerScript 2014-07-30 15:21:49 -07:00
Stephen Birarda
4c59c0ebfe fix reference to INCLUDE_QT variable in SetupHifiProject macro 2014-07-30 15:19:43 -07:00
Stephen Birarda
54390600a3 remove some extra spaces 2014-07-30 15:13:01 -07:00
Stephen Birarda
21229f22a7 only set the policy if it exists 2014-07-30 15:12:07 -07:00
Stephen Birarda
4f17902c6b fix set of LIBOVR_LIBRARIES in FindLibOVR module 2014-07-30 15:08:31 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
Leonardo Murillo
da7c46d8d9 Merge pull request #3224 from birarda/master
remove explicit src dir requirement in OculusManager
2014-07-30 15:54:16 -06:00
Stephen Birarda
7302af4fec fix bad conditional in LibOVR find module 2014-07-30 14:52:58 -07:00
barnold1953
055a97fc2d Added facial animation to the procedural bot 2014-07-30 14:18:38 -07:00
Stephen Birarda
6275dd68ab Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-30 14:15:22 -07:00
Stephen Birarda
4be8a92e52 remove explicit requirement of LibOVR source file in OculusManager 2014-07-30 14:15:14 -07:00
Leonardo Murillo
2b9849875a Merge pull request #3223 from birarda/master
patch to LibOVR find module for 0.4.0
2014-07-30 15:13:00 -06:00
Stephen Birarda
4d3aafa5df use path suffixes instead of full path in name 2014-07-30 14:07:40 -07:00