Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41887 commits 2 branches 0 tags 1.1 GiB
Commit graph

17012 commits

Author SHA1 Message Date
Seth Alves
3890a71433 treat children of avatars and children of entities differently until this is fixed 2016-04-09 08:37:41 -07:00
Brad Davis
8e1e11a6f8 Merge pull request #7615 from zzmp/fix/amd-particles 
Add explicit layout to textured particle shader
 2016-04-08 13:19:41 -07:00
Brad Hefta-Gaub
7ba08dd137 Merge pull request #7613 from hyperlogic/tony/model-entity-render-fix 
Reading animation properties without an entityTree lock is considered harmful
 2016-04-08 10:37:17 -07:00
Zach Pomerantz
4e3ab73941 layout std140 in particle shader 2016-04-07 17:27:51 -07:00
Brad Hefta-Gaub
5287c174b4 Merge pull request #7605 from jherico/route_log_errors 
Fixing logging errors on initial load of controller routes
 2016-04-07 17:13:13 -07:00
Brad Hefta-Gaub
772e7b95f6 Merge pull request #7584 from zzmp/log/dep-is-set 
Avoid warning for expected unset PresentThread
 2016-04-07 14:47:56 -07:00
Brad Hefta-Gaub
e7d75cb22e Merge pull request #7573 from sethalves/update-collision-hulls-of-avatar-children 
Update collision hulls of avatar children
 2016-04-07 14:47:44 -07:00
Anthony J. Thibault
8f530ceaf9 Reading animation properties without an entityTree lock is considered harmful 
In RenderableModelEntityItem::update() make a copy of the _animationProperties, which is under the entityTree lock.
In RenderableModelEntityItem::render() read from the copy of _animationProperties when not under the entityTree lock.
 2016-04-07 13:42:40 -07:00
Brad Davis
4c78c0b330 Fix broken xbox controllers 2016-04-07 13:17:49 -07:00
Brad Hefta-Gaub
dc4751a95b Merge pull request #7595 from ZappoMan/depthReticleWork 
Fix a random case of the depth reticle hiding when it shouldn't
 2016-04-07 12:06:20 -07:00
Brad Davis
d8310cc6b1 Reduce controller log spam 2016-04-07 10:41:55 -07:00
Brad Davis
85019b2b5e Fixing logging errors on initial load of controller routes 2016-04-07 10:41:54 -07:00
Seth Alves
8158d34b20 Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children 2016-04-07 09:59:49 -07:00
Brad Hefta-Gaub
50a081db00 Merge pull request #7596 from jherico/texture_transfer_fix 
Move the texture transfer context back to the main thread for shutdown
 2016-04-07 09:31:42 -07:00
Brad Hefta-Gaub
ce1625b551 Merge pull request #7600 from sethalves/fix-entity-script-error-message 
attempt to make the failed-to-load-entity-script error-message be more helpful
 2016-04-07 09:17:04 -07:00
Brad Hefta-Gaub
94e797d752 Merge pull request #7585 from zzmp/log/failed-routes 
Log failed routes
 2016-04-07 09:16:26 -07:00
Brad Hefta-Gaub
7f164a7959 CR feedback 2016-04-07 08:42:40 -07:00
Brad Hefta-Gaub
986b4bea7c Merge pull request #7603 from zzmp/fix/entities-thread-crash 
Fix intermittent crash on exit
 2016-04-07 08:21:51 -07:00
Brad Hefta-Gaub
384ead8e4e Merge pull request #7599 from howard-stearns/restore-text3d-overlay 
Restore text3d overlay
 2016-04-07 08:21:28 -07:00
Brad Hefta-Gaub
cef599eaed Merge pull request #7586 from zzmp/log/failed-menu 
Log failed MenuUserData::forObject
 2016-04-06 19:44:05 -07:00
Brad Hefta-Gaub
cea622f6f1 Merge pull request #7571 from howard-stearns/sandbox-entity-includes 
Sandbox entity includes
 2016-04-06 19:11:25 -07:00
Brad Hefta-Gaub
4f1de77946 Merge pull request #7581 from birarda/suppress-more 
suppress a couple more noisy messages in AudioRingBuffer
 2016-04-06 19:08:23 -07:00
Clément Brisset
680ab1e38b Merge pull request #7578 from zzmp/fix/delete-resource-later 
Delete resource the Qt way
 2016-04-06 17:17:47 -07:00
Brad Hefta-Gaub
40e53baa79 Merge pull request #7597 from Atlante45/fix/script-sound-hold-strong-ref 
Fix audio injectors not working
 2016-04-06 16:57:29 -07:00
Seth Alves
5375fdd0f0 don't do simple kinematic simulation on things that have parents 2016-04-06 16:42:14 -07:00
Zach Pomerantz
06e827cb5e Guard against no script engine thread affinity 2016-04-06 15:41:13 -07:00
howard-stearns
f35c59ce5f Guard against meaningless query and fragment parts. 2016-04-06 15:21:43 -07:00
Zach Pomerantz
4300f2e415 Delete resource the Qt way 2016-04-06 14:43:48 -07:00
Seth Alves
672b4df7c1 get rid of magic number 2016-04-06 13:36:44 -07:00
Atlante45
6d1b7f1d37 Wrap sound script object to hold a strong ref 2016-04-06 13:04:18 -07:00
Seth Alves
21c2db7cdc attempt to make the failed-to-load-entity-script error-message be more helpful 2016-04-06 12:40:59 -07:00
howard-stearns
f60bb1faa5 Merge branch 'master' of https://github.com/highfidelity/hifi into restore-text3d-overlay 2016-04-06 12:16:19 -07:00
howard-stearns
5284af6b51 Update text3d shader post pbr. 2016-04-06 12:15:19 -07:00
Brad Davis
e194fc39f4 Move the texture transfer context back to the main thread for shutdown 2016-04-06 11:29:03 -07:00
Zach Pomerantz
1e710712cc Check entities scripting thread before signaling it 2016-04-06 11:19:07 -07:00
Seth Alves
d09d16082e Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children 2016-04-06 11:05:31 -07:00
Brad Hefta-Gaub
0f4e1e79fd Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-04-06 11:01:00 -07:00
Brad Hefta-Gaub
8c15116190 fix auto-hide logic in depthReticle 2016-04-06 11:00:43 -07:00
Brad Hefta-Gaub
e76a04951c Merge pull request #7582 from zzmp/fix/desktop-signal 
Fix showDesktop SIGNAL
 2016-04-06 08:29:26 -07:00
Brad Hefta-Gaub
5cf2906cd4 Merge pull request #7576 from hyperlogic/tony/show-collision-geometry-fixes 
Model: Toggling Physics > Draw Collision Hulls works again
 2016-04-05 17:50:19 -07:00
Brad Hefta-Gaub
891cc12d3f Merge pull request #7549 from zzmp/feat/resource-vis 
Add a visualization of cacheable resource usage
 2016-04-05 15:43:27 -07:00
Zach Pomerantz
37efeb7f29 Avoid warning for expected unset PresentThread 2016-04-05 14:59:59 -07:00
Zach Pomerantz
91126037e0 Fix showDesktop SIGNAL 2016-04-05 14:59:54 -07:00
Zach Pomerantz
6bcfeccdd8 Log failed MenuUserData::forObject 2016-04-05 14:59:52 -07:00
Zach Pomerantz
062760ff3b Log failed routes 2016-04-05 14:59:48 -07:00
Stephen Birarda
d536026ff4 suppress a couple more noisy messages in AudioRingBuffer 2016-04-05 14:44:20 -07:00
Anthony J. Thibault
1a4ae72270 Merge branch 'master' into tony/show-collision-geometry-fixes 2016-04-05 13:55:51 -07:00
howard-stearns
da4975e817 Merge branch 'master' of https://github.com/highfidelity/hifi into sandbox-entity-includes 2016-04-05 11:09:01 -07:00
Seth Alves
d5136f011c Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children 2016-04-05 11:08:38 -07:00
Anthony J. Thibault
6a7a572b53 Model: Toggling Physics > Draw Collision Hulls works again 
Collision renderItems were never getting removed when shouldShowCollisionHull became false.
 2016-04-05 11:06:24 -07:00