Stephen Birarda
|
a99b19d28a
|
make Qt5 and ZLIB required finds, add OpenSSL to interface
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
b1310c065c
|
remove TARGET_NAME from cmake macros where it is not required
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
26f7b1ba62
|
add macro to link shared dependencies to target
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
c9f8433a2d
|
tweak setup_hifi_library to bubble up full path of Qt modules
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
17df6484d4
|
remove ssize_t and replace with size_t or int where appropriate
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
93b6f167f5
|
change more CMakeLists to use simplified hifi library linker
|
2014-08-08 13:17:53 -07:00 |
|
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 |
|
Stephen Birarda
|
2f0f5d2c28
|
remove unused variable in VoxelEditPacketSender
|
2014-07-31 14:11:36 -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
|
363cef6d8a
|
move satoshi costs to VoxelEditPacketSender
|
2014-07-30 17:33:37 -07:00 |
|
Stephen Birarda
|
04effabe48
|
Merge branch 'master' into domain-server-auth
|
2014-07-30 17:14:03 -07:00 |
|
Stephen Birarda
|
2796f71419
|
library cleanup to suppress warnings on cmake 3.0
|
2014-07-30 15:06:15 -07:00 |
|
Stephen Birarda
|
2c8808e922
|
repairs to cost calculations for voxels
|
2014-07-30 09:45:33 -07:00 |
|
Stephen Birarda
|
f944c27caf
|
don't calculate satoshi cost if the costs are non-existent
|
2014-07-30 09:24:31 -07: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
|
39e6d7d31b
|
octree packet methods can take a cost
|
2014-07-29 11:40:07 -07:00 |
|
barnold1953
|
4410411d9d
|
Script improvements for AC
|
2014-07-18 14:51:53 -07:00 |
|
barnold1953
|
592c571fcb
|
Fixed crash bug in voxelScriptingInterface
|
2014-07-17 18:15:34 -07:00 |
|
barnold1953
|
b339e9c2af
|
Added getVoxelEnclosingPointBlocking and improved sand script
|
2014-07-15 11:44:59 -07:00 |
|
Oren Hurvitz
|
98b4d6f697
|
Allow the project to compile using Visual Studio 2013
|
2014-06-18 10:27:57 +03:00 |
|
ZappoMan
|
efd0580cfb
|
add ray picking to the model scripting interface
|
2014-05-23 17:09:37 -07:00 |
|
ZappoMan
|
ee523ff373
|
Merge branch 'master' of https://github.com/worklist/hifi into aacube
|
2014-05-23 11:17:59 -07:00 |
|
ZappoMan
|
39ed7f7b65
|
renaming of AABox to AACube, introduction of actual AABox
|
2014-05-23 10:45:04 -07:00 |
|
Atlante45
|
ea1359c10f
|
Clean up log
|
2014-05-22 11:11:22 -07:00 |
|
Stephen Birarda
|
a9c2e3fe71
|
put back ssize_t definition
|
2014-05-20 11:56:06 -07:00 |
|
Stephen Birarda
|
0e7615391c
|
don't look for GnuTLS from cmake
|
2014-05-20 10:35:04 -07:00 |
|
ZappoMan
|
bb204154a1
|
tweak
|
2014-05-16 16:59:58 -07:00 |
|
ZappoMan
|
128e4a13de
|
place models in proper containing voxel
|
2014-05-07 17:32:51 -07:00 |
|
ZappoMan
|
91e4a89573
|
cleanup old references to node which are really elements
|
2014-05-06 15:47:18 -07:00 |
|
ZappoMan
|
715e6b8e60
|
debugging model editing
|
2014-05-02 09:10:30 -07:00 |
|
ZappoMan
|
4aa96e1fbe
|
added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock
|
2014-04-29 15:10:28 -07:00 |
|
Atlante45
|
3143e10bd8
|
CR
|
2014-04-25 13:33:59 -07:00 |
|
Atlante45
|
1844eb2c9e
|
Pre CR tweaks
|
2014-04-24 11:12:01 -07:00 |
|
Atlante45
|
9bdcfe6d04
|
Undo now fully support local subtrees
|
2014-04-24 11:01:12 -07:00 |
|
Atlante45
|
2494e589a9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo
|
2014-04-23 17:36:01 -07:00 |
|
Atlante45
|
378afdf117
|
More undo work
|
2014-04-23 10:35:24 -07:00 |
|
Atlante45
|
448e3a0947
|
Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo
|
2014-04-22 14:42:58 -07:00 |
|
Andrew Meadows
|
f033990fae
|
merge upstream/master into andrew/inertia
|
2014-04-22 10:49:44 -07:00 |
|
Andrew Meadows
|
241df7a767
|
Move AABox from octree lib to shared lib
Stubbed out Shape vs Octree collisions
|
2014-04-21 10:27:20 -07:00 |
|
Atlante45
|
61981b9470
|
Added getter for tree scale in js
|
2014-04-18 16:00:44 -07:00 |
|
ZappoMan
|
bdf39186de
|
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
|
2014-04-15 21:04:15 -07:00 |
|
Atlante45
|
dd02bae5b3
|
First cut at improved undo
|
2014-04-15 16:11:00 -07:00 |
|
ZappoMan
|
60c6b27ab2
|
cleanup code a bit, add support for diffusions even with no ray intersection
|
2014-04-15 11:38:11 -07:00 |
|
Stephen Birarda
|
54647f0f08
|
make sure gnutls define for ssize_t comes before gnutls include
|
2014-04-10 10:27:08 -07:00 |
|
Stephen Birarda
|
2518d314ac
|
add ssize_t definition for gnutls.h include on Windows
|
2014-04-10 10:19:45 -07:00 |
|
Stephen Birarda
|
16bb28a4fa
|
make GnuTLS a system include to suppress warnings
|
2014-04-10 10:04:02 -07:00 |
|