Commit graph

42784 commits

Author SHA1 Message Date
Seth Alves
3298883774 Merge pull request #7702 from zzmp/fix/clear-octree-on-exit
Clear entities and avatars on exit
2016-04-18 15:48:35 -07:00
Seth Alves
70ddd8529b Merge pull request #7684 from zzmp/fix/runaway-loading-resources
Fix ResourceCacheSharedItems::_loadingRequests removals
2016-04-18 15:46:45 -07:00
Brad Hefta-Gaub
d5891e9073 remove abortEvaluation() since it has no effect for the test cases and might cause unexpected side effects 2016-04-18 15:28:33 -07:00
Anthony J. Thibault
279e77f523 updated comment 2016-04-18 15:18:08 -07:00
samcake
dccf549118 Merge pull request #7676 from jherico/perf_testing
Manually generate mipmaps for textures while loading
2016-04-18 15:09:12 -07:00
Brad Hefta-Gaub
c3a86f46d0 change the timeout to an interval so it constantly runs 2016-04-18 14:55:23 -07:00
samcake
ca720efce6 Exposing the timing of the jobs by default 2016-04-18 14:53:06 -07:00
Zach Pomerantz
146ea066db Update AvatarManager.cpp 2016-04-18 14:53:04 -07:00
Anthony J. Thibault
544928b46e MyAvatar: fix for laggy avatar attachments 2016-04-18 14:51:33 -07:00
Zach Pomerantz
c9dc642d76 Fix type in AvatarManager::clearAllAvatars 2016-04-18 14:48:24 -07:00
Zach Pomerantz
c87eec4182 Fix typo in AvatarManager::clearAllAvatars 2016-04-18 14:45:33 -07:00
Zach Pomerantz
790e325248 Clear entities and avatars on exit 2016-04-18 14:31:16 -07:00
Seth Alves
65f51322fa Merge pull request #7700 from Atlante45/fix/cleanup-iodevice
Cleanup disk cache io device
2016-04-18 14:28:41 -07:00
Zach Pomerantz
62c252e8ef Set GL in QML immediately 2016-04-18 14:23:23 -07:00
Stephen Birarda
9cce964013 use nextPacketTimestamp only to catch up, not stay ahead 2016-04-18 14:19:36 -07:00
Atlante45
c9fa91936a Cleanup disk cache io device 2016-04-18 14:10:51 -07:00
Seth Alves
4bf98a80b9 Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash
fix entity-server crash when entity moves out of bounds
2016-04-18 14:09:21 -07:00
Brad Hefta-Gaub
ab7f3d5739 change the timeout to an interval so it constantly runs 2016-04-18 13:58:40 -07:00
Brad Hefta-Gaub
d6fa58c39c add an example script 2016-04-18 13:42:58 -07:00
Anthony J. Thibault
1f383680aa Rig: removed unnecessary emitOnLoadComplete method 2016-04-18 13:35:13 -07:00
Brad Hefta-Gaub
24003840df add an example script 2016-04-18 13:33:08 -07:00
Brad Hefta-Gaub
6ac173d197 add an example script 2016-04-18 13:27:05 -07:00
Anthony J. Thibault
dc92ccc2b2 MyAvatar: Removed unnecessary slot. 2016-04-18 13:19:49 -07:00
Brad Hefta-Gaub
bf8cdabd1b CR feedback 2016-04-18 12:50:29 -07:00
Brad Hefta-Gaub
55010cebb7 remove unhelpful comment 2016-04-18 12:43:32 -07:00
Brad Hefta-Gaub
9e13b1bbae more CR feedback 2016-04-18 12:25:46 -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
samcake
3887dfdf34 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-18 11:52:45 -07:00
Omega Hereon [J.L.]
d5cad1d53c Merge branch 'gcc53' of https://github.com/OmegaHeron/hifi into gcc53 2016-04-18 18:46:03 +00:00
samcake
0ae54b9abc Typo 2016-04-18 11:45:48 -07:00
Omega Hereon [J.L.]
b3b58b8176 Fix instances of error: isnan was not declared in this scope with GCC5.3/Ubuntu 16.04
In all but these 3 files isnan is glm::isnan
2016-04-18 18:45:15 +00:00
Anthony J. Thibault
f15bc7b99a Added script to disable avatar animations, but not IK. 2016-04-18 11:41:28 -07:00
Brad Hefta-Gaub
c26115cf2e one small tweak 2016-04-18 11:40:17 -07:00
Omega Hereon [J.L.]
9f1ba5d617 Fixes instancs error: isnan was not declared in this scope with GCC5.3/Ubuntu 16.04
In all but these 3 files isnan is glm::isnan
2016-04-18 18:38:52 +00:00
Anthony J. Thibault
1682598be7 Added onLoadComplete signal to MyAvatar
This can be used in javaScript to detect when the model has finished loading because the url has changed or the model has been reset.
2016-04-18 11:37:02 -07:00
Brad Hefta-Gaub
1c111e20bd fix possible thread issue with Entities.callEntityMethod() 2016-04-18 11:20:26 -07:00
samcake
d746fba142 Cleaning up the stats.qml 2016-04-18 11:18:28 -07:00
samcake
88c58cc276 Adding the simple state sort to draw opaque deferred 2016-04-18 10:51:31 -07:00
Brad Hefta-Gaub
47900df3e7 cleanup 2016-04-18 10:43:08 -07:00
Brad Hefta-Gaub
f6c75d0530 cleanup 2016-04-18 10:41:54 -07:00
Omega Hereon [J.L.]
8db8d1e31d Merge remote-tracking branch 'upstream/master' 2016-04-18 17:40:44 +00:00
Brad Hefta-Gaub
0520363da8 cleanup 2016-04-18 10:37:15 -07:00
Ryan Huffman
37469f16c8 Fix string interpolation in installer 2016-04-18 10:31:12 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Seth Alves
b943a664b6 Merge pull request #7691 from ctrlaltdavid/20886
Fix QML warnings at shutdown
2016-04-18 10:26:09 -07:00
Seth Alves
dea748d132 Merge pull request #7683 from zzmp/clean/texture
Remove unused static method gpu::Texture
2016-04-18 10:25:53 -07:00
Ryan Huffman
a4b7e54e4d Update installer to use variables for display names 2016-04-18 10:16:06 -07:00
Brad Hefta-Gaub
a4f562672a cleanup 2016-04-18 10:08:33 -07:00
Ryan Huffman
f72a760151 Fix application names in installer prompt 2016-04-18 09:54:39 -07:00