ZappoMan
|
4d0b762de3
|
some hacking on full scene debuggin
|
2014-03-11 20:33:53 -07:00 |
|
ZappoMan
|
7fb872c1d7
|
remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats
|
2014-03-08 23:53:44 -08:00 |
|
Atlante45
|
8faaa28bc1
|
FST ploader base
|
2014-03-07 11:55:02 -08:00 |
|
Stephen Birarda
|
4a1cb63d7b
|
remove an blank line in Application headers
|
2014-03-06 15:09:35 -08:00 |
|
Stephen Birarda
|
87d908a3bc
|
resolve conflicts on merge with upstream master
|
2014-03-06 15:03:03 -08:00 |
|
Stephen Birarda
|
b705ec560f
|
cleanup resources directory references by copying beside the executable
|
2014-03-06 11:46:49 -08:00 |
|
ZappoMan
|
7a8d26247a
|
remove piemenu
|
2014-03-05 21:03:32 -08:00 |
|
Andrzej Kapolka
|
64c4e58160
|
Tie the avatar LOD distance multiplier to the LOD parameter calculated for
voxels.
|
2014-03-03 16:34:28 -08:00 |
|
ZappoMan
|
9d5e33d75d
|
removed unused highlight voxel
|
2014-03-03 04:09:33 -08:00 |
|
ZappoMan
|
cb4219b775
|
remove HoverVoxel
|
2014-03-02 19:23:00 -08:00 |
|
ZappoMan
|
9bd29bdd92
|
removed findSpherePenetration() and findCapsulePenetration() from VoxelSystem, use VoxelTree
|
2014-03-02 15:34:36 -08:00 |
|
ZappoMan
|
f09521f67c
|
oops
|
2014-03-02 13:50:46 -08:00 |
|
ZappoMan
|
c5197b390e
|
removed a bunch of cruft from VoxelSystem
|
2014-03-02 12:13:00 -08:00 |
|
ZappoMan
|
1cc6288899
|
add back in entry point for import voxels
|
2014-02-27 15:41:36 -08:00 |
|
ZappoMan
|
5b1037cc63
|
switching to OctreeQuery instead of VoxelQuery
|
2014-02-26 01:22:53 -08:00 |
|
Philip Rosedale
|
46469612c7
|
Merge pull request #2108 from ZappoMan/remove_cpp_voxel_editing
Remove cpp voxel editing
|
2014-02-25 22:07:54 -08:00 |
|
ZappoMan
|
5fdf114ff0
|
removed more cruft
|
2014-02-25 21:53:20 -08:00 |
|
ZappoMan
|
d61ba02a38
|
removed more cruft
|
2014-02-25 21:44:38 -08:00 |
|
ZappoMan
|
869b35a7aa
|
remove old c++ implementation of voxel tools
|
2014-02-25 21:38:10 -08:00 |
|
ZappoMan
|
42ddc82ac4
|
possible fix to windows assert
|
2014-02-25 20:23:38 -08:00 |
|
ZappoMan
|
263d682fb9
|
Merge branch 'master' of https://github.com/worklist/hifi into menu_js
|
2014-02-25 12:20:15 -08:00 |
|
Philip Rosedale
|
e637e48598
|
Merge pull request #2076 from birarda/authentication
groundwork for secure node communication via data-server
|
2014-02-25 10:07:55 -08:00 |
|
ZappoMan
|
03f8885cad
|
first cut at menus JS
|
2014-02-24 19:09:22 -08:00 |
|
Philip Rosedale
|
fa3b109e1d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-02-24 16:43:39 -08:00 |
|
Stephen Birarda
|
9771e1bb12
|
resolve conflicts on merge with upstream master
|
2014-02-24 12:06:10 -08:00 |
|
Andrzej Kapolka
|
e40fe85c36
|
Updating the camera mode every frame screws with the scripts, so revert to
updating it when the menu changes.
|
2014-02-24 11:42:47 -08:00 |
|
Andrzej Kapolka
|
d80b52dc9f
|
Fixes for camera mode transitions, seeing inside head.
|
2014-02-24 11:33:52 -08:00 |
|
Philip Rosedale
|
246bb1fd2d
|
Physics test ‘buckyballs’ moved to application.cpp
|
2014-02-24 00:06:50 -08:00 |
|
Andrzej Kapolka
|
8745ca3139
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-23 20:13:23 -08:00 |
|
Stephen Birarda
|
6df317e8e6
|
update user's domain in data-server after connection to new one
|
2014-02-21 16:22:17 -08:00 |
|
Andrzej Kapolka
|
ac02609bc2
|
The basic billboard behavior, closes #1864.
|
2014-02-21 15:38:49 -08:00 |
|
Andrzej Kapolka
|
18ea1d6a85
|
More work on billboards.
|
2014-02-21 10:16:06 -08:00 |
|
Andrzej Kapolka
|
6b90a3994d
|
Working on avatar billboards.
|
2014-02-20 19:22:59 -08:00 |
|
Andrzej Kapolka
|
09ad4046f8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-20 17:20:07 -08:00 |
|
Stephen Birarda
|
2408d909ba
|
resolve conflicts on merge with upstream master
|
2014-02-20 12:12:29 -08:00 |
|
Andrzej Kapolka
|
4dab2eb694
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-20 10:45:19 -08:00 |
|
Stephen Birarda
|
6f84230d9d
|
resolve conflicts on merge with upstream/master
|
2014-02-20 10:14:36 -08:00 |
|
ZappoMan
|
0e8cab7349
|
added Clipboard.nudgeVoxel() and added support for calling clipboard opertations with VoxelDetail as well as xyzs
|
2014-02-19 20:09:35 -08:00 |
|
ZappoMan
|
3a8a880a8b
|
Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard
|
2014-02-19 17:49:22 -08:00 |
|
Jose Carlos
|
828508bbf1
|
merged from master
|
2014-02-19 23:01:13 +01:00 |
|
Stephen Birarda
|
ff7a49d8c2
|
resolve conflicts on merge with upstream master
|
2014-02-19 13:07:26 -08:00 |
|
ZappoMan
|
897da67118
|
Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard
|
2014-02-19 10:54:05 -08:00 |
|
Andrzej Kapolka
|
3c4d2aa199
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-19 10:29:57 -08:00 |
|
ZappoMan
|
bf814410ac
|
first cut at exposing clipboard support to JavaScript
|
2014-02-19 00:10:16 -08:00 |
|
Andrzej Kapolka
|
f83254882a
|
Attempting to get the head rotation from Visage.
|
2014-02-18 16:07:08 -08:00 |
|
Jose Carlos
|
59f8851b50
|
Merge remote-tracking branch 'upstream/master' into 19489
|
2014-02-19 00:05:16 +01:00 |
|
Jose Carlos
|
46ed506196
|
Display names are shown when distance is below a threshold
Used polygon offset to render display names
Saved model view and projection matrices in order to save glGetDoublev calls
|
2014-02-19 00:04:00 +01:00 |
|
Andrzej Kapolka
|
036230ec8d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
|
2014-02-18 13:59:31 -08:00 |
|
Stephen Birarda
|
c762b92e5a
|
replace DataServerClient and Profile with AccountManager
|
2014-02-18 11:27:37 -08:00 |
|
Andrzej Kapolka
|
5513524705
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-17 21:48:37 -08:00 |
|