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 |
|
Stephen Birarda
|
68c445e718
|
link GnuTLS to targets linking the networking library
|
2014-04-10 10:00:10 -07:00 |
|
Stephen Birarda
|
d5d52f804f
|
add a networking library and link from appropriate targets
|
2014-04-10 09:32:17 -07:00 |
|
Stephen Birarda
|
ae4b8348a2
|
fix header include guards via regex
|
2014-04-09 12:03:17 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
Stephen Birarda
|
974d8c0427
|
prepare header files for regex run against cpp
|
2014-04-09 09:35:05 -07:00 |
|
Stephen Birarda
|
7ce91b3f96
|
fix headers who had their comments removed
|
2014-04-08 17:43:35 -07:00 |
|
Stephen Birarda
|
6a51df9e38
|
initial regex replacement of headers
|
2014-04-08 17:30:36 -07:00 |
|
Stephen Birarda
|
f3cbd120ce
|
header comment tweaks prior to regex match
|
2014-04-08 17:19:23 -07:00 |
|
Atlante45
|
22cab29d25
|
Code review
|
2014-04-08 11:06:48 -07:00 |
|
Atlante45
|
ee5ebae89e
|
Code review
|
2014-04-08 10:22:50 -07:00 |
|
Atlante45
|
46f0e78039
|
Erased deprecated code
|
2014-04-07 17:28:03 -07:00 |
|
Atlante45
|
d213cd7840
|
More work on Undo/Redo
|
2014-04-07 17:10:15 -07:00 |
|
Andrzej Kapolka
|
20ae5c15f7
|
Added a "flat" mode for environments that makes them follow you around on the
X/Z axes. The default environment is flat. Closes #2378.
|
2014-03-20 12:09:20 -07:00 |
|
ZappoMan
|
adb6ffe7c4
|
more warnings fixes
|
2014-03-15 22:00:44 -07:00 |
|
ZappoMan
|
12becb9d19
|
improve octree stats display
|
2014-03-11 16:22:35 -07:00 |
|
ZappoMan
|
f4d487464a
|
more constructor cleanup
|
2014-03-09 00:01:47 -08:00 |
|
ZappoMan
|
1ceb05bf09
|
click harder
|
2014-03-08 18:22:30 -08:00 |
|
Philip Rosedale
|
e4924cdca8
|
Merge pull request #2202 from birarda/authentication
remove deprecated qt5 methods in CMakeList files
|
2014-03-04 18:30:22 -08:00 |
|
Stephen Birarda
|
231dc624ff
|
replace deprecated qt5 macros in cmake with target_link_libraries
|
2014-03-04 12:41:24 -08:00 |
|
Atlante45
|
894f85fcb5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
|
2014-03-04 10:49:26 -08:00 |
|
Atlante45
|
f1ce034c35
|
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
|
2014-03-03 16:47:42 -08:00 |
|
Atlante45
|
ef9ff0fa74
|
Put initialization and deletion of localVoxelSystems on render thread
|
2014-03-03 16:46:25 -08:00 |
|
Stephen Birarda
|
bb3a8677be
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes
|
2014-03-03 16:31:25 -08:00 |
|
Stephen Birarda
|
628f91cd73
|
complete quoting of varous Cmake commands, closes #1999
|
2014-03-03 12:15:05 -08:00 |
|
Stephen Birarda
|
60eb588e96
|
remove some unecessary null pointer checks
|
2014-03-03 11:36:01 -08:00 |
|
ZappoMan
|
372561195a
|
remove voxel drumming from C++
|
2014-03-03 04:00:06 -08:00 |
|
ZappoMan
|
bde39d9832
|
expose getVoxelEnclosingPoint() to JS, and clean up JS version of findRayIntersection()
|
2014-03-02 20:28:20 -08:00 |
|
ZappoMan
|
855e351f39
|
remove some ray pick helper code that was only used by hover voxel, main ray pick still exists
|
2014-03-02 19:37:40 -08:00 |
|
ZappoMan
|
f0e73d2f98
|
removed VoxelSystem::findRayIntersection() use tree directly
|
2014-03-02 15:46:33 -08:00 |
|
ZappoMan
|
ded7328959
|
clean up application access to deleteVoxelAt()/createVoxel()/getVoxelAt() to access VoxelTree directly
|
2014-03-02 15:17:49 -08:00 |
|
ZappoMan
|
de0baddef6
|
remove scene utils from voxels
|
2014-03-02 13:42:33 -08:00 |
|