Cristian Luis Duarte
|
1bfd6fe97d
|
Android - People - Sliding panel (for users actions)
|
2018-08-13 20:32:45 -03:00 |
|
Cristian Luis Duarte
|
b381a182bd
|
Android - People - add padding to list
|
2018-08-13 14:31:20 -03:00 |
|
Cristian Luis Duarte
|
610306c49c
|
Android - People - add friend star
|
2018-08-10 19:02:01 -03:00 |
|
Cristian Luis Duarte
|
b65f2d46a6
|
Android - People - Letters styling in row
|
2018-08-10 18:18:24 -03:00 |
|
Cristian Luis Duarte
|
ef3ac6bba3
|
Android - Friends - rollback swipe to reveal items
|
2018-08-10 17:36:32 -03:00 |
|
Cristian Luis Duarte
|
d61aaa3bd7
|
Android - People - Round profile image
|
2018-08-10 14:16:44 -03:00 |
|
Cristian Luis Duarte
|
60338f9899
|
Android - People - Swipe to reveal delete + layout adaptations for design
|
2018-08-09 17:54:07 -03:00 |
|
Cristian Luis Duarte
|
1a261bea04
|
Android - People screen renaming
|
2018-08-08 15:41:28 -03:00 |
|
Cristian Luis Duarte
|
efdafc2a8f
|
Merge remote-tracking branch 'hifi/master' into android_friends_main
|
2018-08-06 16:07:44 -03:00 |
|
John Conklin II
|
00a8b73814
|
Merge pull request #13751 from danteruiz/fix-flying
fix flying
|
2018-08-03 19:27:47 -07:00 |
|
Dante Ruiz
|
9bebd1e623
|
making changes
|
2018-08-03 18:11:55 -07:00 |
|
John Conklin II
|
3a6a72a079
|
Merge pull request #13643 from SimonWalton-HiFi/user-setting-hmac
Add DS option to disable HMAC packet authentication
|
2018-08-03 17:45:32 -07:00 |
|
MiladNazeri
|
a7a8214983
|
Merge pull request #13637 from ctrlaltdavid/M08513-a
Audio API JSDoc
|
2018-08-03 16:38:03 -07:00 |
|
Dante Ruiz
|
f30b552e19
|
fix-flying
|
2018-08-03 15:50:11 -07:00 |
|
Sam Gateau
|
aac4ff0b7e
|
Merge pull request #13749 from samcake/punk
Fix the other avatars not being removed when Avatar mixer reset
|
2018-08-03 15:37:13 -07:00 |
|
Sam Gateau
|
c1951da2bb
|
Merge pull request #13737 from jherico/fix/fb16633_a
Don't allow Web surfaces created by non-client scripts to access files
|
2018-08-03 15:25:41 -07:00 |
|
John Conklin II
|
243bd5ea69
|
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
|
2018-08-03 13:32:11 -07:00 |
|
David Rowe
|
fdd6b7e07b
|
Delete erroneous merge file
|
2018-08-04 07:29:57 +12:00 |
|
David Rowe
|
2270255d88
|
JSDoc review
|
2018-08-04 07:22:12 +12:00 |
|
Bradley Austin Davis
|
8e9c1e5c0a
|
Fix out of date comment
|
2018-08-03 11:38:39 -07:00 |
|
Sam Gateau
|
2013f1bd33
|
Merge pull request #13732 from AndrewMeadows/other-avatar-physics
reduce physics simulation cost of other-avatars
|
2018-08-03 09:33:59 -07:00 |
|
Sam Gateau
|
da252a70c1
|
Same as https://github.com/highfidelity/hifi/pull/13747
|
2018-08-03 09:22:29 -07:00 |
|
Cristian Luis Duarte
|
37d84dc275
|
Merge remote-tracking branch 'hifi/master' into android_friends_main
|
2018-08-03 11:04:50 -03:00 |
|
David Rowe
|
32e3bb0e1d
|
Merge branch 'master' into M08513-a
# Conflicts:
# libraries/audio/src/SoundCache.h
|
2018-08-03 10:29:32 +12:00 |
|
Zach Fox
|
41b804a5dd
|
Merge pull request #13738 from zfox23/MS17215_newEarlyFetchLogic
Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present
|
2018-08-02 09:39:37 -07:00 |
|
Simon Walton
|
88fafc7a1f
|
Merge pull request #13704 from SimonWalton-HiFi/delay-physics
Enable physics after ES indicates all nearby entities received
|
2018-08-01 18:15:00 -07:00 |
|
Andrew Meadows
|
e336c9276d
|
first set shape THEN use it
|
2018-08-01 17:39:57 -07:00 |
|
Simon Walton
|
6f1487bbf8
|
Don't explicitly use data method of shared node pointer
|
2018-08-01 17:11:26 -07:00 |
|
Simon Walton
|
d7a49ee594
|
Merge pull request #13622 from SimonWalton-HiFi/ac-monitor-resources
Raise POSIX descriptor-limit in AC Monitor if necessary
|
2018-08-01 17:07:33 -07:00 |
|
Zach Fox
|
67528cb646
|
Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present
|
2018-08-01 15:49:53 -07:00 |
|
Brad Davis
|
4b317a84d8
|
Don't allow Web surfaces created by non-client scripts to access files
|
2018-08-01 15:12:45 -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 |
|
Andrew Meadows
|
bd6f00e707
|
eliminate angular dynamics of other-avatars
|
2018-08-01 11:58:52 -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 |
|
Andrew Meadows
|
c939699879
|
ignore other-avatar angularVelocity in physics simulation
|
2018-08-01 11:22:58 -07:00 |
|
Andrew Meadows
|
0d92e2de0a
|
remove bits from other-avatar collision mask
|
2018-08-01 11:21:54 -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 |
|
Simon Walton
|
9d42a6e08f
|
Change method name per coding standards
|
2018-08-01 10:37:28 -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 |
|
Simon Walton
|
b18c1f0e1e
|
Use defined value for invalid sequence number
|
2018-08-01 10:10:45 -07: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 |
|