Zach Pomerantz
|
864def31ea
|
Don't refresh NetworkGeometry with cache
|
2016-03-25 10:56:20 -07:00 |
|
Zach Pomerantz
|
5d306a74d5
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
|
2016-03-25 10:09:37 -07:00 |
|
Chris Collins
|
2a85170a46
|
Merge pull request #7470 from zzmp/fix/tex-json
Accept textures as list or json
|
2016-03-25 10:05:12 -07:00 |
|
samcake
|
093f5d0019
|
Merge pull request #7460 from hyperlogic/tony/skip-culling-render-config
CullTask: added ability to disable culling during rendering.
|
2016-03-25 09:40:35 -07:00 |
|
Philip Rosedale
|
5804559f91
|
Merge pull request #7468 from Atlante45/fix/console-log
Fix sometimes slow server-console logs.
|
2016-03-25 09:18:34 -07:00 |
|
Anthony J. Thibault
|
c00a412d3b
|
Fix misleading comments for _skipCulling case.
|
2016-03-25 09:10:46 -07:00 |
|
Andrew Meadows
|
6c36d55fea
|
Merge pull request #7459 from kencooke/master
Fix Reverb Zone settings to work correctly with new reverb
|
2016-03-25 08:17:45 -07:00 |
|
Brad Davis
|
39ef5402bd
|
Merge pull request #7471 from highfidelity/revert-7467-clean/drop-data
Revert "Drop resource data after load"
|
2016-03-24 20:50:06 -07:00 |
|
Brad Hefta-Gaub
|
cd5beabf10
|
Revert "Drop resource data after load"
|
2016-03-24 20:37:16 -07:00 |
|
Zach Pomerantz
|
413c3b88cf
|
Accept textures as list or json
|
2016-03-24 19:40:02 -07:00 |
|
Zach Pomerantz
|
c625d36bd8
|
Persist material transform/params
|
2016-03-24 19:28:44 -07:00 |
|
Zach Pomerantz
|
eeeb175bb8
|
Derive NetworkMaterial, avoid copying it
|
2016-03-24 18:50:44 -07:00 |
|
Zach Pomerantz
|
3402635f99
|
Lock geometry on blender
|
2016-03-24 18:50:43 -07:00 |
|
Atlante45
|
76c30d9014
|
Fix sometimes slow server-console logs.
|
2016-03-24 17:56:11 -07:00 |
|
Brad Hefta-Gaub
|
17a2ed7dd0
|
Merge pull request #7467 from zzmp/clean/drop-data
Drop resource data after load
|
2016-03-24 17:52:19 -07:00 |
|
Brad Davis
|
0ac70049c7
|
Merge pull request #7431 from hyperlogic/tony/vive-rendering-work
OpenVR rendering & Nsight instrumentation improvements
|
2016-03-24 17:44:30 -07:00 |
|
Brad Hefta-Gaub
|
fc41c5bca9
|
Merge pull request #7448 from Menithal/entity-properties-refresh-cache
Added Refresh Buttons to entityProperties
|
2016-03-24 17:34:46 -07:00 |
|
Brad Hefta-Gaub
|
6d76a5872f
|
Merge pull request #7461 from hyperlogic/tony/avatar-culling-fix
Avatar: fix for Avatar animation updates while wearing HMD
|
2016-03-24 17:34:20 -07:00 |
|
Brad Hefta-Gaub
|
d26fe77803
|
Merge pull request #7454 from jherico/qml_crashes
Fix async issues related to JS <-> App <-> QML <-> HTML communication
|
2016-03-24 17:32:38 -07:00 |
|
Brad Hefta-Gaub
|
299103fc4f
|
Merge pull request #7466 from zzmp/clean/image-reader
Clean image-reader to drop image sooner
|
2016-03-24 16:24:47 -07:00 |
|
Howard Stearns
|
d580cb8694
|
Merge pull request #7464 from jherico/atomic_display_plugin
Make display plugin switching atomic from other threads
|
2016-03-24 16:16:56 -07:00 |
|
Zach Pomerantz
|
afc853572a
|
Drop resource data after load
|
2016-03-24 15:50:51 -07:00 |
|
Zach Pomerantz
|
8d0e419a5c
|
Clean image-reader to drop image sooner
|
2016-03-24 15:50:48 -07:00 |
|
Brad Davis
|
520cccb219
|
Make display plugin switching atomic from other threads
|
2016-03-24 15:19:46 -07:00 |
|
Zach Pomerantz
|
aa038bac58
|
Don't cache nested geometries
|
2016-03-24 14:34:25 -07:00 |
|
Ken Cooke
|
063891d65e
|
remove dead code
|
2016-03-24 13:29:57 -07:00 |
|
Anthony J. Thibault
|
ba4520fe56
|
Avatar: fix for Avatar animation updates while wearing HMD
The boundingSphere vs frustum check now uses the displayViewFrustum, which
more accurately reflects the actual projection matrix used for rendering.
|
2016-03-24 13:23:30 -07:00 |
|
Anthony J. Thibault
|
c302c803b0
|
CullTask: added ability to disable culling during rendering.
You can use the following JavaScript to disable culling:
Render.RenderDeferredTask.CullSceneSelection.skipCulling = true
|
2016-03-24 13:20:29 -07:00 |
|
Ken Cooke
|
c6ca984782
|
Fix Reverb Zone settings to work correctly with new reverb.
|
2016-03-24 12:59:52 -07:00 |
|
Zach Pomerantz
|
4d47126ae4
|
Don't mark failed models loaded, emit failure
|
2016-03-24 12:17:55 -07:00 |
|
Menithal
|
24f2bdac77
|
Fixed Styling
|
2016-03-24 20:58:32 +02:00 |
|
Zach Pomerantz
|
3e9e083df5
|
Update users of NetworkGeometry
|
2016-03-24 11:35:41 -07:00 |
|
Zach Pomerantz
|
7f05e4453b
|
Fetch model geometries through cache
|
2016-03-24 11:35:40 -07:00 |
|
Brad Davis
|
a43fde0803
|
Build a better event bridge
|
2016-03-24 11:01:06 -07:00 |
|
Clément Brisset
|
caf2595e13
|
Merge pull request #7452 from birarda/udt-fixes
fix unecessary re-sends at capacity on udt, race in SendQueue timeout check
|
2016-03-24 11:00:57 -07:00 |
|
Ozan
|
003af03b33
|
Merge pull request #7400 from Menithal/default-use-pre-post
Set UserAnimPreAndPostRotations true by Default
|
2016-03-24 09:57:03 -07:00 |
|
Zach Pomerantz
|
fc8b34f8c7
|
Move tex alpha detection to cv method
|
2016-03-24 09:48:33 -07:00 |
|
Brad Davis
|
8bbabf186f
|
Fix async issues related to JS / QML object lifetimes
|
2016-03-24 09:38:54 -07:00 |
|
Brad Hefta-Gaub
|
16c5971a7f
|
Merge pull request #7455 from ctrlaltdavid/20860
Miscellaneous improvements to Attachments dialog
|
2016-03-24 09:21:36 -07:00 |
|
Philip Rosedale
|
f8f0e48af9
|
Merge pull request #7453 from Atlante45/fix/atp-req-limit
Make ATP respect request limit
|
2016-03-24 09:20:30 -07:00 |
|
Seth Alves
|
1aadebb4e7
|
Merge pull request #7445 from AndrewMeadows/shape-management
fix memory leak in ShapeManager
|
2016-03-24 08:45:49 -07:00 |
|
Philip Rosedale
|
0e2d9d8aaa
|
Merge pull request #7432 from samcake/orange
Fix some Model loading issues with the translucent textures
|
2016-03-24 08:41:35 -07:00 |
|
Andrew Meadows
|
21c770f37b
|
Merge pull request #7441 from zzmp/clean/resource-reinsert
Restrict Resource reinsertion
|
2016-03-24 08:41:12 -07:00 |
|
Andrew Meadows
|
c8655b8524
|
Merge pull request #7438 from PhilipRosedale/airship
Sample script: Airship
|
2016-03-24 08:40:36 -07:00 |
|
David Rowe
|
51728d14a7
|
Miscellaneous improvements to Attachments dialog
|
2016-03-24 21:17:36 +13:00 |
|
Philip Rosedale
|
8e572ed635
|
Merge pull request #7423 from thoys/20859
CR for Job #20859 - Fix particle color selection
|
2016-03-24 00:20:59 -07:00 |
|
Philip Rosedale
|
61205e0e37
|
Merge pull request #7450 from ZappoMan/reduceLogSpam
reduce log spam
|
2016-03-24 00:19:09 -07:00 |
|
Philip Rosedale
|
366810a20c
|
Merge pull request #7447 from ZappoMan/fixNonAnimatedMotorProteins
fix animated motor proteins
|
2016-03-24 00:11:26 -07:00 |
|
PhilipRosedale
|
8c4ecc64d9
|
fix entity script location
|
2016-03-23 22:49:18 -07:00 |
|
Brad Hefta-Gaub
|
2b0670718f
|
Merge pull request #7449 from howard-stearns/report-previous-session-data
Report previous session data
|
2016-03-23 20:58:51 -07:00 |
|