Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 08:52:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70998 commits 75 branches 59 tags 1.2 GiB
Commit graph

70998 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
4fa0c96046 fix desktop press-x handshake 2018-08-13 11:57:48 -07:00
John Conklin II
a6e5ce76c6
Merge pull request #13811 from thoys/fix/create/deactivateCreateWhenWindowsClosed 
MS16958: deactivate Create App when desktop windows are closed
 2018-08-13 11:51:32 -07:00
Cristian Luis Duarte
b381a182bd Android - People - add padding to list 2018-08-13 14:31:20 -03:00
SamGondelman
86ba8c3d81 fix parabola shader 2018-08-13 10:08:19 -07:00
unknown
8a22d0adc7 set grabbable user data in addAssetToWorldCheckModelSize 2018-08-11 11:04:44 -07:00
unknown
c622a587e3 Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-11 07:59:56 -07:00
Thijs Wenker
221dfb8979 typo fix 2018-08-11 05:46:48 +02:00
Robin K Wilson
ac37f476d9
Merge pull request #13761 from robin-k-wilson/simplifyBuildInstructions 
Reordered build.md instructions
 2018-08-10 20:16:00 -07:00
Simon Walton
829b83c61d Use elevated model priority during initial load 2018-08-10 18:16:08 -07:00
Thijs Wenker
a20be5b50d remove rotation for newly created entities 2018-08-11 02:28:01 +02:00
Thijs Wenker
f26188d5b8 added comment for limit choice 2018-08-11 01:54:13 +02:00
Sam Gateau
12f1b99283 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-10 16:41:08 -07:00
John Conklin II
b56d9c3ea5
Merge pull request #13807 from SamGondelman/fading 
Fixing fading
 2018-08-10 16:35:10 -07:00
Zach Fox
57d2f04f14
Merge pull request #13799 from davidkelly/dk/17340 
Only update gain if it really changed
 2018-08-10 16:20:24 -07:00
Simon Walton
0ae86d5aa8 Remove useless statement 2018-08-10 16:16:58 -07:00
luiscuenca
dd93055d89 Convert and load attachments when rig is ready 2018-08-10 16:15:30 -07:00
Sam Gateau
d5c5bd714f
Merge pull request #13785 from AndrewMeadows/no-update-fading-avatars 
don't call Avatar::simulate() on fading avatars
 2018-08-10 15:44:07 -07:00
Simon Walton
05fa7fdf0e Clean-up 2018-08-10 15:43:51 -07:00
Thijs Wenker
876079bb81 deactivate Create App when desktop windows are closed 2018-08-11 00:41:50 +02:00
Zach Fox
096be16bb1 Only restart timer if feedMouseArea doesn't contain mouse 2018-08-10 15:32:44 -07:00
Zach Fox
1a6a55680c PropagateComposedEvents 2018-08-10 15:30:32 -07:00
Sam Gateau
d5cfe95a0a merging with master 2018-08-10 15:03:33 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges 
New Default Strafe Animations Plus Animation Tuning Support
 2018-08-10 15:03:30 -07:00
Cristian Luis Duarte
610306c49c Android - People - add friend star 2018-08-10 19:02:01 -03:00
Gabriel Calero
2e323efe1b Test if this fixes the choppy audio 2018-08-10 18:57:41 -03:00
Alexander Ivash
5ba68cbfac remove attachments menu item / dialogs / related components 2018-08-11 00:50:32 +03:00
David Rowe
3a356de49f Don't auto-action entry in HMD file dialog when single-click on it 2018-08-11 09:46:11 +12:00
Alexander Ivash
c1ebadfdd8 adjust text in 'get wearables' popup 2018-08-11 00:43:39 +03:00
Sam Gateau
9cb0c36d90
Merge pull request #13805 from NissimHadar/exportToTestRail1 
Auto-Tester export to TestRail
 2018-08-10 14:40:12 -07:00
Simon Walton
3c665b7de8 Don't delete sequence numbers outside of range as range may change 2018-08-10 14:40:08 -07:00
Alexander Ivash
e6915e63f2 put 'Fedora' on HEAD 2018-08-11 00:39:43 +03:00
Cristian Luis Duarte
b65f2d46a6 Android - People - Letters styling in row 2018-08-10 18:18:24 -03:00
John Conklin II
61f0e9323a
Merge pull request #13800 from samcake/zvork-shadow 
Fixing PR13731 shader error on Mac
 2018-08-10 14:10:47 -07:00
Ryan Huffman
9fadf58e7b Add threads lib to image lib 2018-08-10 13:56:48 -07:00
Ryan Huffman
c0ac76bf4a
Merge pull request #13797 from dback2/rotationRingSize 
Edit handle rotation ring size
 2018-08-10 13:53:10 -07:00
Cristian Luis Duarte
ef3ac6bba3 Android - Friends - rollback swipe to reveal items 2018-08-10 17:36:32 -03:00
Sam Gateau
ad5b2ddc69
Merge pull request #13711 from AndrewMeadows/myAvatar-vs-backfacing-triangles 
MyAvatar's RigidBody ignores collisions with backfacing triangles
 2018-08-10 12:55:28 -07:00
unknown
8c185aa04e fix menu option 2018-08-10 12:13:09 -07:00
unknown
5d1cc3696a Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 12:10:57 -07:00
unknown
45b9871fdb when adding asset to world set grabbable 2018-08-10 12:10:49 -07:00
Stephen Birarda
91365aeff4 make avatar kill packets from mixer reliable 2018-08-10 11:31:17 -07:00
SamGondelman
15070f6374 fixing fading 2018-08-10 10:52:58 -07:00
sabrina-shanman
e5e1a72598 Use 'orientation' for Collision Pick API, not 'rotation' 2018-08-10 10:52:21 -07:00
Wayne Chen
6b73a0bba5
Merge pull request #13801 from wayne-chen/fixMyAvatarScale-case-17434 
MS17434: modifying MyAvatar.scale get property
 2018-08-10 10:45:53 -07:00
David Back
1d0da4042a
Merge pull request #13771 from dback2/entityListCtrlReselection 
Reselecting same entity in list will unselect it
 2018-08-10 10:41:57 -07:00
Zach Fox
f514fde6fd
Merge pull request #13789 from zfox23/MS17469_listModelFix 
v0.72.0: Fix MS17469: Fix conditionals for needing more paginated results when ListView changes
 2018-08-10 10:24:01 -07:00
Cristian Luis Duarte
d61aaa3bd7 Android - People - Round profile image 2018-08-10 14:16:44 -03:00
Alexander Ivash
9b9e30e829 add 'Tip: You can use hand controllers to grab and adjust your wearables' if in HMD 2018-08-10 20:14:15 +03:00
David Kelly
2b5ecd6b5f remove extraneous log 2018-08-10 10:12:32 -07:00
Simon Walton
a8b9568c92 Add some locking 2018-08-10 10:11:46 -07:00