David Rowe
5a27d656c5
Potential OSX fix plus extra logging
2016-05-21 13:03:58 +12:00
David Rowe
17b3101ca5
Merge branch 'master' into 20917
2016-05-20 18:50:01 +12:00
David Rowe
b2bbf72be2
Replace drive drop-down plus text field with a paths drop-down
2016-05-20 18:48:51 +12:00
Brad Hefta-Gaub
a1ec6c2961
Merge pull request #7938 from sethalves/set-age-of-imported-to-zero
...
fix age of imported entities
2016-05-19 17:53:31 -07:00
Brad Hefta-Gaub
d521cd82a0
Merge pull request #7908 from Atlante45/fix/settings
...
fix settings getting reset
2016-05-19 17:53:15 -07:00
Brad Hefta-Gaub
8ff7af28be
Merge pull request #7925 from sethalves/overlay-or-grab-not-both
...
fix mouse-grab moving both an overlay and an entity at the same time
2016-05-19 17:38:32 -07:00
Brad Hefta-Gaub
f85d5d3ca8
Merge pull request #7935 from ZappoMan/fixLogSpam
...
reduce log spam
2016-05-19 17:38:16 -07:00
David Rowe
11aeaba114
Capitalize drive letter of chosen file
2016-05-20 11:32:14 +12:00
David Rowe
dac043a52d
Provide navigation up to the PC level to display drives in table
2016-05-20 10:49:38 +12:00
Brad Hefta-Gaub
cef4a49c35
Merge pull request #7867 from huffman/fix/query-octree-crash
...
Fix crash in JurisdictionMap
2016-05-19 11:53:54 -07:00
Brad Hefta-Gaub
ac15097f47
Merge pull request #7834 from huffman/feat/user-agent-plugins
...
Add system information to UserAgent in AccountManager requests
2016-05-19 11:53:14 -07:00
Clément Brisset
cddf587d6b
Merge pull request #7919 from zzmp/fix/osx-warnings
...
Fix OSX warnings
2016-05-19 11:11:30 -07:00
Seth Alves
7ea7bd3e1d
set created-time for imported entities to 'now'
2016-05-19 10:21:04 -07:00
samcake
d0c883f75a
Merge pull request #7923 from jherico/gpu_breakup2
...
breaking up OpenGL GPU backend
2016-05-19 10:02:42 -07:00
Brad Hefta-Gaub
232bd475df
Merge pull request #7927 from zzmp/fix/script-timer-crash
...
fix crash on shutdown from script timers
2016-05-19 09:52:04 -07:00
Seth Alves
6c3c9f45d1
Merge branch 'master' of github.com:highfidelity/hifi into overlay-or-grab-not-both
2016-05-19 09:48:50 -07:00
Brad Hefta-Gaub
53956c8210
reduce log spam
2016-05-19 07:50:06 -07:00
Brad Davis
7efcad38d2
PR feedback
2016-05-18 23:11:36 -07:00
David Rowe
41311bc3df
Finish decoupling FolderListModel
2016-05-19 17:13:07 +12:00
Brad Hefta-Gaub
ed3950c5d7
Merge pull request #7933 from Atlante45/remove-ac-avatar
...
fix floating AC Avatar at 0,0,0
2016-05-18 19:56:04 -07:00
David Rowe
585467094c
Sort files case-insensitively, directories first
2016-05-19 14:16:00 +12:00
Atlante45
917fe2ae6a
Give AC audio searcher invalid avatar URL
2016-05-18 19:10:59 -07:00
Seth Alves
94ef12507b
Merge pull request #7931 from zzmp/fix/unused-result
...
fix -Wunused-variable
2016-05-18 18:44:16 -07:00
Zach Pomerantz
87b102ae0f
Fix -Wunused-result from invokeResult
2016-05-18 18:19:44 -07:00
Brad Hefta-Gaub
e0fd968216
Merge pull request #7928 from zzmp/fix/assert-vrmenu
...
remove failed assertion in VrMenu
2016-05-18 17:49:50 -07:00
Zach Pomerantz
2c9b0f7233
Rm failing VrMenu assertion
2016-05-18 17:31:47 -07:00
Zach Pomerantz
8025a3f14c
Prevent crash from script timers on shutdown
2016-05-18 17:30:34 -07:00
David Rowe
862a88cf29
Insert an intermediary ListModel suitable for sorting and drives
2016-05-19 11:29:21 +12:00
Seth Alves
b4df7cada7
don't mouse-grab things through an overlay
2016-05-18 16:16:31 -07:00
Ryan Huffman
64c89a5dde
Fix AccountManager not compiling on Windows
2016-05-18 15:38:54 -07:00
Ryan Huffman
01944f5100
Remove unused DependencyManager include
2016-05-18 15:38:54 -07:00
Ryan Huffman
e622c17f6b
Pull default UserAgentGetter out of func signature
2016-05-18 15:38:54 -07:00
Ryan Huffman
79ce64aa3a
Fix compilation error in DomainServer.cpp
2016-05-18 15:38:54 -07:00
Ryan Huffman
ce6ae40432
Replace foreach use with for()
2016-05-18 15:38:54 -07:00
Ryan Huffman
bfb4bb0896
Add userAgentGetter to AccountManager for custom UserAgent
2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd
Make AccountManager a DependencyManager singleton
2016-05-18 15:38:54 -07:00
Ryan Huffman
cf49c8e2bf
Add getUserAgent function that includes plugin information
2016-05-18 15:35:29 -07:00
Ryan Huffman
1c5e1bb5ea
Merge pull request #7875 from imgntn/toyboxFixes
...
[Toybox] Fix utils paths
2016-05-18 14:58:27 -07:00
Brad Davis
e431fd3d65
Merge pull request #7921 from howard-stearns/turn-off-hand-controller-pointer-when-no-focus
...
turn off hand-controller pointer when Interface doesn't have focus
2016-05-18 14:45:35 -07:00
Brad Davis
3cc08cdcfc
Breaking up GL agnostic code from 4.1 specific code
2016-05-18 14:35:53 -07:00
David Rowe
551c669883
Move FolderListModel to be stand-alone
2016-05-19 09:24:15 +12:00
howard-stearns
fa90d823d5
Turn off hand-controller pointer when Interface doesn't have focus.
2016-05-18 11:49:12 -07:00
Brad Hefta-Gaub
335d9abddd
Merge pull request #7874 from AndrewMeadows/vertical-thrust
...
allow MyAvatar.addThrust() to raise avatar from standing on ground
2016-05-18 11:41:37 -07:00
Brad Hefta-Gaub
67891abf17
Merge pull request #7877 from Atlante45/fix/asset-client
...
Fix Asset Client crash
2016-05-18 11:37:34 -07:00
Atlante45
de36cd150e
Move runnings scripts setting storage
...
So that it doesn't conflict with the "Settings" menu setting
storage.
Running script would clear those settings while storing its data
This adds some backward compatible code to move the scripts
settings to the new location.
2016-05-18 11:36:14 -07:00
Atlante45
10c412d8c7
Fix settings getting reset
...
fixes bugzid:531
When a setting handle was created but never initialized/used, it
would override the current value with the default value on destruction.
2016-05-18 11:36:14 -07:00
Brad Hefta-Gaub
4df4829280
Merge pull request #7902 from jherico/gpu_breakup
...
moving GL backend out of GPU
2016-05-18 11:35:35 -07:00
Brad Hefta-Gaub
52445115dd
Merge pull request #7906 from howard-stearns/improve-hand-controller-edit
...
improve hand-controller edit
2016-05-18 11:35:00 -07:00
James B. Pollack
8026a5e7f0
fix utils paths
2016-05-18 10:30:43 -07:00
Brad Hefta-Gaub
9a3b6bf081
Merge pull request #7858 from Atlante45/remove-deprecated-entity-props
...
removed dead code for overlays/entities glow level
2016-05-18 09:14:26 -07:00
