Stephen Birarda
|
24f92502b5
|
add warning output of error from AccountManager
|
2018-06-27 11:41:37 -07:00 |
|
Stephen Birarda
|
e90ea82ef5
|
move AddressManager to NodeList thread, fix AccountManager invokes
|
2018-06-27 11:41:37 -07:00 |
|
amantley
|
1804422df0
|
remove orb in the otherAvatar destructor, and check
_otherAvatarOrbMeshPlaceholder pointer before updating the position
|
2018-06-27 11:15:42 -07:00 |
|
John Conklin II
|
e7d5ea561b
|
Merge pull request #13469 from hyperlogic/safeLandingFix4
Fix for landing on the roof of some domains.
|
2018-06-27 10:23:35 -07:00 |
|
Seth Alves
|
01632ddd29
|
Merge pull request #13345 from ctrlaltdavid/21890
Fix memory leak when reloading scripts
|
2018-06-27 09:39:53 -07:00 |
|
Seth Alves
|
d9f8cd46ea
|
Merge pull request #13415 from ctrlaltdavid/21896
Zero avatar velocity if protocol version mismatch so that overlays show
|
2018-06-27 09:35:15 -07:00 |
|
Gabriel Calero
|
1e09f98f6e
|
Pick entity or overlay depending on distance
|
2018-06-27 12:23:43 -03:00 |
|
Angus Antley
|
eba4a27329
|
added newline to the end of AvatarManager.cpp
|
2018-06-27 05:59:53 +01:00 |
|
John Conklin II
|
a03a5693a5
|
Merge pull request #13466 from danteruiz/fix-login-2.0
fix login links (forgot username and password)
|
2018-06-26 18:51:10 -07:00 |
|
amantley
|
39edc21423
|
spaced comment fixed
|
2018-06-26 17:47:36 -07:00 |
|
amantley
|
8b13905d6c
|
final final final coding standards
|
2018-06-26 17:43:45 -07:00 |
|
amantley
|
ea76def2b5
|
more white space errors
|
2018-06-26 17:18:35 -07:00 |
|
amantley
|
1fcaf16b0c
|
removed editor auto format errors
|
2018-06-26 17:07:55 -07:00 |
|
John Conklin II
|
a38859e4da
|
Merge pull request #13397 from ctrlaltdavid/21893
Fix Create app selection updating when entities are deleted
|
2018-06-26 17:06:43 -07:00 |
|
amantley
|
7ecf8c24df
|
Merge remote-tracking branch 'upstream/master' into glowingOrbMaster
syncing with upstream master
|
2018-06-26 16:44:34 -07:00 |
|
amantley
|
a89c2ea734
|
removed crust
|
2018-06-26 16:40:51 -07:00 |
|
luiscuenca
|
fe571e9638
|
Fix scaling model twice
|
2018-06-26 16:37:12 -07:00 |
|
Sam Gondelman
|
7fb2e535ff
|
Merge pull request #13468 from SamGondelman/secondaryShadows
Disable shadows in secondary camera
|
2018-06-26 15:45:44 -07:00 |
|
Zach Fox
|
6f956ffb8d
|
Fix MS16235: Set previously-buggy Handshake particle properties to 0
|
2018-06-26 15:45:18 -07:00 |
|
Alexia Mandeville
|
b3eec72c90
|
Removing animations.zip
|
2018-06-26 15:39:50 -07:00 |
|
amantley
|
2b6d470467
|
Merge remote-tracking branch 'upstream/master' into glowingOrbMaster
syncing with master
|
2018-06-26 15:16:41 -07:00 |
|
amantley
|
46c70d948f
|
Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn
|
2018-06-26 15:11:58 -07:00 |
|
Alexia Mandeville
|
6f6a9b2c64
|
Style formatting, updating comments
|
2018-06-26 15:02:46 -07:00 |
|
Dante Ruiz
|
3cf36bed55
|
making small adjustments
|
2018-06-26 14:57:15 -07:00 |
|
Alexia Mandeville
|
92acbdbbd7
|
Adding sit and love emotes
|
2018-06-26 14:21:10 -07:00 |
|
John Conklin II
|
4948ad425e
|
Merge pull request #13429 from danteruiz/fix-entity-lag-2
Fix entities rendering a frame ahead or behind when parented to my avatar.
|
2018-06-26 13:57:19 -07:00 |
|
David Back
|
40b2525b99
|
Merge pull request #13439 from dback2/editHandleFixesImprovements
Edit handle fixes
|
2018-06-26 13:33:25 -07:00 |
|
Dante Ruiz
|
1fec900ba6
|
disable flying by default
|
2018-06-26 13:31:59 -07:00 |
|
amantley
|
fa1a9d04e0
|
everything working before trying to move otheravatar to interface
|
2018-06-26 13:18:26 -07:00 |
|
John Conklin II
|
47f907f44e
|
Merge pull request #13441 from wayne-chen/collisionlessGrab-case-12661
Fixing collisionless grabbing
|
2018-06-26 13:05:25 -07:00 |
|
SamGondelman
|
97ee02811c
|
disable shadows in secondary camera
|
2018-06-26 12:27:59 -07:00 |
|
Dante Ruiz
|
d8834af749
|
make requested changes
|
2018-06-26 11:53:45 -07:00 |
|
Zach Fox
|
56b3c125c5
|
Merge pull request #13459 from zfox23/MS16113_hifikeyPath
Fix MS16113: Use alternate method for creating backup instructions
|
2018-06-26 11:36:03 -07:00 |
|
David Back
|
46b5c0cc8e
|
Merge pull request #13448 from dback2/multiSelectColorInvisibleFix
Fix multi-selection color setting visible/locked to false
|
2018-06-26 11:28:58 -07:00 |
|
NissimHadar
|
337719f45e
|
Merge pull request #13460 from NissimHadar/autoTesterUpdate
Auto tester update
|
2018-06-26 11:26:25 -07:00 |
|
Dante Ruiz
|
17f4a27ceb
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-entity-lag-2
|
2018-06-26 10:55:27 -07:00 |
|
Sam Gondelman
|
fbe54437b8
|
Merge pull request #13409 from humbletim/add-raypick-shapeID
Include shapeID in RayPick results
|
2018-06-26 10:25:39 -07:00 |
|
Dante Ruiz
|
a906fbaf56
|
fix login links
|
2018-06-26 10:20:22 -07:00 |
|
Gabriel Calero
|
48cdd6d64c
|
Fix web entities for android
|
2018-06-26 12:30:03 -03:00 |
|
John Conklin II
|
0c9f0cbe03
|
Merge pull request #13443 from samcake/punk
report FIx from rc69 to master: Fix for the point light test flashing in HMD
|
2018-06-26 08:28:03 -07:00 |
|
Gabriel Calero
|
7e640abb39
|
Support Web entities in android
|
2018-06-26 12:01:01 -03:00 |
|
Angus Antley
|
232dc21c7b
|
add orb code added to otheravatar.cpp
|
2018-06-26 06:38:09 +01:00 |
|
Angus Antley
|
b8dea4b869
|
adding changes to add the orb when an avatar is processed by the avatar mixer
and when a new model is being loaded for an avatar. The orb is removed
when the geometry has loaded.
|
2018-06-26 06:27:18 +01:00 |
|
Sam Gondelman
|
acfd562309
|
Merge pull request #13435 from gcalero/breakpad_android
Breakpad integration for android Interface (part II)
|
2018-06-25 16:47:07 -07:00 |
|
Howard Stearns
|
5fe7b874a4
|
Merge pull request #13455 from howard-stearns/test-wearables
16089: test wearables for wear before gifting and wearing
|
2018-06-25 16:44:53 -07:00 |
|
NissimHadar
|
bd8e8aab85
|
Fixed gcc warnings.
|
2018-06-25 16:40:43 -07:00 |
|
Andrew Meadows
|
ca70b865d3
|
Merge pull request #13452 from AndrewMeadows/avatar-entities-001
fix physics deactivation of avatar-entities
|
2018-06-25 16:18:01 -07:00 |
|
David Back
|
05438f3b85
|
bad avatar collision merge
|
2018-06-25 15:26:54 -07:00 |
|
David Back
|
f65bc9b5ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements
|
2018-06-25 15:22:07 -07:00 |
|
Gabriel
|
ea2c1298e5
|
Remove crash added with testing purposes only
|
2018-06-25 19:13:47 -03:00 |
|