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
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
David Rowe
41311bc3df
Finish decoupling FolderListModel
2016-05-19 17:13:07 +12:00
David Rowe
585467094c
Sort files case-insensitively, directories first
2016-05-19 14:16:00 +12:00
David Rowe
862a88cf29
Insert an intermediary ListModel suitable for sorting and drives
2016-05-19 11:29:21 +12:00
Ryan Huffman
01944f5100
Remove unused DependencyManager include
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
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
David Rowe
551c669883
Move FolderListModel to be stand-alone
2016-05-19 09:24:15 +12: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
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
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
David Rowe
e1d885004f
Fix carat in drop-down boxes
2016-05-18 13:59:13 +12:00
David Rowe
17d41dd7b9
HiFi glyphs font file update with fixed up/down carats
...
Update QML and HTML spinboxes accordingly.
2016-05-18 13:25:11 +12:00
Ryan Huffman
47d897f669
Fix processOctreeStats recreating JurisdictionMap for every stat packet
2016-05-17 15:12:14 -07:00
Andrew Meadows
aa171578b7
remove cruft
2016-05-17 14:58:14 -07:00
Andrew Meadows
c64612c42b
namechange keyboardMotor --> actionMotor
2016-05-17 14:46:50 -07:00
Andrew Meadows
e4cb6e2b87
order-independent CharacterController motors
2016-05-17 14:02:49 -07:00
Ryan Huffman
e7087c7393
Fix address bar becoming unusable after going backwards or forwards
...
The address bar dialog was being disabled when a lookup request was finished,
but was not hidden - this was bug #1 . Presumably, though, the intent was to have the
window _not_ disappear when going backwards or forwards, but hiding the
window when a lookup request finishes would cause the window
to be hidden when going backwards or forwards - this was bug #2 .
I decided to disable the hide-on-request-finished functionality because
the window is already manually hidden after entering a new address.
2016-05-17 11:17:34 -07:00
Ryan Huffman
ef6d758e7f
Fix JurisdictionMap multithreading issues
...
Make octal code pointers use shared_ptr, add locks around access.
2016-05-17 10:59:51 -07:00
Brad Davis
34e574c148
Merge pull request #7816 from zzmp/perf/idle-event
...
Drive render loop from DisplayPlugin instead of busy wait
2016-05-17 09:36:09 -07:00
David Rowe
e0483585b8
Consistently capitalize drive letter for Windows
2016-05-17 14:43:49 +12:00
David Rowe
b3afe73949
Merge branch 'master' into 20917
2016-05-17 13:25:17 +12:00
David Rowe
1fc3d9229c
Fix initial drive change and go-up not working properly on first screen
2016-05-17 10:51:42 +12:00
Brad Davis
5ba8372c21
Moving GL backend out of GPU
2016-05-16 12:54:17 -07:00
Brad Hefta-Gaub
06d1bd5728
Merge pull request #7799 from birarda/remove-avatar-billboard
...
remove the last of the avatar billboard code
2016-05-16 10:23:42 -07:00
Brad Hefta-Gaub
166fbdece5
Merge pull request #7853 from zzmp/fix/shutdown
...
Fix hang on exit from dying scripts
2016-05-16 10:17:34 -07:00
Atlante45
38f74c1843
Remove the last of the glow level
2016-05-14 14:49:31 -07:00
Brad Hefta-Gaub
a5f99ba370
Merge pull request #7899 from sethalves/dont-send-file-urls-to-avatar-mixer
...
fix invisible default avatars
2016-05-14 07:48:16 -07:00
David Rowe
14c733cd6e
Make columns sortable
2016-05-14 17:19:18 +12:00
David Rowe
c21087ad87
Add icon to title
2016-05-14 13:04:18 +12:00
Brad Hefta-Gaub
0d5fdbdb6e
Merge pull request #7879 from howard-stearns/fix-reticle-offset
...
fix reticle position offset
2016-05-13 17:17:23 -07:00
David Rowe
88130ee5c8
Merge branch 'master' into 20917
2016-05-14 12:13:39 +12:00
Seth Alves
6277bf8603
if avatar is set to the default avatar file that came with the distribution, don't save that url to settings. never send a file url to the avatar-mixer.
2016-05-13 16:37:43 -07:00
Zach Pomerantz
65e81077cb
Merge branch 'master' of github.com:highfidelity/hifi into perf/idle-event
2016-05-13 16:24:42 -07:00
Zach Pomerantz
59e4b9c356
Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown
2016-05-13 15:28:12 -07:00
Brad Hefta-Gaub
65aae42714
move firstRun.set() to correct place
2016-05-13 13:28:02 -07:00
David Rowe
3b34b908d7
Tweak level-up and home buttons
2016-05-13 17:39:15 +12:00
Stephen Birarda
2cf943b2b1
remove billboard code from AvatarData
2016-05-12 16:41:44 -07:00
howard-stearns
40f7212b1e
Make uses of getReticlePosition consistent with respect to window offset.
2016-05-12 16:37:03 -07:00
Brad Davis
85272a87ba
Merge pull request #7859 from samcake/lemon
...
Introduce the "Unlit" shading model support and apply it to Web Enitities
2016-05-12 15:09:50 -07:00
David Rowe
8f214a6b14
Merge branch 'master' into 99997
2016-05-12 17:50:34 +12:00
David Rowe
7be33a8584
Don't show header or dates and sizes when choosing a directory
2016-05-12 17:25:44 +12:00
David Rowe
d798e562fc
Update scrollbar in tree view to match table scrollbar
...
Used in Running Scripts and Asset Browser dialogs.
2016-05-12 17:18:30 +12:00
David Rowe
b6fcb77d6f
Update Running Scripts list to use updated QML table control
2016-05-12 17:16:56 +12:00
