amantley
|
1fcaf16b0c
|
removed editor auto format errors
|
2018-06-26 17:07:55 -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 |
|
Sam Gondelman
|
7fb2e535ff
|
Merge pull request #13468 from SamGondelman/secondaryShadows
Disable shadows in secondary camera
|
2018-06-26 15:45:44 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Zach Fox
|
7a5d794505
|
Fix MS16113: Use alternate method for creating backup instructions
|
2018-06-25 14:40:54 -07:00 |
|
Zach Fox
|
3ceb9ddee9
|
Merge pull request #13444 from zfox23/MS16074_16076_banklinks
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
|
2018-06-25 13:47:08 -07:00 |
|
howard-stearns
|
43cba68cd2
|
test wearables for wear before gifting and wearing
|
2018-06-25 13:40:45 -07:00 |
|
Zach Fox
|
3553f97776
|
Merge pull request #13446 from zfox23/MS16088_usernameOverlap
Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home
|
2018-06-25 11:45:29 -07:00 |
|
humbletim
|
b73a957935
|
changes per PR
|
2018-06-25 14:17:33 -04:00 |
|
NissimHadar
|
cfd7e86a0f
|
Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate
|
2018-06-25 11:13:45 -07:00 |
|
David Back
|
6fa191742c
|
Merge pull request #13390 from dback2/editHandleDebugWindowFix
Prevent edit press events when pointing at tablet or desktop windows
|
2018-06-25 11:11:37 -07:00 |
|
John Conklin II
|
17263a1ed3
|
Merge pull request #13396 from dback2/editHandleCollision
Temp disable MyAvatar collisions when stretching entities
|
2018-06-25 10:45:07 -07:00 |
|
John Conklin II
|
0e2675e0d8
|
Merge pull request #13392 from roxanneskelly/roxie-bugfixes
Remove debug logging message spam for avatar entities that have scripts
|
2018-06-25 10:42:43 -07:00 |
|
Andrew Meadows
|
756f34761f
|
don't build AvatarMotionStates until physics enabled
|
2018-06-25 10:37:54 -07:00 |
|
Andrew Meadows
|
5e2a08b3c2
|
handle deactivation of avatar entities differently
|
2018-06-25 10:37:54 -07:00 |
|
NissimHadar
|
25834c3809
|
Allow multiple evaluations.
|
2018-06-25 09:13:58 -07:00 |
|
David Back
|
39b3e5a711
|
tabs
|
2018-06-22 18:15:16 -07:00 |
|
David Back
|
09ccd3acf0
|
fix multi-selection color setting visible/locked to false
|
2018-06-22 18:13:40 -07:00 |
|
Zach Fox
|
6fce6431a3
|
Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home
|
2018-06-22 16:09:49 -07:00 |
|
Zach Fox
|
25f22326a8
|
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
|
2018-06-22 15:43:16 -07:00 |
|
Sam Gateau
|
7b4b6bc3b8
|
Same fix as the point lighting flashing for rc69 in master
|
2018-06-22 14:59:37 -07:00 |
|
samcake
|
df3d689098
|
Try mono threaded and profiled
|
2018-06-22 14:59:37 -07:00 |
|
David Back
|
88762e879f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision
|
2018-06-22 13:53:04 -07:00 |
|
David Back
|
80adad7965
|
myAvatar constant
|
2018-06-22 13:52:43 -07:00 |
|
NissimHadar
|
fdf0beba9c
|
Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate
|
2018-06-22 13:46:50 -07:00 |
|
John Conklin II
|
b7069fff71
|
Merge pull request #13382 from SamGondelman/particleFix
Fix Particle Entities
|
2018-06-22 13:27:11 -07:00 |
|
Seth Alves
|
6f22f210bc
|
Merge pull request #13433 from SamGondelman/etc2fix
Simplify Etc2Comp cmake
|
2018-06-22 12:03:55 -07:00 |
|