James B. Pollack
d1001cfe4a
cleanup
2016-04-11 14:47:13 -07:00
Ryan Huffman
afe502e1d2
Fix typo
2016-04-11 14:43:05 -07:00
Ryan Huffman
02a17c4497
Fix commented out code
2016-04-11 14:38:29 -07:00
Ryan Huffman
9faeb13ae9
Remove error testing code
2016-04-11 14:38:19 -07:00
Ryan Huffman
63aee23bf1
Move crash testing to CrashHelpers.h
2016-04-11 14:29:16 -07:00
Zach Pomerantz
666bf8d42b
Reset GL tex canvas while still running
2016-04-11 14:04:34 -07:00
Zach Pomerantz
1df2fc7809
Disable qml gradient for AMD for ContentSection
2016-04-11 13:59:08 -07:00
Ryan Huffman
316d533d19
Update crash reporting to cover a larger area
2016-04-11 13:50:42 -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
James B. Pollack
2052b617b3
fix name for tilt maze ball
2016-04-11 13:07:16 -07:00
Zach Pomerantz
1b7256d344
Clean shutdown for Texture Transfer thread
2016-04-11 12:59:53 -07:00
Stephen Birarda
aad98cc25d
make sure password setting is set before checking length
2016-04-11 11:56:47 -07:00
Anthony J. Thibault
470aac3acf
Rename CPUID to CPUIdent to fix XCode 7.2 builds
2016-04-11 11:54:17 -07:00
Zach Pomerantz
d719b3692e
Consolidate qml alpha gradient workaround to desktop
2016-04-11 11:36:42 -07:00
Philip Rosedale
aab93d8a26
fixes per code review
2016-04-11 10:46:22 -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
94f970dd89
Merge pull request #7622 from hyperlogic/tony/frozen-avatar-fix
...
Fix for frozen ghost avatars
2016-04-11 09:37:30 -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
Stephen Birarda
334dc3cb6c
cleanup left file debug, add check for deleted mapping
2016-04-11 09:05:11 -07:00
Stephen Birarda
775898893b
add deletion of unmapped files during delete op
2016-04-11 08:57:07 -07:00
Stephen Birarda
fae9b061a3
promote a debug to info
2016-04-11 08:42:52 -07:00
Stephen Birarda
4d0976f730
remove migration code for pre-mapping migrations
2016-04-11 08:41:42 -07:00
Brad Davis
df8ad57185
Fix FPS counter
2016-04-11 00:25:16 -07:00
James B. Pollack
ee210c5038
cleanup
2016-04-10 16:42:00 -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
James B. Pollack
02f69607d7
Merge remote-tracking branch 'upstream/master' into homereset
2016-04-10 11:23:16 -07:00
James B. Pollack
f5f603f56e
update cuckoo clock lock
2016-04-10 11:13:33 -07:00
James B. Pollack
6781a7cb91
add headers, add virtual baton, try another way of disabling grab while trigger already held when using music box
2016-04-10 11:08:27 -07:00
Andrew Meadows
013f575cc9
Merge pull request #7632 from sethalves/fix-physics-feedback-loop
...
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
2016-04-10 10:40:09 -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
c5b5746646
Save the set of running scripts when they change, as well as at shutdown
2016-04-08 17:29:54 -07:00
James B. Pollack
d849154466
try to lock cuckoo
2016-04-08 17:26:38 -07:00
James B. Pollack
ce670fbd21
fans, avatars, desk lamp, reset script
2016-04-08 17:22:35 -07:00
Brad Davis
7827c0f6f6
Suppress key release events for presses that were absorbed by QML
2016-04-08 17:09:11 -07:00
Stephen Birarda
bf3324fc6b
hold download of ATP script if Asset Server isn't ready
2016-04-08 15:28:12 -07:00
Anthony J. Thibault
93a5bdd79a
Prevent avatar rotation due to HMD head turning in third-person camera.
...
Also, fix one frame glitch during snap turning, by updating the sensorToWorld matrix
after the MyAvatar::updateOrientation rotates the avatar, but before we perform IK.
2016-04-08 15:27:43 -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
Brad Davis
b87e8220c4
Merge pull request #7619 from imgntn/noRefresh
...
Remove refresh feature from edit.js for now
2016-04-08 13:35:17 -07:00
Seth Alves
95f446183f
use for loop rather than iterator
2016-04-08 13:32:33 -07:00
Brad Davis
2353daa254
Merge pull request #7614 from ctrlaltdavid/20876
...
Disable arrow keys being able to move between HTML form fields
2016-04-08 13:28:30 -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
Anthony J. Thibault
711a1b8c7d
Avatar: update renderItems when avatar position or render mesh is in the frustum.
...
Previously, when render mesh was visible the renderItems they were not updated with the latest avatar mixer joints rotations and position.
This would result in a frozen avatar being visible.
Now the renderItems are updated when the render mesh is in the frustum or the bounding sphere around the avatar position is visible.
2016-04-08 13:14:50 -07:00
