howard-stearns
a3f1ece978
Do button mapping in C++ and simplify vive.json accordingly. Vive and
...
Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.
2016-05-24 16:10:12 -07:00
howard-stearns
6b606759aa
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-hand-controllers-after-input-changes
2016-05-24 11:31:20 -07:00
Brad Hefta-Gaub
49ded9c4df
Merge pull request #7873 from ctrlaltdavid/20917
...
restyle file browser
2016-05-24 08:40:38 -07:00
Brad Hefta-Gaub
f16a3ce6bb
Merge pull request #7962 from zzmp/fix/throttle
...
fix throttling when Interface is not in focus
2016-05-24 08:25:38 -07:00
Zach Pomerantz
7dabce9cff
Check throttle before idling/painting
2016-05-23 19:04:35 -07:00
howard-stearns
fdcd667d3c
Fix hand controller pointer after input changes.
2016-05-23 13:33:42 -07:00
David Rowe
504516b627
Merge branch 'master' into 20917
2016-05-24 08:03:54 +12:00
David Rowe
099a675a18
Remove extra logging
2016-05-24 08:03:29 +12:00
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
Brad Hefta-Gaub
ac49feda22
Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS
...
Conflicts:
libraries/entities/src/EntityEditPacketSender.h
2016-05-21 09:23:45 -07:00
David Rowe
5a27d656c5
Potential OSX fix plus extra logging
2016-05-21 13:03:58 +12:00
Seth Alves
f91a2403be
merge from upstream
2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
18613908df
Merge pull request #7800 from sethalves/no-fly-zones
...
No fly zones
2016-05-20 16:59:55 -07:00
Seth Alves
d95d3ff3ac
clean up debugging prints
2016-05-20 14:56:47 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
Seth Alves
ff36b39067
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-20 14:38:53 -07:00
Brad Hefta-Gaub
00bd3b2e8a
remove more dead code
2016-05-20 13:43:08 -07:00
Brad Hefta-Gaub
770fab956f
remove dead code
2016-05-20 12:23:06 -07:00
Zach Pomerantz
2026226fe2
Handle vsync without halving fps
2016-05-20 09:04:39 -07: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
Seth Alves
1de9598243
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 16:37:40 -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
Zach Pomerantz
9a4b30a50b
Fix AvatarInputs phantom movement
2016-05-19 13:19:15 -07: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
Seth Alves
74520f5c92
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 09:49:18 -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
Seth Alves
cf829f1bab
magic number
2016-05-17 19:14:44 -07:00
Seth Alves
3380b2a668
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-17 19:10:33 -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
