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
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
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
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
0d6b0eef59
PR feedback
2016-05-16 15:27:14 -07:00
Stephen Birarda
eb8a764f42
update LICENSE to include "and other platform"
2016-05-16 14:45:04 -07:00
Seth Alves
d77b3bf59a
fix some comments and debug pritns
2016-05-16 14:12:05 -07:00
Brad Davis
5ba8372c21
Moving GL backend out of GPU
2016-05-16 12:54:17 -07:00
howard-stearns
3f17852244
Merge branch 'master' of https://github.com/highfidelity/hifi into improve-hand-controller-edit
2016-05-16 12:35:48 -07:00
howard-stearns
acb56d0603
Larger edit handles, and more tolerance in click (vs drag).
2016-05-16 12:35:05 -07:00
Seth Alves
a0c3224705
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-16 10:56:09 -07:00
Seth Alves
2a5efd3b82
Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta
2016-05-16 10:53:39 -07:00
Zach Pomerantz
7d4276d15f
Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor
2016-05-16 10:51:23 -07:00
Zach Pomerantz
61fbb7022c
Mv entities script engine deleter to fn
2016-05-16 10:40:11 -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
Brad Hefta-Gaub
cf59fa8a46
Merge pull request #7885 from ctrlaltdavid/20918
...
make users.js movable
2016-05-16 10:16:32 -07:00
Brad Hefta-Gaub
b862f0b8f3
Merge pull request #7904 from jherico/fix_filters
...
fix texture sampler calculation
2016-05-16 10:16:16 -07:00
Seth Alves
880b52aad2
update attachedEntitiesManager to work better with avatarEntities
2016-05-16 09:52:48 -07:00
Seth Alves
3876a8037c
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-16 09:51:20 -07:00
Brad Davis
84f4945840
Fix sampler mode lookup
2016-05-15 13:05:50 -07:00
Brad Hefta-Gaub
1f800294c6
Merge pull request #7880 from jherico/gpu_smart_buffers
...
Support partial CPU->GPU buffer transfers
2016-05-14 17:44:26 -07:00
