Brad Hefta-Gaub
|
0af47fd3d5
|
Merge pull request #7617 from jherico/vr_menu
VR menu fixes
|
2016-04-13 13:53:36 -07:00 |
|
Zach Pomerantz
|
dbd7dd104e
|
Merge pull request #7654 from ZappoMan/newLODSettings
new default LOD settings, and support for reset settings without crashing
|
2016-04-13 13:09:10 -07:00 |
|
Brad Hefta-Gaub
|
1c2c6804ac
|
Merge pull request #7656 from samcake/orange
Fixing the resize of gpu::framebuffer to avoid unecessary re validation every frame
|
2016-04-13 12:34:47 -07:00 |
|
samcake
|
7653fa2c37
|
Fixing the resize of framebuffer to avoid reassigning the render buffer every frame
|
2016-04-13 10:56:29 -07:00 |
|
Brad Hefta-Gaub
|
93f8cfc80a
|
new default LOD settings, and support for reset settings without crashing
|
2016-04-13 09:26:01 -07:00 |
|
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 |
|
Zach Pomerantz
|
bce33a7157
|
Merge pull request #7651 from imgntn/editmodelsurl
Remove model url placeholder text from edit.js import
|
2016-04-12 17:50:45 -07:00 |
|
Howard Stearns
|
e5a55ed9e5
|
Merge pull request #7616 from PhilipRosedale/golfclub
Simple golfclub that makes and jumps to balls
|
2016-04-12 17:45:34 -07:00 |
|
James B. Pollack
|
ab7f8f27fe
|
clear stuff from edit
|
2016-04-12 16:22:53 -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
|
b952147fca
|
Merge pull request #7635 from birarda/master
fix domain-server settings change without password change
|
2016-04-12 12:49:55 -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
|
0980ab5c2d
|
Merge pull request #7634 from birarda/asset-server-clean
cleanup unmapped asset server files
|
2016-04-12 11:59:41 -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 |
|
Brad Davis
|
dfc1d896cd
|
Fix shutdown crash
|
2016-04-12 11:49:55 -07:00 |
|
Brad Davis
|
4b02e8437c
|
Fix menu items created by plugins
|
2016-04-12 11:15:06 -07:00 |
|
Brad Davis
|
3349093908
|
Fix vr menu login item update
|
2016-04-12 11:15:06 -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 |
|
Stephen Birarda
|
455d2d5048
|
allow for an empty password with a username
|
2016-04-12 09:37:26 -07:00 |
|
Brad Hefta-Gaub
|
83494c4a96
|
Merge pull request #7594 from huffman/feat/include-rolled-logs-bugsplat
Add rolled log files to BugSplat
|
2016-04-12 08:33:17 -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
|
a1fe6aee6d
|
Merge pull request #7625 from hyperlogic/tony/third-person-hmd-camera-improvements
Improve comfort of third-person HMD camera.
|
2016-04-12 08:32:23 -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 |
|
Stephen Birarda
|
76af3efe73
|
fix for active socket check on ATP script download
|
2016-04-11 17:59:27 -07:00 |
|
Stephen Birarda
|
190d11e0bf
|
rename the set of hashes to check for deletion
|
2016-04-11 17:16:52 -07:00 |
|
Stephen Birarda
|
026f58c866
|
don't perform asset cleanup if mapping file load fails
|
2016-04-11 17:14:31 -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
|
1df2fc7809
|
Disable qml gradient for AMD for ContentSection
|
2016-04-11 13:59:08 -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 |
|
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 |
|