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 |
|
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 |
|
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 |
|
Stephen Birarda
|
eba92eb517
|
have the OctreeEditPacketSender emit a signal when payment is required
|
2014-07-30 17:21:04 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Stephen Birarda
|
d6c0defd98
|
check in VS2010 subdir to see oculus 0.4.0 library
|
2014-07-30 14:05:20 -07:00 |
|
Stephen Birarda
|
ab1be38fd5
|
reset the cost of the packet back to 0 so it doesn't keep accumulating
|
2014-07-30 14:02:46 -07:00 |
|
Stephen Birarda
|
7a128e5f77
|
add satoshi cost to voxel packet debug
|
2014-07-30 10:14:51 -07:00 |
|
Stephen Birarda
|
66592466ad
|
pipe satoshi cost down to queuePacketToNodes
|
2014-07-30 10:05:21 -07:00 |
|
Stephen Birarda
|
2c8808e922
|
repairs to cost calculations for voxels
|
2014-07-30 09:45:33 -07:00 |
|
Stephen Birarda
|
ff889882ce
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
|
2014-07-30 09:24:48 -07:00 |
|
Stephen Birarda
|
f944c27caf
|
don't calculate satoshi cost if the costs are non-existent
|
2014-07-30 09:24:31 -07:00 |
|
Philip Rosedale
|
f0b64c11bc
|
Merge pull request #3221 from lzuwei/add_cara_face_tracker
Add cara face tracker
|
2014-07-29 20:22:21 -07:00 |
|
Philip Rosedale
|
743200a38c
|
Merge pull request #3220 from Atlante45/avatar_simulate_optimisation
Avatar simulate optimisation
|
2014-07-29 20:20:32 -07:00 |
|
Zu
|
1e719f1a88
|
fixed: restyled code for better readability
|
2014-07-30 10:04:20 +08:00 |
|
Zu
|
113a173577
|
fix: update code style to conform to hifi convention
|
2014-07-30 09:30:55 +08:00 |
|
Atlante45
|
9b3cdacf08
|
Removed microthreading in favor of lazy computation
|
2014-07-29 18:28:33 -07:00 |
|
Zu
|
dcd7b81426
|
Merge branch 'master' into add_cara_face_tracker
|
2014-07-30 08:45:44 +08:00 |
|
Stephen Birarda
|
6a534a6ff1
|
send along satoshi costs for voxel additions from VoxelEditPacketSender
|
2014-07-29 17:31:12 -07:00 |
|
Stephen Birarda
|
9dbe74b02f
|
parse voxel costs to the DomainHandler object
|
2014-07-29 17:22:17 -07:00 |
|
Stephen Birarda
|
40e08d5008
|
add voxel cost amounts to VoxelEditPacketSender
|
2014-07-29 16:39:06 -07:00 |
|
Stephen Birarda
|
5fd7a11c6b
|
rename the voxel cost settings
|
2014-07-29 16:38:07 -07:00 |
|
Atlante45
|
8cd59ab5de
|
Forward declaration of RotationExtractor
|
2014-07-29 16:08:15 -07:00 |
|
Atlante45
|
42ba3ea338
|
CR lost _transformChanged
|
2014-07-29 15:59:53 -07:00 |
|