Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-01 12:00:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10180 commits 73 branches 59 tags 1.2 GiB
Commit graph

10180 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
3479f72ec9 removed _ballColor from Hand since it was never actually used 2014-03-02 21:55:05 -08:00
ZappoMan
6ddc6132fd removed unneeded class def 2014-03-02 21:53:36 -08:00
ZappoMan
bde39d9832 expose getVoxelEnclosingPoint() to JS, and clean up JS version of findRayIntersection() 2014-03-02 20:28:20 -08:00
ZappoMan
f245aa6ac5 remove more cruft from VoxelSystem, move getElementEnclosingPoint() to Octree class where it belongs 2014-03-02 20:12:52 -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
cb4219b775 remove HoverVoxel 2014-03-02 19:23:00 -08:00
ZappoMan
633f358319 removed some dead code 2014-03-02 17:03:57 -08:00
ZappoMan
d9dcc886ce removed some dead code 2014-03-02 16:57:19 -08:00
ZappoMan
176270f639 more VoxelSystem vs VoxelTree cleanup 2014-03-02 16:51:40 -08:00
ZappoMan
63bebc9afc removed dead code 2014-03-02 16:44:25 -08:00
ZappoMan
5f6a60e786 removed more VoxelSystem wrappers, call VoxelTree directly 2014-03-02 16:40:27 -08:00
ZappoMan
f0e73d2f98 removed VoxelSystem::findRayIntersection() use tree directly 2014-03-02 15:46:33 -08:00
ZappoMan
9bd29bdd92 removed findSpherePenetration() and findCapsulePenetration() from VoxelSystem, use VoxelTree 2014-03-02 15:34:36 -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
f09521f67c oops 2014-03-02 13:50:46 -08:00
ZappoMan
de0baddef6 remove scene utils from voxels 2014-03-02 13:42:33 -08:00
ZappoMan
6c6b65c600 moved SceneUtils out of voxels library into voxel-edit 2014-03-02 13:22:15 -08:00
ZappoMan
a89c5b568f Merge branch 'master' of https://github.com/worklist/hifi into cruft_removal 2014-03-02 13:09:53 -08:00
Leonardo Murillo
67e5e81393 Merge pull request #2153 from ZappoMan/SvoViewer 
cleanup names and fix some warnings
 2014-03-02 15:00:06 -06:00
ZappoMan
124a63e6cc remove use of getTrueColor() which is going away 2014-03-02 12:41:17 -08:00
ZappoMan
5b72f01b99 more cruft removal getting rid of false color in VoxelTreeElement 2014-03-02 12:33:52 -08:00
ZappoMan
b66c346f20 more cruft removal 2014-03-02 12:19:50 -08:00
ZappoMan
c5197b390e removed a bunch of cruft from VoxelSystem 2014-03-02 12:13:00 -08:00
ZappoMan
1c92cd996c Merge branch 'master' of https://github.com/worklist/hifi into SvoViewer 2014-03-01 19:27:53 -08:00
ZappoMan
8a6e22bdb0 Merge pull request #2156 from ZappoMan/warningsfix 
fix warning
 2014-03-01 16:08:40 -08:00
ZappoMan
7d45cc857b fix warning 2014-03-01 12:53:01 -08:00
ZappoMan
c8feaa7b80 one more attempt to get this to work 2014-03-01 12:47:45 -08:00
ZappoMan
a2648b062e fixed more warnings 2014-03-01 12:35:08 -08:00
ZappoMan
b1aee19e07 Merge branch 'master' of https://github.com/worklist/hifi into SvoViewer 2014-03-01 12:18:21 -08:00
ZappoMan
092d7ff394 Merge pull request #2154 from ZappoMan/warningsfix 
fix warning
 2014-03-01 12:17:47 -08:00
ZappoMan
64a3fb950b fix warning 2014-03-01 11:54:24 -08:00
ZappoMan
5ffff958fe cleanup names and fix some warnings 2014-03-01 11:47:37 -08:00
Philip Rosedale
35606c87ad Merge pull request #2151 from ey6es/master 
Fix for head rotation tweaking.
 2014-02-28 17:30:00 -08:00
Andrzej Kapolka
dee5c73fed Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-28 17:17:57 -08:00
Andrzej Kapolka
605c74a979 Merge pull request #2152 from PhilipRosedale/master 
Correct billboards on bots, audio doesn't double play, 50 voice clips!
 2014-02-28 17:17:42 -08:00
Philip Rosedale
3cfada1a1b avatar billboards match body/head 2014-02-28 17:14:18 -08:00
Andrzej Kapolka
3ae98a81fc Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-28 17:03:15 -08:00
Philip Rosedale
8e30766c68 Merge pull request #2149 from ZappoMan/octree_server_scaling 
Octree server scaling improvements
 2014-02-28 17:03:04 -08:00
Philip Rosedale
3dd51db477 Added timer so one bot doesn’t talk twice at same time 2014-02-28 17:02:40 -08:00
Andrzej Kapolka
7e2e80add9 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-28 16:59:15 -08:00
ZappoMan
ef87fbffac Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	libraries/shared/src/ResourceCache.cpp
 2014-02-28 16:58:43 -08:00
Andrzej Kapolka
d157428704 When we send data to the avatar mixer, send the tweaked head rotation. Closes 2014-02-28 16:58:22 -08:00
Philip Rosedale
d2a75f7b96 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-28 16:51:31 -08:00
Philip Rosedale
ea770c2bb3 Merge pull request #2150 from birarda/master 
make Agent the parent of its ScriptEngine
 2014-02-28 16:51:18 -08:00
Stephen Birarda
094159eefd make Agent parent of ScriptEngine so they stay on same thread 2014-02-28 16:47:54 -08:00
Philip Rosedale
299d847036 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-28 16:43:28 -08:00
Philip Rosedale
25beadc031 Merge pull request #2148 from ey6es/master 
Various improvements to model loading: wait until head and body are loaded before rendering; render old model until new one is loaded when switching; process geometry/textures in worker threads.
 2014-02-28 16:42:53 -08:00
Andrzej Kapolka
380b0536b3 Indentation fix. 2014-02-28 16:18:44 -08:00
ZappoMan
c1c41ea2ca handle some shutdown cases and reduce time of locking in octree server 2014-02-28 16:18:02 -08:00
ZappoMan
d2faca9767 fixed some warnings 2014-02-28 16:17:30 -08:00