David Back
|
0b9e520b53
|
fix grab cloning parented entitiy
|
2018-08-01 16:00:25 -07:00 |
|
Zach Fox
|
7905c91289
|
Merge pull request #13727 from zfox23/MS17168_filterWhenViewing
Fix MS17168: Filter My Purchases when clicking View link on Confirmation
|
2018-08-01 14:23:26 -07:00 |
|
John Conklin II
|
e321ee0cb6
|
Merge pull request #13721 from misslivirose/tutorial-rc-70
Update bubble context for RC 71
|
2018-08-01 13:14:24 -07:00 |
|
John Conklin II
|
f02e91806c
|
Merge pull request #13686 from huffman/fix/undo-create-entity
Fix added entities not being undoable in Create
|
2018-08-01 13:11:17 -07:00 |
|
John Conklin II
|
c444bb11ba
|
Merge pull request #13668 from ElderOrb/base_bluebuttons_on_uit
Avatarapp: base 'SquareLabel' on button from Uit
|
2018-08-01 13:10:33 -07:00 |
|
John Conklin II
|
fd1a431729
|
Merge pull request #13689 from ctrlaltdavid/M15244
Move scriptable caches' APIs into scripting interfaces
|
2018-08-01 11:50:13 -07:00 |
|
John Conklin II
|
082a3bca89
|
Merge pull request #13679 from ElderOrb/FB16840
FB16840 - Qml spinboxes in UI toolkit should focus the underlying fie…
|
2018-08-01 11:46:59 -07:00 |
|
John Conklin II
|
fcf32dbc6b
|
Merge pull request #13642 from ctrlaltdavid/M13352
Fix HMD.mountedChanged() API signal
|
2018-08-01 11:28:11 -07:00 |
|
John Conklin II
|
bda9ed7f1a
|
Merge pull request #13680 from ElderOrb/adjust_wearables_button_fix
use 'light' color scheme
|
2018-08-01 11:23:10 -07:00 |
|
John Conklin II
|
c67ef57ad3
|
Merge pull request #13713 from hyperlogic/bug-fix/leg-ik-bug-fixes-master
Leg IK fixes
|
2018-08-01 11:17:10 -07:00 |
|
John Conklin II
|
7a635b6a57
|
Merge pull request #13709 from thoys/fix/require-load-queue
MS17041: Fix for require fail when the same script loaded simultaneously from another entity script
|
2018-08-01 11:15:32 -07:00 |
|
Thijs Wenker
|
50dfb4dd55
|
Merge pull request #13681 from ctrlaltdavid/M19690
Fix ParticleEffect entity JSDoc
|
2018-08-01 19:31:54 +02:00 |
|
Thijs Wenker
|
c562a6945d
|
Merge pull request #13671 from huffman/fix/create-copy-follows-user
Fix duplication not working as expected on grabbed entities
|
2018-08-01 19:25:33 +02:00 |
|
David Back
|
1b031ff065
|
Merge pull request #13703 from dback2/editHandleTriggerValues
Edit handles trigger fixes
|
2018-08-01 10:00:16 -07:00 |
|
Ryan Huffman
|
6369cee0d1
|
Fix added entities not being undoable in Create
|
2018-08-01 09:40:29 -07:00 |
|
Anthony J. Thibault
|
fd780845bb
|
Code review feedback
|
2018-07-31 18:25:04 -07:00 |
|
David Back
|
e8068fea0a
|
block selecting overlays with other hand
|
2018-07-31 17:18:35 -07:00 |
|
Liv Erickson
|
acf1afea01
|
fix audio files playing swapped input, trying to amplify audio playback
|
2018-07-31 15:41:59 -07:00 |
|
Thijs Wenker
|
003e826d60
|
move over definition so it could be linked in the assignment-client too
|
2018-08-01 00:23:34 +02:00 |
|
Zach Fox
|
4b41804326
|
Fix MS17168: Filter My Purchases when clicking View link on Confirmation
|
2018-07-31 14:52:01 -07:00 |
|
Ryan Huffman
|
bbdc7ba380
|
Fix Uuid null comparison and dangling comma in Create tool
|
2018-07-31 13:57:27 -07:00 |
|
Thijs Wenker
|
74343c71d8
|
CR fixes
|
2018-07-31 22:29:53 +02:00 |
|
Alexander Ivash
|
6e6eae2160
|
Avatarapp: base 'SquareLabel' on button from Uit
|
2018-07-31 22:03:34 +03:00 |
|
David Back
|
ad9ec26781
|
print
|
2018-07-31 11:53:17 -07:00 |
|
David Back
|
7bf7663f09
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-31 11:51:26 -07:00 |
|
David Back
|
4a722a62f7
|
use click handler only, remove triggerClicked
|
2018-07-31 11:51:16 -07:00 |
|
Ryan Huffman
|
431cbf2694
|
Merge pull request #13699 from thoys/fix/create/triggerable
MS16809: handle both triggerable and wantsTrigger in CreateApp
|
2018-07-31 10:34:31 -07:00 |
|
John Conklin II
|
09d1964f1d
|
Merge pull request #13670 from ElderOrb/animate_get_more_avatars
Avatarapp: hover animation for 'get more avatars' button
|
2018-07-31 09:51:58 -07:00 |
|
John Conklin II
|
16940cc9b7
|
Merge pull request #13716 from r3tk0n/17170-flying-crash
Remove deprecated flying setting from MyAvatar.cpp saveData()
|
2018-07-31 09:48:01 -07:00 |
|
David Back
|
93335feba1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-31 09:46:57 -07:00 |
|
John Conklin II
|
8e277758ad
|
Merge pull request #13700 from danteruiz/fix-grabbing-problem
Impove the way we checkForChildTooFarAway in nearParentGrabEntity.js
|
2018-07-31 09:46:57 -07:00 |
|
Seth Alves
|
4ff9252b47
|
Merge pull request #13718 from jherico/fix/fb15963
Support rendering of 'about' URLs in web entities
|
2018-07-31 09:44:31 -07:00 |
|
John Conklin II
|
221dd3ee88
|
Merge pull request #13673 from ElderOrb/avatarapp-update-messageboxes
FB16992 - Layout changes to the two lightboxes in the Avatar app
|
2018-07-31 09:36:16 -07:00 |
|
David Back
|
03f0116b79
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-31 09:28:14 -07:00 |
|
Liv Erickson
|
9ec14c1f0d
|
update bubble context for RC 71
|
2018-07-30 18:03:26 -07:00 |
|
Seth Alves
|
1b47d3f274
|
Merge pull request #13717 from highfidelity/revert-13577-invisibleWebEntities
Revert "Allow empty web entities to be rendered"
|
2018-07-30 15:24:17 -07:00 |
|
John Conklin II
|
bd2ab38bfe
|
Merge pull request #13701 from ElderOrb/FB16702
FB16702 - Avatar App does not save Animation JSON Override URL
|
2018-07-30 14:51:32 -07:00 |
|
John Conklin II
|
6d7116fad7
|
Merge pull request #13676 from thoys/fix/api/agent
MS15184: Remove deprecated functions in Agent API
|
2018-07-30 14:48:10 -07:00 |
|
John Conklin II
|
200292c18e
|
Merge pull request #13675 from howard-stearns/forget-you
pal refresh fixes
|
2018-07-30 14:38:24 -07:00 |
|
David Rowe
|
b36b981b55
|
Merge branch 'master' into M19690
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
|
2018-07-31 08:41:32 +12:00 |
|
David Back
|
b420ef8cf2
|
fix trigger clicks on vive
|
2018-07-30 13:21:09 -07:00 |
|
Anthony J. Thibault
|
58f95bd07b
|
assert fix
|
2018-07-30 13:14:32 -07:00 |
|
David Back
|
bec54cc182
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-30 12:26:48 -07:00 |
|
Brad Davis
|
c991053c93
|
Support rendering of 'about' URLs in web entities
|
2018-07-30 11:56:31 -07:00 |
|
Seth Alves
|
a6aaa71d02
|
Revert "Allow empty web entities to be rendered"
|
2018-07-30 11:54:52 -07:00 |
|
Anthony J. Thibault
|
6a6ece8910
|
Warning fixes and whitespace cleanup
|
2018-07-30 11:49:44 -07:00 |
|
r3tk0n
|
63de16bac5
|
Remove deprecated flying setting from MyAvatar.cpp saveData()
|
2018-07-30 11:40:15 -07:00 |
|
Anthony J. Thibault
|
401995fb06
|
Leg IK fixes
Fixes for raising legs and sometimes squatting while in HMD mode.
|
2018-07-30 10:55:52 -07:00 |
|
Sam Gondelman
|
8201997a16
|
Merge pull request #13660 from SamGondelman/parabolic
Parabolic Picking + Pointers
|
2018-07-30 10:49:02 -07:00 |
|
Thijs Wenker
|
d486a0721d
|
Merge pull request #13698 from dback2/resetPropertiesNoSelection
Reset entity property fields when no selection
|
2018-07-30 19:37:12 +02:00 |
|