Zach Pomerantz
996346980d
clear the skybox between scenes
2016-08-25 18:08:22 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
Anthony J. Thibault
7de8cc6422
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-16 16:49:57 -07:00
Zach Pomerantz
d6d9871a96
unused var nits
2016-08-16 14:36:54 -07:00
Zach Pomerantz
8c559bc65d
use lights from nontextured skyboxes
2016-08-16 13:27:22 -07:00
Brad Davis
d548da02d9
Expose whether nsight is running to the app, disable some stuff under nsight
2016-08-12 22:28:50 -07:00
Anthony J. Thibault
1be434342b
Work In Progress snapshot
...
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
2016-08-12 17:11:59 -07:00
Ryan Huffman
35ea9908cd
Add default skybox
2016-08-08 16:00:58 -07:00
Ryan Huffman
77e993510e
Cleanup implementation of angular loading
2016-08-08 08:53:05 -07:00
Ryan Huffman
c594dcdf9f
Add priority loading for model entities
2016-08-08 08:52:29 -07:00
Brad Davis
5220b52cd9
Don't trigger entity scripts without scripting interface
2016-07-06 18:13:15 -07:00
Brad Davis
cd1e910844
Add a generic shape primitive
2016-05-21 23:46:44 -07:00
Zach Pomerantz
61fbb7022c
Mv entities script engine deleter to fn
2016-05-16 10:40:11 -07:00
Zach Pomerantz
2140dc77b3
Rename wait and unload in best thread
2016-05-13 16:14:22 -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
Atlante45
07adef9465
Fix entities collision sounds
2016-05-05 14:55:28 -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
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
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
Zach Pomerantz
1e710712cc
Check entities scripting thread before signaling it
2016-04-06 11:19:07 -07:00
Zach Pomerantz
0e9b783ca3
Release skybox texs when not rendering
2016-04-01 14:46:50 -07:00
Brad Hefta-Gaub
03f9a2b46f
more optimization in find best zone
2016-03-31 09:36:51 -07:00
Brad Hefta-Gaub
28978c8adb
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
2016-03-30 17:49:30 -07:00
Zach Pomerantz
29dedd5524
Update model URL on render thread
2016-03-29 10:42:40 -07:00
Zach Pomerantz
3e9e083df5
Update users of NetworkGeometry
2016-03-24 11:35:41 -07:00
Brad Hefta-Gaub
492e71345a
Revert "Revert "Fix ModelBlender crash""
...
This reverts commit f274cdcc7f
.
2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00
Andrew Meadows
d7d428d1b2
Merge pull request #7387 from ZappoMan/fixBlenderCrash
...
Fix ModelBlender crash
2016-03-21 09:14:11 -07:00
Seth Alves
f8b8877369
coding standard
2016-03-20 17:37:06 -07:00
Seth Alves
d4ed9993b2
don't spam log when a zone is invisible
2016-03-20 15:06:17 -07:00
Brad Hefta-Gaub
7483b8546b
remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it
2016-03-17 17:05:35 -07:00
Chris Collins
307a0cf05a
Merge pull request #7349 from zzmp/fix/guard-skybox-tex
...
Guard against failure to load skybox tex
2016-03-16 15:06:52 -07:00
Howard Stearns
010aaa55c0
const ref
2016-03-14 22:13:26 -07:00
Howard Stearns
d7e3699bc8
Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility
2016-03-14 17:45:52 -07:00
Zach Pomerantz
b6322164cf
Guard against failure to load skybox tex
2016-03-14 11:15:06 -07:00
Seth Alves
dbd548a8c7
fix a crash
2016-03-13 11:01:11 -07:00
howard-stearns
8799bf2d55
Alternative implementation, which only selects visible bestZone.
2016-03-11 16:36:13 -08:00
howard-stearns
e538edba0a
Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility
2016-03-11 10:22:01 -08:00
howard-stearns
9cdd0ac6d0
Respect zone visibility property.
2016-03-11 10:19:44 -08:00