Commit graph

41456 commits

Author SHA1 Message Date
David Rowe
382b05e00b Make expand/collapse icon larger 2016-03-31 13:13:13 +13:00
David Rowe
4189f46156 Make input text color change to black when selected 2016-03-31 12:32:36 +13:00
David Rowe
ba43843340 Disable right-click context menu 2016-03-31 12:27:08 +13:00
David Rowe
870636832f Possible work-around for OSX font issues 2016-03-31 10:45:57 +13:00
David Rowe
3457d1c21e Entities list fixes
- Fix report of number of entities selected if have two selected
- Don't show yellow focus highlight on row when first click it
2016-03-31 09:16:31 +13:00
David Rowe
510d167c87 Merge branch 'master' into 20855 2016-03-31 08:43:35 +13:00
Brad Hefta-Gaub
b72c28854c Merge pull request #7510 from howard-stearns/end-audio-menu-pain
End audio devicer selection menu pain
2016-03-30 11:33:10 -07:00
Brad Hefta-Gaub
699b3a9dd7 Merge pull request #7499 from birarda/udt-fixes
fix an overflow in portable high resolution clock on windows
2016-03-30 10:54:00 -07:00
howard-stearns
37e6fce30b Disconnect menuItemEvent before setIsOptionChecked, and then reconnect. 2016-03-30 10:48:54 -07:00
Brad Hefta-Gaub
d99dcf5450 Merge pull request #7487 from hyperlogic/tony/animated-culling
Improved render bounding boxes for animated models
2016-03-30 09:27:43 -07:00
Brad Hefta-Gaub
6fdedb8f34 Merge pull request #7508 from howard-stearns/import-export-parents
Make export/import and copy/paste be parent/child-clean.
2016-03-30 09:06:33 -07:00
Brad Hefta-Gaub
c64b2bb236 Merge pull request #7495 from Atlante45/fix/audio-client
Fix crash in Audio Client
2016-03-30 09:00:07 -07:00
Brad Hefta-Gaub
32308c7810 Merge pull request #7501 from zzmp/fix/parse-tex
Respond to error from free in texture parsing
2016-03-30 08:53:15 -07:00
Brad Hefta-Gaub
15a042cef1 Merge pull request #7506 from zzmp/fix/gl-reset-pipelines
Fix ordering of GL backend state reset commands to Field key
2016-03-29 23:29:14 -07:00
David Rowe
0a83df2281 Fix textarea selection highlight 2016-03-30 19:25:45 +13:00
David Rowe
db72e3efbb Increase maximum window height 2016-03-30 19:22:34 +13:00
David Rowe
cfc5c36f05 Fix dropdowns 2016-03-30 19:16:04 +13:00
David Rowe
0b70da1581 Improve layout of scale controls 2016-03-30 19:02:28 +13:00
David Rowe
f4b9ffe26f Reorder sections 2016-03-30 18:07:45 +13:00
David Rowe
fdf45e0134 Use "-group" classification for section expand and collapse 2016-03-30 17:34:31 +13:00
David Rowe
1c5e414c15 Reinstate original property "-section" classifications 2016-03-30 16:10:32 +13:00
Brad Hefta-Gaub
92ddf9d7ac Merge pull request #7507 from AndrewMeadows/broken-time-machine
fix "deadlock" when setting clock backwards
2016-03-29 19:38:45 -07:00
Brad Hefta-Gaub
d63728bd55 Merge pull request #7502 from huffman/fix-asset-client
Fix bug where a pending asset request could receive a pending message after deletion
2016-03-29 18:15:03 -07:00
Brad Hefta-Gaub
8a47c5a35f Merge pull request #7504 from zzmp/log/building-web-surface
Log OffscreenQml lifetime
2016-03-29 18:11:16 -07:00
howard-stearns
5381be6902 Whitespace 2016-03-29 17:06:19 -07:00
howard-stearns
86a77d4f55 Remove unused/non-existent include. 2016-03-29 16:55:17 -07:00
howard-stearns
eef9de4d4f Remove obsolete remapIDs. 2016-03-29 16:28:02 -07:00
David Rowe
28d0fc677c Update UIT QML control 2016-03-30 12:19:26 +13:00
howard-stearns
4ebf816166 cleanup 2016-03-29 16:17:19 -07:00
David Rowe
1cb08952ae Merge branch 'master' into 20855
Conflicts:
	interface/resources/qml/ToolWindow.qml
2016-03-30 12:01:45 +13:00
Zach Pomerantz
6ae03fe72e Sync ordering of gl fields/reset commands 2016-03-29 15:52:29 -07:00
Zach Pomerantz
ad9027f9d6 Log OffscreenQml lifetime 2016-03-29 15:26:22 -07:00
Brad Hefta-Gaub
a9995a8790 Merge pull request #7500 from zzmp/fix/queue-model-geo-get
Update model URL on render thread
2016-03-29 15:21:46 -07:00
howard-stearns
bcb729eac2 Abstract out globalizeProperties. 2016-03-29 15:21:06 -07:00
Zach Pomerantz
6c7b6cd62e Return parsed tex directly as variant 2016-03-29 14:16:22 -07:00
howard-stearns
4a28dadae5 Working, but not cleaned up. 2016-03-29 13:26:50 -07:00
Stephen Birarda
b9ce427344 use c-style casts to respect the coding standard 2016-03-29 13:25:03 -07:00
Stephen Birarda
37950e9931 use explicit double casts for win_high_resolution_clock 2016-03-29 13:13:22 -07:00
Ryan Huffman
96a35a8f43 Fix bug where a pending asset request could receive a pending message after deletion 2016-03-29 11:33:02 -07:00
Zach Pomerantz
848e7703ee Test textures emptiness correctly 2016-03-29 10:50:27 -07:00
Anthony J. Thibault
a2c520a74a ModelOverlay: use a shared_ptr<Model> not a model member
This is necessary for shared_ptr and weak_ptr to work for Models contained within a ModelOverlay.
2016-03-29 10:47:26 -07:00
Zach Pomerantz
29dedd5524 Update model URL on render thread 2016-03-29 10:42:40 -07:00
Anthony J. Thibault
80dfed77d7 Fix for flickering eyeballs
Calling glm::axis() on an identity quaternion does not result in a normalized vector.
This vector was used within Rig::updateEyeJoint() to limit the rotation of the eye balls,
to prevent the eyes from rolling back into the avatar's head.

If the avatar was looking straight ahead, this could result in bad quaternions in the eye ball
joint matrices, which in turn would cause the eye ball mesh or any mesh influenced by the eyeball joints
not to render.
2016-03-29 10:01:10 -07:00
howard-stearns
3f18e0cd09 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-29 09:20:07 -07:00
Howard Stearns
5db1c33e4d kill offsets 2016-03-29 09:18:29 -07:00
Eric Levin
830d08c385 Merge pull request #7498 from Atlante45/fix/import-entities
Make svo loading use ResourceManager
2016-03-29 08:09:47 -07:00
David Rowe
d07cc82512 Color some buttons 2016-03-29 23:39:02 +13:00
David Rowe
791d3b0310 Fix styling of disabled form 2016-03-29 23:24:34 +13:00
David Rowe
252a48ed5b Miscellaneous fixes 2016-03-29 22:28:00 +13:00
David Rowe
ab37534e0d Restyle dropdowns 2016-03-29 20:14:08 +13:00