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
Anthony J. Thibault
2c6b0e5c95
Fix for linux warning.
2016-05-17 17:32:09 -07:00
Anthony J. Thibault
dc6e1afae6
Changed empty AvatarIdentity packet to AvatarData packet
...
Just in-case it actually gets through, it will fail to be parsed
by AvatarData::parseDataFromBuffer() due to it's size.
AvatarData::hasIdentityChangedAfterParsing() has no such checks.
2016-05-17 16:34:30 -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
Anthony J. Thibault
b82356a249
AvatarMixer: Clients will show incompatible version dialog
...
For this to work, the server needs to send an empty AvatarIdentity packet back to the sender
when it receives a packet mismatch error. This AvatarIdentity packet will be different then
what the client expects and will trigger the incompatible version dialog.
Previously, the avatar-mixer was just silently dropping incoming mismatched version packets.
Causing the client to never get a response, and thus never showing the incompatible version dialog.
2016-05-17 15:02:04 -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
Anthony J. Thibault
424517e3de
Fix for Malformed packet errors
2016-05-16 19:11:50 -07:00
David Rowe
b3afe73949
Merge branch 'master' into 20917
2016-05-17 13:25:17 +12:00
Anthony J. Thibault
3d91c5b54d
AvatarData.cpp: hooked up 6 byte quat compression
2016-05-16 17:48:55 -07:00
Anthony J. Thibault
818d1f4601
Added six byte quaternion compression routines & tests
2016-05-16 17:48:54 -07:00
Anthony J. Thibault
a251b9e3df
Moved translations back into parent relative frame.
2016-05-16 17:48:54 -07:00
Anthony J. Thibault
d86a608825
Properly convert from absolute rig frame to relative geom frame
2016-05-16 17:48:53 -07:00
Anthony J. Thibault
36c175d4cc
Ensure that JointData is in the absolute rig coordinate frame.
2016-05-16 17:48:52 -07:00
Anthony J. Thibault
55b0060df9
Convert JointData from relative frame to absolute.
2016-05-16 17:48:52 -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
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
