Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 03:17:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43437 commits 76 branches 59 tags 1.2 GiB
Commit graph

1250 commits

Author SHA1 Message Date
Seth Alves
76f4a25694 move code that clears old scale and registration to after model is loaded 2016-05-20 11:40:46 -07:00
Brad Hefta-Gaub
67891abf17 Merge pull request #7877 from Atlante45/fix/asset-client 
Fix Asset Client crash
 2016-05-18 11:37:34 -07:00
Chris Collins
b2ece6f4a7 Merge pull request #7882 from zzmp/fix/script-thread-dtor 
Wait and cleanly exit the scripting thread
 2016-05-16 16:52:54 -07:00
Seth Alves
2a5efd3b82 Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta 2016-05-16 10:53:39 -07:00
Zach Pomerantz
7d4276d15f Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor 2016-05-16 10:51:23 -07:00
Zach Pomerantz
61fbb7022c Mv entities script engine deleter to fn 2016-05-16 10:40:11 -07:00
Atlante45
0878d87ac7 remove some unnecessary dependencies 2016-05-14 14:50:02 -07:00
Brad Davis
9509e32928 PR feedback 2016-05-14 08:28:51 -07:00
Zach Pomerantz
2140dc77b3 Rename wait and unload in best thread 2016-05-13 16:14:22 -07:00
Seth Alves
ceb6aa582f don't crash when a moving model entity is deleted 2016-05-13 13:32:45 -07:00
Seth Alves
970e7ca17d don't crash when a moving model entity is deleted 2016-05-13 13:32:00 -07:00
Seth Alves
574709824e oops 2016-05-13 09:41:19 -07:00
Seth Alves
79141e3869 dry up some code 2016-05-13 07:06:25 -07:00
Seth Alves
dd2a29aace when a ModelEntityItem moves, also update its meta-render-item 2016-05-12 18:05:28 -07:00
Zach Pomerantz
806d06b552 Wait on old entity script engines in threadpool 2016-05-12 17:51:40 -07:00
Zach Pomerantz
7e82494a66 Add cap on entities scripting thread stop time 2016-05-12 17:51:37 -07:00
Zach Pomerantz
f40fe88ee7 Clean up entity script engine deletion 2016-05-12 17:51:36 -07:00
samcake
99dcfef5a8 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-11 10:47:38 -07:00
samcake
1ec9ef560e Fixing the srgb color format conversion for web entities 2016-05-11 10:46:54 -07:00
Brad Hefta-Gaub
350743454b Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1 
use smart pointers for entity simulations
 2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub
d7eee98acc Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum 
resurrection of threadsafe ViewFrustum
 2016-05-10 09:06:38 -07:00
Seth Alves
b761ecf44f merge from upstream 2016-05-10 08:18:45 -07:00
Andrew Meadows
59c6a6dfea Merge pull request #7825 from sethalves/linux-qol 
Linux qol
 2016-05-09 15:34:10 -07:00
Brad Hefta-Gaub
2c0204b0d6 Merge pull request #7821 from Atlante45/fix/collision-sound 
Fix avatar/entity collision sound
 2016-05-09 14:24:19 -07:00
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Seth Alves
073d845bb5 show with debug icons when someone else is the simulation owner 2016-05-05 18:33:01 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00
Seth Alves
cb523a3a71 disable webSurface differently 2016-05-05 16:01:05 -07:00
Seth Alves
b5a3baf322 Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-05 15:55:37 -07:00
Atlante45
07adef9465 Fix entities collision sounds 2016-05-05 14:55:28 -07:00
Brad Hefta-Gaub
49d02b802a Merge pull request #7719 from zzmp/feat/resource-prefetch 
Add prefetching to exposed caches
 2016-05-02 18:04:26 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Zach Pomerantz
bc8a171fde Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch 2016-04-27 11:55:24 -07:00
Andrew Meadows
b5ad989811 more optimized uses of EntityItem::getDimensions() 2016-04-27 11:04:22 -07:00
Brad Hefta-Gaub
b597f7001b fix auto resize 2016-04-26 15:13:11 -07:00
Seth Alves
c9df446879 web-entities don't yet work right on Linux 2016-04-24 08:15:10 -07:00
Seth Alves
e2025b0d1f lock entity-tree before accessing entities 2016-04-21 15:27:15 -07:00
Zach Pomerantz
c096b0dfa1 Add TextureType to NetworkTexture for reflection 2016-04-20 20:18:22 -07:00
Howard Stearns
9ff9682b2a Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange 
Reset entities script engine on domain change
 2016-04-19 11:14:28 -07:00
samcake
cadb53b703 Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more 2016-04-18 18:24:27 -07:00
Brad Hefta-Gaub
55010cebb7 remove unhelpful comment 2016-04-18 12:43:32 -07:00
Brad Hefta-Gaub
374ba10524 more CR feedback 2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e CR feedback 2016-04-18 12:13:21 -07:00
Brad Hefta-Gaub
c26115cf2e one small tweak 2016-04-18 11:40:17 -07:00
Brad Hefta-Gaub
f6c75d0530 cleanup 2016-04-18 10:41:54 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Brad Hefta-Gaub
a4f562672a cleanup 2016-04-18 10:08:33 -07:00
Brad Hefta-Gaub
9db0fe0d11 switch to using QSharedPointer for _entitiesScriptEngine 2016-04-18 09:46:04 -07:00
Brad Hefta-Gaub
87078b1ea2 first cut at resetting entities script engine on domain change 2016-04-16 11:09:23 -07:00
Brad Hefta-Gaub
91334d6a39 Merge pull request #7664 from ZappoMan/reduceJointProperties 
only export joint values if they've been explicitly set by scripts
 2016-04-14 15:30:04 -07:00