Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69419 commits 71 branches 56 tags 1.2 GiB
Commit graph

69419 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Anthony J. Thibault
328a485ad1 Prevent ray-picks against ModelEntity bounding boxes when loading has not yet completed. 2018-06-25 10:38:53 -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 Rowe
af3861def8 Code review 2018-06-25 16:33:05 +12:00
David Rowe
40fb627504 Merge branch 'master' into 21892 2018-06-25 16:04:44 +12: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
David Back
6a4c5ed12a Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-22 11:58:28 -07:00
David Back
844c3c77ac Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-22 11:55:44 -07:00
Wayne Chen
1239472f2d adding line for allowing grabbing of collisionless overlays 2018-06-22 11:35:01 -07:00
Sam Gondelman
44a7d04b2a
Merge pull request #13426 from SamGondelman/avatarPriority 
Highest loading priorities for avatars and attachments
 2018-06-22 11:22:10 -07:00
SamGondelman
d37a8bcd72 more jsdoc updates 2018-06-22 10:13:18 -07:00
Wayne Chen
5b36449edd allowing grabbing of collisionless entities 2018-06-22 09:54:25 -07:00
Wayne Chen
25d7284e81 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-06-21 18:22:01 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix 2018-06-21 17:32:24 -07:00
SamGondelman
223350b7be remove logging, play with debounce times 2018-06-21 17:26:39 -07:00
NissimHadar
8ad8713a13 New API. 2018-06-21 17:02:51 -07:00
David Back
c019a4816f CR changes + eslint fixes 2018-06-21 16:45:09 -07:00
David Back
ed56f09fcf comment 2018-06-21 15:00:10 -07:00
David Back
2a7d146661 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-21 14:48:48 -07:00
David Back
37b35353d2 space 2018-06-21 14:48:37 -07:00
John Conklin II
4088035b3b
Merge pull request #13411 from sabrina-shanman/crash-delete-cube 
Fix crash when deleting objects in serverless mode
 2018-06-21 14:39:07 -07:00
David Back
d35293594c Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-21 14:27:34 -07:00
Sam Gondelman
afc64a18a1
Merge pull request #13362 from SamGondelman/modelTextures 
Fix transparent textures rendering wrong sometimes
 2018-06-21 14:23:49 -07:00
Sam Gateau
dea3f91c0b
Merge pull request #13421 from AndrewMeadows/fix-mac-nan-crash 
fix crash on Mac when watching someone else turn with HMD
 2018-06-21 11:55:39 -07:00
David Back
e3e8de1042 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-21 10:24:12 -07:00
John Conklin II
aa630e02cf
Merge pull request #13269 from wayne-chen/BillboardableWarning-case-14709 
Billboardable::pointTransformAtCamera div by zero asan warning
 2018-06-21 10:04:38 -07:00
SamGondelman
64fdb8fe62 simplify etc2comp cmake 2018-06-21 09:32:39 -07:00
NissimHadar
f4508e7a80 Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate 2018-06-21 09:32:26 -07:00
John Conklin II
835528b212
Merge pull request #13383 from dback2/autoLaserFix2 
Fix auto lasering locked web entities & only auto laser tablet and web overlays
 2018-06-21 09:21:54 -07:00
Gabriel Calero
4af0815561 Add missing annotations to breakpad (version, build_number, build_type) 2018-06-21 11:19:39 -03:00
Gabriel Calero
d5e2362ee2 Clean up and complete gradle script 2018-06-21 11:19:29 -03:00
Gabriel Calero
730e14c9d9 Debugging gradle script 2018-06-21 11:19:20 -03:00