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
Brad Hefta-Gaub
9af39d71e1
Merge pull request #7767 from huffman/fix/address-bar-back
...
Fix address bar becoming unusable after going backwards or forwards
2016-05-18 09:14:07 -07:00
Brad Hefta-Gaub
df491159ed
Merge pull request #7881 from imgntn/tidyBotSwipe
...
[Home] TidyBot 2.0
2016-05-18 09:08:07 -07:00
James B. Pollack
d24ec08f9f
cleanup
2016-05-18 08:55:02 -07:00
James B. Pollack
5d1b2996d3
semicolon
2016-05-18 08:53:57 -07:00
James B. Pollack
946558d0f6
cleanup
2016-05-18 08:53:13 -07:00
James B. Pollack
0c5adf83ce
fix hands
2016-05-18 08:43:53 -07:00
Zach Pomerantz
59e17c2d5f
Fix abs of unsigned warning
2016-05-17 22:57:29 -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
Andrew Meadows
9786c0bfd3
remove warning about signed/unsigned conversion
2016-05-17 15:34:09 -07:00
Andrew Meadows
aab26c5089
disable DEBUG_STATE_CHANGE
2016-05-17 15:14:36 -07:00
Ryan Huffman
68665e6b25
Fix JurisdictionMap not initializing correctly
2016-05-17 15:12:45 -07: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
2f39968a03
remove debug cruft
2016-05-17 14:32:20 -07:00
Andrew Meadows
e4cb6e2b87
order-independent CharacterController motors
2016-05-17 14:02:49 -07:00
Andrew Meadows
1749bfbc58
transition to InAir state when not thrusting up
2016-05-17 14:02:47 -07:00
Andrew Meadows
9b7bf97891
enable vertical thrust while walking
2016-05-17 14:02:46 -07:00
Seth Alves
8e3b31a5e5
Merge pull request #7910 from samcake/blue
...
Fix bad roughness value read from the deferred buffer
2016-05-17 12:07:20 -07:00
Ryan Huffman
cf6eba96a4
Remove unused variable
2016-05-17 11:17:34 -07:00
Ryan Huffman
2dbea37690
Fix address manager sometimes double adding address history
2016-05-17 11:17:34 -07:00
Ryan Huffman
d47c74408e
Cleanup handleViewpoint
2016-05-17 11:17:34 -07:00
Ryan Huffman
0ec9d9e277
Remove goToAddressFromObject from slots
2016-05-17 11:17:34 -07:00
Ryan Huffman
f213a059fb
Fix AddressManager not always storing history when it should
2016-05-17 11:17:34 -07:00
Ryan Huffman
fde1f0740c
Fix goBackPossible not being triggered correctly in AddressManager
2016-05-17 11:17:34 -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
samcake
8ec280535b
FIx bad roughness value read from the deferred buffer
2016-05-17 11:13:34 -07:00
Ryan Huffman
013d902376
Add vector include to OctalCode.h
2016-05-17 10:59:51 -07:00
Ryan Huffman
475d881b04
Fix logging of shared_ptr
2016-05-17 10:59:51 -07:00
Ryan Huffman
1bec38584b
Remove class qualification from header file
2016-05-17 10:59:51 -07:00
Ryan Huffman
368eded8ee
Remove unnecessary type in Jurisdictionmap
2016-05-17 10:59:51 -07:00
Ryan Huffman
5fc18eafda
Rename OctalCodePtr related functions
2016-05-17 10:59:51 -07:00
Ryan Huffman
35f147f557
Cleanup use of OctalCodePtrList and add allocateOctalCodePtr
2016-05-17 10:59:51 -07:00
Ryan Huffman
e819ab8475
Add mutex protection around octal code getters
2016-05-17 10:59:51 -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
Chris Collins
b2ece6f4a7
Merge pull request #7882 from zzmp/fix/script-thread-dtor
...
Wait and cleanly exit the scripting thread
2016-05-16 16:52:54 -07:00
Atlante45
4b1497fdf4
Remove dead code highlight entity in edit.js
2016-05-16 16:25:40 -07:00
Brad Hefta-Gaub
bb53011840
Merge pull request #7884 from sethalves/update-model-meta
...
when a ModelEntityItem moves, also update its meta-render-item
2016-05-16 16:08:22 -07:00
Brad Davis
0d6b0eef59
PR feedback
2016-05-16 15:27:14 -07:00
