ZappoMan
|
daffb00bf2
|
build issues fixed after merge
|
2014-08-18 15:41:20 -07:00 |
|
ZappoMan
|
32d5eb3cea
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
|
2014-08-18 15:16:35 -07:00 |
|
Stephen Birarda
|
2fda95ae8f
|
repair build of various tools
|
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
|
27419b7b6b
|
fix some build blockers in test directory
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
e4d01d269c
|
use shared dependency linking macro in hifi projects
|
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
|
17df6484d4
|
remove ssize_t and replace with size_t or int where appropriate
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
87cf262b9e
|
get to successful cmake after library link macro changes
|
2014-08-08 13:17:53 -07:00 |
|
ZappoMan
|
77e1867b11
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
assignment-client/src/Agent.cpp
assignment-client/src/Agent.h
examples/editModels.js
interface/src/Application.h
|
2014-07-31 10:34:23 -07:00 |
|
Stephen Birarda
|
2796f71419
|
library cleanup to suppress warnings on cmake 3.0
|
2014-07-30 15:06:15 -07:00 |
|
ZappoMan
|
865566414c
|
Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities
Conflicts:
interface/src/entities/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTreeElement.cpp
libraries/models/src/ModelsScriptingInterface.cpp
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
|
2014-07-01 16:32:47 -07:00 |
|
ZappoMan
|
c4fe36b13d
|
more Models->Entities renaming
|
2014-06-26 17:01:07 -07:00 |
|
ZappoMan
|
a7f2d150a4
|
what's this cmake defines ssize_t???
|
2014-06-24 20:15:34 -07:00 |
|
ZappoMan
|
773e1b0522
|
try to get tests to build
|
2014-06-24 18:02:35 -07:00 |
|
ZappoMan
|
48e779cf8e
|
added some performance tests
|
2014-06-23 14:08:47 -07:00 |
|
ZappoMan
|
89e24c4f21
|
add unit tests from new ModelItem serialization
|
2014-06-09 12:55:55 -07:00 |
|
ZappoMan
|
493ad6ae9e
|
added test pass/fail counting to octree unit tests
|
2014-06-09 10:41:43 -07:00 |
|
ZappoMan
|
76731be8c0
|
added some extra libraries
|
2014-06-05 16:01:11 -07:00 |
|
ZappoMan
|
2b85145325
|
added test suite for PropertyFlags, latest work on PropertyFlags
|
2014-06-04 11:41:09 -07:00 |
|