amantley
|
0a1a75f752
|
Merge remote-tracking branch 'upstream/master' into newJumpWalkMotions
|
2018-08-15 10:26:24 -07:00 |
|
amantley
|
8b5f96a023
|
removed spin2App.js
|
2018-08-15 10:23:40 -07:00 |
|
amantley
|
48e08276bf
|
added new jump_takeoff and jump_land to fix the tposing in the transition to and from flying
|
2018-08-15 10:20:17 -07:00 |
|
John Conklin II
|
d1a80e57be
|
Merge pull request #13809 from birarda/feat/reliable-avatar-kill
make avatar kill packets from mixer reliable
|
2018-08-15 10:00:22 -07:00 |
|
Seth Alves
|
83718ca06d
|
Merge pull request #13746 from alexiamandeville/emoteIcon
updating emote app icon
|
2018-08-15 08:29:48 -07:00 |
|
Kerry Ivan Kurian
|
6a34bde49c
|
Merge pull request #13825 from roxanneskelly/autoScroll
Auto scroll
|
2018-08-14 20:56:53 -07:00 |
|
John Conklin II
|
032e67fd8e
|
Merge pull request #13748 from ElderOrb/FB16831
FB16831 qml-related warnings in log
|
2018-08-14 16:40:07 -07:00 |
|
Roxanne Skelly
|
50b0a458ce
|
Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled.
|
2018-08-14 16:32:56 -07:00 |
|
Seth Alves
|
3623590e90
|
Merge pull request #13784 from sethalves/far-point-joints
Far point joints
|
2018-08-14 15:40:07 -07:00 |
|
Roxanne Skelly
|
5a8da4ce97
|
Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app
|
2018-08-14 15:28:22 -07:00 |
|
Roxanne Skelly
|
987d8569ae
|
Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll
|
2018-08-14 15:27:22 -07:00 |
|
John Conklin II
|
a5bace4e4d
|
Merge pull request #13706 from ElderOrb/FB17062
use updated 'Last Legends: Male' from Mukul
|
2018-08-14 14:18:39 -07:00 |
|
John Conklin II
|
007652632c
|
Merge pull request #13724 from gcalero/android_audio_fixes3
Android audio tests
|
2018-08-14 13:57:59 -07:00 |
|
Ryan Huffman
|
19f27ec911
|
Merge pull request #13810 from ctrlaltdavid/M11360
Don't auto-action entry in HMD file dialog when single-click
|
2018-08-14 12:57:28 -07:00 |
|
John Conklin II
|
8c5344ad1a
|
Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut
MS17380: Create App fix for angularVelocity zeroing out on duplication or undo
|
2018-08-14 11:37:33 -07:00 |
|
Alexander Ivash
|
4478733c27
|
fix coding conventions
|
2018-08-14 21:18:54 +03:00 |
|
Seth Alves
|
dce7b6eae6
|
Merge pull request #13714 from sabrina-shanman/safe-teleport-target
Create CollisionPick API
|
2018-08-14 09:56:51 -07:00 |
|
Seth Alves
|
41e9c3a2ad
|
Merge pull request #13820 from AndrewMeadows/dont-try-physics-for-invalid-models
don't attempt physics with invalid modelURL
|
2018-08-14 09:47:37 -07:00 |
|
Seth Alves
|
e5e9339a7b
|
Merge pull request #13819 from ElderOrb/FB16914
Avatar bookmarks missing from Avatar Favorites
|
2018-08-14 09:46:37 -07:00 |
|
Seth Alves
|
527b27da96
|
pseudo-joints for far-grab positions
|
2018-08-14 08:55:20 -07:00 |
|
Seth Alves
|
832eefd3a2
|
Merge pull request #13752 from ctrlaltdavid/M17208
Improve text in Avatar app's pop-ups
|
2018-08-14 08:48:04 -07:00 |
|
Seth Alves
|
54fa7dd0b6
|
Merge pull request #13817 from sethalves/fix-desktop-handshake
fix desktop press-x handshake
|
2018-08-14 08:42:10 -07:00 |
|
sabrina-shanman
|
2576d502ab
|
Remove unused getter for btCollisionWorld in PhysicsEngine
|
2018-08-13 17:27:57 -07:00 |
|
John Conklin II
|
73ef2ff09c
|
Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit
MS17291: Create-app increase focus distance limit
|
2018-08-13 14:58:17 -07:00 |
|
sabrina-shanman
|
e5cb078133
|
Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target
|
2018-08-13 14:51:37 -07:00 |
|
Sabrina Shanman
|
99374c099a
|
Merge pull request #13816 from SamGondelman/fading
Fix parabola shader
|
2018-08-13 14:45:31 -07:00 |
|
Gabriel Calero
|
4b808fe38e
|
Revert "Test if this fixes the choppy audio"
This reverts commit 2e323efe1b.
|
2018-08-13 18:29:05 -03:00 |
|
Seth Alves
|
0a5c96ecc1
|
Merge pull request #13792 from luiscuenca/attachmentsAPImgr
Attachments API returns avatar entities
|
2018-08-13 14:21:13 -07:00 |
|
Andrew Meadows
|
fd9876cb63
|
don't attempt physics with invalid modelURL
|
2018-08-13 13:30:30 -07:00 |
|
Alexander Ivash
|
f910757ec4
|
FB16914 - Avatar bookmarks missing from Avatar Favorites
|
2018-08-13 22:57:07 +03:00 |
|
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 |
|
SamGondelman
|
86ba8c3d81
|
fix parabola shader
|
2018-08-13 10:08:19 -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 |
|
Thijs Wenker
|
f26188d5b8
|
added comment for limit choice
|
2018-08-11 01:54:13 +02: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 |
|
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 |
|
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 |
|
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 |
|
Gabriel Calero
|
2e323efe1b
|
Test if this fixes the choppy audio
|
2018-08-10 18:57:41 -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 |
|
Sam Gateau
|
9cb0c36d90
|
Merge pull request #13805 from NissimHadar/exportToTestRail1
Auto-Tester export to TestRail
|
2018-08-10 14:40:12 -07: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
|
c0ac76bf4a
|
Merge pull request #13797 from dback2/rotationRingSize
Edit handle rotation ring size
|
2018-08-10 13:53:10 -07: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 |
|