Commit graph

41995 commits

Author SHA1 Message Date
David Rowe
c7f5b356bb Fix entity not being highlighted in list when created 2016-04-15 17:18:04 +12:00
David Rowe
f9a442264e Fix count of entities found when delete all entities in search radius 2016-04-15 16:58:26 +12:00
David Rowe
b5ec53f94e Fix entity list column widths when no entities listed 2016-04-15 16:52:21 +12:00
David Rowe
bda2f455e5 Add buttons to entities list that toggle locked and visible 2016-04-15 16:26:34 +12:00
David Rowe
f28b37481f Fix only entity name being updated in entity list after an edit 2016-04-15 13:24:49 +12:00
David Rowe
58f1bde752 Add "locked" and "visible" columns to entity list 2016-04-15 11:00:55 +12:00
David Rowe
08dd5c54c1 Keep entity list headings stationary over sort column changes 2016-04-14 15:47:11 +12:00
David Rowe
6e4c1a5a43 Left align number fields in rows 2016-04-14 15:28:51 +12:00
David Rowe
33d9909684 Disable drop-downs and color pickers when other controls are disabled 2016-04-14 13:21:25 +12:00
David Rowe
67b9c76643 Reorder spatial section fields 2016-04-14 09:56:36 +12:00
David Rowe
e8f627e3fe Add "lock" and "visible" icons to checkboxes in entity properties tab 2016-04-13 17:09:10 +12:00
David Rowe
9e2c844dc0 Updated the HiFi glyphs font file
Used the new "model" icon in entity properties tab.
2016-04-13 16:48:13 +12:00
David Rowe
43f843f731 Retrofit updated margins and spacing to QML dialogs 2016-04-13 16:39:52 +12:00
David Rowe
b33d28852b Merge branch 'master' into 20872 2016-04-13 13:11:26 +12: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
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
David Rowe
f7f5443a44 Merge branch 'master' into 20872
Conflicts:
	examples/html/entityProperties.html
2016-04-12 15:40:35 +12:00
David Rowe
d6fcbd2dac Revisit margins and spacing 2016-04-12 15:07:30 +12: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
1df2fc7809 Disable qml gradient for AMD for ContentSection 2016-04-11 13:59:08 -07:00
David Rowe
43de32e7ce Increasing left/right padding of button text 2016-04-12 08:57:36 +12: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
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