Brad Hefta-Gaub
0f8842f582
Merge pull request #7637 from zzmp/fix/tex-transfer-free
...
Cleanly shutdown the texture transfer thread on quit
2016-04-12 19:28:51 -07:00
Brad Hefta-Gaub
88ca5520be
Merge pull request #7647 from jherico/rate_counter
...
Fixing rate counter
2016-04-12 14:48:05 -07:00
Brad Davis
9f2eabe6ce
Fixing rate counter
2016-04-12 14:11:56 -07:00
Seth Alves
2b63c2a8ba
Merge pull request #7641 from hyperlogic/tony/macos-cpuid-fix
...
Rename CPUID to CPUIdent to fix XCode 7.2 builds
2016-04-12 12:48:15 -07:00
Seth Alves
460fdc0761
Merge pull request #7536 from samcake/orange
...
First pass at using compressed format when uploading textures
2016-04-12 11:59:10 -07:00
Anthony J. Thibault
32ccc1d68e
Windows build fixes
2016-04-12 10:53:04 -07:00
Chris Collins
0faab41057
Merge pull request #7624 from birarda/new-home-set
...
allow ATP scripts to be used by scripted Agent
2016-04-12 09:42:14 -07:00
Brad Hefta-Gaub
3f05ded932
Merge pull request #7611 from zzmp/guard/amd
...
Disable gradient QML items on AMD
2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub
ad8d7b2ffa
Merge pull request #7620 from sethalves/make-fixupMissingParents-more-thread-safe
...
guard access to _missingParent vector with a lock
2016-04-12 08:32:38 -07:00
Brad Hefta-Gaub
9a687bea44
Merge pull request #7628 from jherico/save_scripts
...
Save the set of running scripts when they change, as well as at shutdown
2016-04-12 08:32:10 -07:00
Brad Hefta-Gaub
c5840f217a
Merge pull request #7630 from jherico/fps_fix
...
Fix FPS counter
2016-04-12 08:31:58 -07:00
Zach Pomerantz
c72a5f3605
Exit cleanly in debug with GL logger
2016-04-11 16:32:55 -07:00
Zach Pomerantz
666bf8d42b
Reset GL tex canvas while still running
2016-04-11 14:04:34 -07:00
Zach Pomerantz
ab72d8d8fb
Init QML GL from share context
2016-04-11 13:47:45 -07:00
Zach Pomerantz
52958ffc70
Move gl info queries to GLHelpers
2016-04-11 13:28:18 -07:00
Zach Pomerantz
1b7256d344
Clean shutdown for Texture Transfer thread
2016-04-11 12:59:53 -07:00
Anthony J. Thibault
470aac3acf
Rename CPUID to CPUIdent to fix XCode 7.2 builds
2016-04-11 11:54:17 -07:00
Seth Alves
1d63f6d354
Merge branch 'master' of github.com:highfidelity/hifi into make-fixupMissingParents-more-thread-safe
2016-04-11 09:58:08 -07:00
Brad Hefta-Gaub
b758acb7d8
Merge pull request #7610 from zzmp/fix/standard-qt-gl
...
Codify qt qml version in one header
2016-04-11 09:45:21 -07:00
Brad Hefta-Gaub
47ff5c090d
Merge pull request #7623 from ZappoMan/fixAnimationFrameExport
...
fix export of animation properties
2016-04-11 09:37:47 -07:00
Brad Hefta-Gaub
a204b9d923
Merge pull request #7627 from jherico/qml_key_interaction
...
Suppress key release events for presses that were absorbed by QML
2016-04-11 09:31:46 -07:00
Brad Davis
df8ad57185
Fix FPS counter
2016-04-11 00:25:16 -07:00
Brad Hefta-Gaub
cc418c615f
Merge pull request #7631 from sethalves/parent-equipping-and-platform-hack
...
treat children of avatars and children of entities differently until velocity handling is fixed
2016-04-10 14:55:03 -07:00
Seth Alves
43f735dd21
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
2016-04-09 22:18:43 -07:00
Brad Davis
5a5583d3a5
PR comments
2016-04-09 21:43:50 -07:00
Seth Alves
2aa3e5d418
re-enabled EntityItem::simulateKinematicMotion for things with parents
2016-04-09 09:06:18 -07:00
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
7827c0f6f6
Suppress key release events for presses that were absorbed by QML
2016-04-08 17:09:11 -07:00
Brad Hefta-Gaub
f1f8fd8a24
fix export of animation properties
2016-04-08 14:40:06 -07:00
Stephen Birarda
1df0dce971
use ResourceRequest in Agent to handle ATP scripts
2016-04-08 14:38:26 -07:00
Seth Alves
95f446183f
use for loop rather than iterator
2016-04-08 13:32:33 -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
Seth Alves
6088612ce0
guard access to _missingParent vector with a lock to allow safe access from multiple threads
2016-04-08 13:16:30 -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
samcake
ef70d41cf4
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-04-08 09:41:35 -07:00
samcake
4374bd26ae
Disabling COmpression
2016-04-08 01:37:27 -07:00
samcake
be178e9e09
fixing warnings
2016-04-07 23:44:28 -07:00
samcake
04e71df3bc
fixing a stupid code and a warning
2016-04-07 23:05:50 -07:00
samcake
76dd740578
Cleaning up to test before merge, not solved the stuttering happening when using compressed textures. cleaned up a bit of the TextureMap doanload callbacks
2016-04-07 20:05:05 -07:00
Zach Pomerantz
e08c9db469
Expose GL property to QML
2016-04-07 18:27:07 -07:00
Zach Pomerantz
be489e8728
Codify qt qml version in one header
2016-04-07 17:35:31 -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
