samcake
|
a997f9bb1b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-04-19 10:49:53 -07:00 |
|
samcake
|
1a154bb3be
|
Revert the changes to use SSAO AND 2 buffers
|
2016-04-19 10:47:54 -07:00 |
|
Zach Pomerantz
|
fc61f85bf9
|
Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback
Added MyAvatar onLoadComplete Callback
|
2016-04-19 10:36:20 -07:00 |
|
samcake
|
265f6f1275
|
Updating & Merging with master
|
2016-04-19 10:05:44 -07:00 |
|
Brad Hefta-Gaub
|
5d550197bd
|
Merge pull request #7697 from samcake/orange
Introduce a simple state sort for drawing opaque items
|
2016-04-19 08:41:49 -07:00 |
|
Brad Hefta-Gaub
|
d16750c590
|
Merge pull request #7681 from hyperlogic/tony/character-controller-leak-fix
Memory leak on exit for CharacterController
|
2016-04-19 07:51:08 -07:00 |
|
Brad Hefta-Gaub
|
c41b320d40
|
Merge pull request #7706 from zzmp/fix/text3d-font
Fix text3d to allow transparent text
|
2016-04-19 07:50:36 -07:00 |
|
Brad Hefta-Gaub
|
b0f3b24caa
|
Merge pull request #7699 from OmegaHeron/gcc53
Gcc53
|
2016-04-19 07:34:24 -07:00 |
|
Brad Hefta-Gaub
|
8f19eba5c2
|
Merge pull request #7685 from zzmp/debug/sub
Add sub to Debug Counter
|
2016-04-19 07:27:49 -07:00 |
|
Brad Hefta-Gaub
|
523d365ce7
|
Merge pull request #7680 from Atlante45/fix/clear-atp-cache
Don't use invalidated iterators
|
2016-04-19 07:24:07 -07:00 |
|
Brad Hefta-Gaub
|
2780ade3bd
|
Merge pull request #7686 from zzmp/clean/bufferview
Consolidate BufferView ctors to cpp
|
2016-04-19 07:21:57 -07:00 |
|
Brad Hefta-Gaub
|
49e0a649e9
|
Merge pull request #7695 from huffman/fix/installer-prompt-name
Fix application names in installer prompt
|
2016-04-19 07:20:21 -07:00 |
|
Brad Hefta-Gaub
|
8eff47f922
|
Merge pull request #7705 from hyperlogic/tony/avatar-attachment-lag-fix
Fix for laggy avatar attachments
|
2016-04-19 07:15:38 -07:00 |
|
Anthony Thibault
|
4708cc9400
|
Added license to disableAvatarAnimations.js
|
2016-04-18 19:42:05 -07:00 |
|
Omega Hereon [J.L.]
|
647e991b05
|
Merge remote-tracking branch 'upstream/master' into gcc53
|
2016-04-19 01:14:00 +00:00 |
|
Brad Hefta-Gaub
|
a572ac31dc
|
Merge pull request #7704 from samcake/lemon
Exposing the CPU TIming of the Render Jobs to the JS API
|
2016-04-18 18:12:14 -07:00 |
|
Omega Hereon [J.L.]
|
64f6a59bb3
|
Merge remote-tracking branch 'upstream/master' into gcc53
|
2016-04-19 01:11:35 +00:00 |
|
Brad Hefta-Gaub
|
0ac9601ea7
|
Merge pull request #7690 from ZappoMan/improveHMD
Introduce "recommended overlay rectangle" to display plugins
|
2016-04-18 18:04:21 -07:00 |
|
Brad Hefta-Gaub
|
5ae1e70197
|
Merge pull request #7689 from hyperlogic/tony/jasmine-avatar-unit-tests
Added avatar unit tests
|
2016-04-18 18:03:29 -07:00 |
|
Brad Hefta-Gaub
|
0a79b5dd69
|
Merge pull request #7707 from huffman/fix/osx-default-script-dir
Remove fix for old QT file path bug in OSX
|
2016-04-18 18:01:47 -07:00 |
|
Brad Hefta-Gaub
|
0e9bd9a776
|
Merge pull request #7682 from zzmp/clean/stars
Cleanup stars to persist a single BufferView
|
2016-04-18 17:59:48 -07:00 |
|
Brad Hefta-Gaub
|
f5cddc9962
|
fix the bug that Omega found
|
2016-04-18 17:26:12 -07:00 |
|
samcake
|
9087de22bd
|
Fixing the extra spaces
|
2016-04-18 16:10:11 -07:00 |
|
Ryan Huffman
|
4e0ac2a4be
|
Remove fix for old QT file path bug in OSX
|
2016-04-18 16:07:53 -07:00 |
|
Zach Pomerantz
|
2d9dcc8595
|
Fix text3d to allow transparent text
|
2016-04-18 16:02:45 -07:00 |
|
Brad Hefta-Gaub
|
01907f181f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
|
2016-04-18 16:01:42 -07:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Anthony J. Thibault
|
1f383680aa
|
Rig: removed unnecessary emitOnLoadComplete method
|
2016-04-18 13:35:13 -07:00 |
|
Anthony J. Thibault
|
dc92ccc2b2
|
MyAvatar: Removed unnecessary slot.
|
2016-04-18 13:19:49 -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 |
|
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 |
|
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 |
|