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 |
|
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 |
|
Brad Hefta-Gaub
|
4b7a4e80ff
|
Merge pull request #7675 from samcake/orange
Fixing the Bump Map generating Normal Map path
|
2016-04-17 10:00:45 -07:00 |
|
David Rowe
|
8f6cfb72ea
|
Fix QML warnings at shutdown
|
2016-04-16 15:23:41 +12:00 |
|
Zach Pomerantz
|
f2b9acd84d
|
Rm Texture::createFromStorage
|
2016-04-15 16:40:05 -07:00 |
|
Zach Pomerantz
|
5c004e2a5c
|
Add comment on storage texture ptr
|
2016-04-15 16:40:04 -07:00 |
|
Chris Collins
|
7b49552066
|
Merge pull request #7677 from howard-stearns/RateCounter-adjustment
Don't truncate time when accumulating, and then divide by non-truncated.
|
2016-04-15 15:59:13 -07:00 |
|
Chris Collins
|
c0f4b8573c
|
Merge pull request #7673 from zzmp/fix/cache-tallies
Decrement cache tallies for uncached resources
|
2016-04-15 15:59:03 -07:00 |
|
Brad Hefta-Gaub
|
a7b5ea50d7
|
Merge pull request #7670 from hyperlogic/tony/validate-anim-state-handler-args
Validate arguments to MyAvatar.addAnimationStateHandler()
|
2016-04-15 14:26:22 -07:00 |
|
Anthony J. Thibault
|
38418d0169
|
Moved isListOfStrings into shared/ScriptValueUtils
Also fixed some single line ifs.
|
2016-04-15 13:47:30 -07:00 |
|
Howard Stearns
|
e4f8a67e60
|
Merge pull request #7649 from hyperlogic/tony/simplify-away-mode
away.js: fix for permanent disabling avatar IK
|
2016-04-15 13:35:14 -07:00 |
|
Zach Pomerantz
|
cff5886313
|
Use correct resources lock
|
2016-04-15 10:46:19 -07:00 |
|
Brad Hefta-Gaub
|
6a12425a2a
|
Merge pull request #7669 from sethalves/not-away-if-walking
clear away-ness if the avatar walks a certain distance
|
2016-04-15 10:25:40 -07:00 |
|
Brad Hefta-Gaub
|
50856b715e
|
Merge pull request #7674 from zzmp/leak/font
Change Font to use shared_ptr instead of freeing on _exit
|
2016-04-15 10:25:09 -07:00 |
|
Brad Hefta-Gaub
|
a88cd4b786
|
Merge pull request #7671 from AndrewMeadows/link-pthread
add pthread link dependency to interface for UNIX
|
2016-04-15 10:24:31 -07:00 |
|
howard-stearns
|
089e7eb6b3
|
Don't truncate time when accumulating, and then divide by non-truncated.
|
2016-04-15 10:17:57 -07:00 |
|
samcake
|
fc29397d91
|
Clening up from review comments
|
2016-04-15 10:10:04 -07:00 |
|
samcake
|
920ab88ef3
|
remove a debug code
|
2016-04-15 01:00:57 -07:00 |
|
samcake
|
637da18e5c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-04-15 00:42:15 -07:00 |
|
samcake
|
30d0bfcfd3
|
FIxing the bump map loading which got broken in the past PR, fixed a double call to the glTexSUbIMage function and fixed a texel.Format
|
2016-04-15 00:41:37 -07:00 |
|
Zach Pomerantz
|
fc9de4b7e6
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/cache-tallies
|
2016-04-15 00:37:03 -07:00 |
|
Brad Hefta-Gaub
|
3e03f85f07
|
Merge pull request #7650 from Atlante45/fix/clear-atp-cache
Clear atp mapping cache between domain
|
2016-04-14 18:44:20 -07:00 |
|
Brad Hefta-Gaub
|
f4604e300b
|
Merge pull request #7666 from birarda/interface-name-osx
rename .app on OS X to Interface
|
2016-04-14 18:44:07 -07:00 |
|
samcake
|
a9fefcc802
|
Trying ti debug the bad normal maps
|
2016-04-14 18:16:14 -07:00 |
|
Brad Hefta-Gaub
|
21f30f1a10
|
Merge pull request #7672 from zzmp/fix/name-caches
Name exposed cache objects
|
2016-04-14 18:02:36 -07:00 |
|
Atlante45
|
b3b2f98f6c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/clear-atp-cache
|
2016-04-14 17:59:36 -07:00 |
|
Zach Pomerantz
|
f803ecd2e7
|
Merge pull request #7633 from Atlante45/fix/shared-resource
Fix raw pointers in shared resource cache items
|
2016-04-14 17:52:04 -07:00 |
|
Atlante45
|
4ed8573f74
|
CR
|
2016-04-14 17:28:24 -07:00 |
|
Zach Pomerantz
|
2e4e1dd590
|
Fix leaking Font
|
2016-04-14 17:00:23 -07:00 |
|
Zach Pomerantz
|
32e9c49cf0
|
Fix cache tallies for uncached resources
|
2016-04-14 17:00:20 -07:00 |
|
Zach Pomerantz
|
bb02af793c
|
Name exposed cache objects
|
2016-04-14 17:00:18 -07:00 |
|
Andrew Meadows
|
ae20bb5fa7
|
add pthread link dependency to interfac for UNIX
|
2016-04-14 16:35:51 -07:00 |
|
Anthony J. Thibault
|
253e4cbb73
|
validate arguments to MyAvatar.addAnimationStateHandler()
Also validate arguments to MyAvatar.removeAnimationStateHandler() and the return result from the user provided callback function.
|
2016-04-14 16:25:17 -07:00 |
|
Seth Alves
|
31270ebe6e
|
clear away-ness if the avatar walks a certain distance
|
2016-04-14 16:03:22 -07:00 |
|
Brad Hefta-Gaub
|
91334d6a39
|
Merge pull request #7664 from ZappoMan/reduceJointProperties
only export joint values if they've been explicitly set by scripts
|
2016-04-14 15:30:04 -07:00 |
|
Andrew Meadows
|
a263091c94
|
fix entity-server crash for out of bounds
|
2016-04-14 15:23:14 -07:00 |
|
Seth Alves
|
50c8b5858e
|
Merge pull request #7668 from birarda/ice-server-redundancy
reduce ice.highfidelity.com DNS queries when not failing
|
2016-04-14 15:05:58 -07:00 |
|
Stephen Birarda
|
84df6cfed0
|
only re-request ice addresses during failure
|
2016-04-14 14:46:08 -07:00 |
|
Seth Alves
|
f114888c1c
|
Merge pull request #7665 from birarda/ice-server-redundancy
allow domain-server to cycle through ice-servers when failing
|
2016-04-14 14:36:29 -07:00 |
|
Stephen Birarda
|
9bca2309e0
|
remove the monitoring endpoint debug
|
2016-04-14 13:58:02 -07:00 |
|
Stephen Birarda
|
7385894b66
|
keep a set of pending public key requests
|
2016-04-14 13:57:09 -07:00 |
|
Stephen Birarda
|
757c7dcf29
|
removing HTTP health check from ice-server
|
2016-04-14 13:40:13 -07:00 |
|
Stephen Birarda
|
7e02b30227
|
rename .app on OS X to Interface
|
2016-04-14 13:01:47 -07:00 |
|
Stephen Birarda
|
bc0b3b38b3
|
remove narrowing conversion for ICE_SERVER_DEFAULT_PORT
|
2016-04-14 12:25:47 -07:00 |
|
Brad Hefta-Gaub
|
ea4da05cba
|
Merge pull request #7643 from AndrewMeadows/faster-bullet
faster Bullet kinematics
|
2016-04-14 12:16:54 -07:00 |
|
Brad Hefta-Gaub
|
c9b0531f55
|
Merge pull request #7662 from zzmp/fix/model-anim-cache
Use AnimationCache for models
|
2016-04-14 12:16:32 -07:00 |
|
Brad Hefta-Gaub
|
1fc540c775
|
Merge pull request #7639 from huffman/feat/crash-handling
Improve crash handling
|
2016-04-14 11:40:56 -07:00 |
|