Commit graph

70132 commits

Author SHA1 Message Date
Thijs Wenker
9dce1b64b6
Merge pull request #13695 from huffman/fix/create-focus-on-create
Fix edit.js not being able to delete after creating entity
2018-07-27 22:43:34 +02:00
John Conklin II
021e09d083
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash
fix a crash when grabbing a non-dynamic entity with an overlay child
2018-07-27 12:49:14 -07:00
John Conklin II
a1f9d87437
Merge pull request #13705 from ctrlaltdavid/M17068
Maintain virtual and real world orientations when teleport
2018-07-27 12:44:22 -07:00
John Conklin II
9770331259
Merge pull request #13687 from danteruiz/fix-script-memory-issue
Fix ScriptEngine begin held onto after script stopped runnning
2018-07-27 12:31:31 -07:00
John Conklin II
d4cbbfe4c1
Merge pull request #13692 from amantley/leanBackSittingFix
Fix For Unnatural Hips Behaviour When Sitting In HMD
2018-07-27 12:30:31 -07:00
Seth Alves
91d509f5a4 fix a crash when grabbing a non-dynamic entity with an overlay child 2018-07-27 10:35:26 -07:00
Sam Gateau
a95ddb0492
Merge pull request #13616 from AndrewMeadows/remove-cruft-001
remove cruft for rendering collision shapes
2018-07-27 19:19:44 +02:00
Seth Alves
41af82a7f6
Merge pull request #13702 from r3tk0n/17016-flying-settings
17016 flying settings
2018-07-27 10:07:13 -07:00
Sam Gondelman
3284f7b9d6
Merge pull request #13654 from huffman/fix/mirror-mode-create
Fix computePickRay when in mirror mode
2018-07-27 09:05:58 -07:00
David Rowe
3bfdd3ff58 Maintain virtual and real world orientations when teleport 2018-07-27 15:18:40 +12:00
r3tk0n
f3d0d9b4a0 Clean up garbage comments. 2018-07-26 15:37:42 -07:00
r3tk0n
f8c611b1d0 Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp 2018-07-26 15:35:12 -07:00
amantley
12cb212dc7 used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards 2018-07-26 12:05:17 -07:00
Anthony Thibault
6c92949aed
Merge pull request #13672 from luiscuenca/fixElbowPoleVector
Redesign and enable hand's Pole Vectors for elbow simulation
2018-07-26 11:51:33 -07:00
John Conklin II
5efd981ecd
Merge pull request #13693 from NissimHadar/bug16943
Corrects loading of texture and default visibility.
2018-07-26 09:10:55 -07:00
NissimHadar
ce53b44b02 CR comments. 2018-07-25 15:58:46 -07:00
Zach Fox
cc921ed9c4
Merge pull request #13685 from zfox23/MS16820_rateLimitPolaroids
Fix MS16820: Rate limit Snapshot Polaroids
2018-07-25 15:45:51 -07:00
Ryan Huffman
0e0966004c Fix edit.js not being able to delete after creating entity
This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'
2018-07-25 14:52:56 -07:00
John Conklin II
21d043d179
Merge pull request #13534 from huffman/fix/ess-avatar-entities
Fix crash when editing avatar entities with no myAvatar
2018-07-25 14:21:12 -07:00
NissimHadar
630df7c233 Corrects loading of texture and default visibility. 2018-07-25 13:28:23 -07:00
John Conklin II
89e7e3b938
Merge pull request #13682 from zfox23/MS16704_removeWearableAvatar
Fix MS16704: Remove worn Avatar/Wearable before updating
2018-07-25 12:12:50 -07:00
amantley
85b7a9b67c added the changes committed to the hot fix rc70.1 in AvatarConstants.h 2018-07-25 11:31:02 -07:00
John Conklin II
6a491d1ac6
Merge pull request #13690 from danteruiz/fix-audio-hmd-issue
Fix audio page being set to desktop when starting in HMD.
2018-07-25 10:53:29 -07:00
amantley
37540c79b3 removed print statement and added const upper leg fraction 2018-07-25 10:51:19 -07:00
amantley
c5599623f7 added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting 2018-07-25 10:29:29 -07:00
Dante Ruiz
a21a475784 Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-hmd-issue 2018-07-25 08:44:28 -07:00
Dante Ruiz
8da1db31df fix audio page being in desktop when your in HMD 2018-07-25 08:44:11 -07:00
John Conklin II
1a732f9c8f
Merge pull request #13684 from ElderOrb/FB17036
FB17036 Avatar App causes error on cache reload (CTRL+R)
2018-07-25 08:03:02 -07:00
Dante Ruiz
b750a005cf fix script memory issue 2018-07-24 16:31:12 -07:00
Stephen Birarda
0cd5a24233
Merge pull request #13677 from birarda/bug/no-socket-error-string
remove thread-unsafe socket errorString call
2018-07-24 16:16:25 -07:00
Zach Fox
04754d0dab Fix MS16820: Rate limit Snapshot Polaroids 2018-07-24 15:28:37 -07:00
Alexander Ivash
6db46e84ff FB17036 Avatar App causes error on cache reload (CTRL+R) 2018-07-25 01:11:26 +03:00
Zach Fox
eea4630d2b Fix MS16704: Remove worn Avatar/Wearable before updating 2018-07-24 14:29:05 -07:00
John Conklin II
fe5b13b781
Merge pull request #13636 from gcalero/android_audio_fixes2
Android audio fixes
2018-07-24 13:02:56 -07:00
Stephen Birarda
8224492d72 avoid thread-unsafe socket errorString call 2018-07-24 12:24:01 -07:00
John Conklin II
99c26e6363
Merge pull request #13674 from r3tk0n/16984-CompositorHelper
Added _aboutToQuit guard on eventFilter()
2018-07-24 11:37:19 -07:00
Gabriel Calero
f24cfebe88 Revert "Add logs to debug. Revert later"
This reverts commit 3c49e7783c.
2018-07-24 14:57:48 -03:00
Thijs Wenker
b7d12c6b1c
Merge pull request #13656 from huffman/fix/create-selection-box
Fix the Create selection box not always matching outline
2018-07-24 19:49:20 +02:00
luiscuenca
e7d70a832d Pole Vectors always calculated when arms are crossed 2018-07-24 08:58:17 -07:00
luiscuenca
8f547d9bdd fix warnings 2018-07-23 16:37:25 -07:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix
FB16870: Avatar Wearables showing incorrect number
2018-07-23 15:55:11 -07:00
luiscuenca
94bb8fc917 More unused code 2018-07-23 15:29:42 -07:00
John Conklin II
27b35d84cc
Merge pull request #13652 from r3tk0n/16206-flying-settings
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
2018-07-23 15:19:46 -07:00
Sam Gondelman
f1a2fe2927
Merge pull request #13667 from Cristo86/android_crash_back_from_domain_fix
Android - fix crash when returning from a Domain back to Home
2018-07-23 14:46:24 -07:00
luiscuenca
4a27189913 function consistancy 2018-07-23 14:27:55 -07:00
MuteTab
52e5bdb360 Added _aboutToQuit guard on eventFilter() 2018-07-23 14:27:38 -07:00
luiscuenca
2adb334034 unused code deleted 2018-07-23 14:25:30 -07:00
Clément Brisset
a375ea8bd6
Merge pull request #13634 from SimonWalton-HiFi/systray-go-home
Windows System-tray wording change
2018-07-23 13:28:52 -07:00
luiscuenca
9d2d7c3aa4 Redesign and enable hand's Pole Vectors for elbow simulation 2018-07-23 13:16:11 -07:00
Howard Stearns
49d9d61425
Merge pull request #13305 from howard-stearns/personal-space-bubble-off-for-new-users
Personal space bubble is defaulted off for now for new users
2018-07-23 12:29:00 -07:00