Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-26 02:01:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10280 commits 23 branches 0 tags 1.2 GiB
Commit graph

10280 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andrzej Kapolka
2f27d8ecd3 Process geometry/textures in worker threads (via QThreadPool). Closes #2137. 2014-02-28 16:14:02 -08:00
Atlante45
af691e1f75 Some comments and debug messages 2014-02-28 15:14:01 -08:00
Atlante45
ea0f414c23 Added possibility to create a VoxelSystem from an already existing VoxelTree 2014-02-28 15:11:38 -08:00
Atlante45
4bcb43f7dd Added an overlay system for local trees 2014-02-28 15:10:53 -08:00
Andrzej Kapolka
0bb3752121 Fixed seg fault, don't attempt to transfer joints between different models 
(as opposed to different LODs).
 2014-02-28 14:29:18 -08:00
Philip Rosedale
e35e06c0de Added Freddy’s 50 cocktail party clips 2014-02-28 13:59:34 -08:00
Andrzej Kapolka
21a149348b When switching models, retain old one until new one is loaded. Closes #2146. 2014-02-28 13:57:25 -08:00
Andrzej Kapolka
2639796402 Wait until both head and body are loaded before rendering. Closes #2145. 2014-02-28 12:22:10 -08:00
Atlante45
fb10676121 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-28 11:32:27 -08:00
Atlante45
4a9415faeb Prevent users from modifying the domain tree with the LocalVoxels interface 2014-02-28 11:31:37 -08:00
Atlante45
20b921f4f8 Fixed typo 2014-02-28 11:26:17 -08:00
Atlante45
b854c450f4 Moved LocalVoxels class 2014-02-28 11:25:07 -08:00
Atlante45
41931ebd57 Removed copyTo and pasteFrom from ClipboardScriptingInterface (not useful in the end) 2014-02-28 11:22:14 -08:00
Atlante45
5b085a72cd Added import tree to LocalVoxels 2014-02-28 11:21:32 -08:00
ZappoMan
8d7406461a Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	assignment-client/src/octree/OctreeServer.h
 2014-02-28 10:54:56 -08:00
Philip Rosedale
f4540536a8 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-28 10:20:12 -08:00
ZappoMan
f6ed9c7b4b Merge pull request #2142 from ZappoMan/SvoViewer 
fix windows build/cmake for SvoViewer
 2014-02-28 09:11:37 -08:00
ZappoMan
f1dd963505 fix mac build 2014-02-28 09:07:47 -08:00
ZappoMan
c3eb42327c fix unix build 2014-02-28 09:04:20 -08:00