Commit graph

41456 commits

Author SHA1 Message Date
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
samcake
0c8556528b Polishing the PerfPlot qml to display usefull things 2016-03-24 17:25:58 -07:00
Seth Alves
f8fe7b5868 add back getMesh call 2016-03-24 17:22:34 -07:00
Brad Hefta-Gaub
5b13ebf72b more mac build busters 2016-03-24 17:19:11 -07:00
Brad Hefta-Gaub
06a6a8462f more cleanup 2016-03-24 16:34:09 -07:00
Brad Hefta-Gaub
2b595fb329 break out thread safe moving average to get around unix build hell 2016-03-24 16:26:28 -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
Seth Alves
6abed67c05 cleanups 2016-03-24 15:46:30 -07:00
Brad Hefta-Gaub
8691aa6905 fix unix build and CR feedback 2016-03-24 15:45:44 -07:00
Seth Alves
7c910fcf5e further reworking of polyvox threading 2016-03-24 15:28:19 -07:00
Brad Davis
520cccb219 Make display plugin switching atomic from other threads 2016-03-24 15:19:46 -07:00
Zach Pomerantz
a34e6773a9 Add messageBox for no gl support 2016-03-24 15:13:38 -07:00
Zach Pomerantz
aa038bac58 Don't cache nested geometries 2016-03-24 14:34:25 -07:00
David Rowe
46df386f0b Fix edit tab display after script reload 2016-03-25 10:18:58 +13:00
Brad Hefta-Gaub
deed643ca7 add additional tracking of max elapsed 2016-03-24 13:30:39 -07:00
Brad Hefta-Gaub
6eed8fb429 fix unix build 2016-03-24 13:30:20 -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
David Rowe
9280443425 Merge branch 'master' into 20855 2016-03-25 09:06:20 +13:00
Ken Cooke
c6ca984782 Fix Reverb Zone settings to work correctly with new reverb. 2016-03-24 12:59:52 -07:00
Brad Hefta-Gaub
208b594ef8 make the deadlock watchdog more generous and add some logging so we can see heatbeats on slow machines 2016-03-24 12:37:07 -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
Seth Alves
bd178640f1 Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-24 09:51:31 -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
Seth Alves
462da3aaf3 don't call getMesh from render 2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554 redo polyvox locking 2016-03-23 22:03:27 -07:00