NissimHadar
|
2f4f0b8d80
|
Working on Mac installation of nitpick.
|
2019-01-11 14:46:02 -08:00 |
|
NissimHadar
|
d0d411da20
|
Corrected comments
|
2019-01-11 14:26:37 -08:00 |
|
NissimHadar
|
111670556f
|
Added NITPICK_INSTALLER_DIR
|
2019-01-11 14:25:46 -08:00 |
|
NissimHadar
|
fa5a0415c1
|
Updated for Mac
|
2019-01-11 14:24:22 -08:00 |
|
NissimHadar
|
9a8b33eb96
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnWindows
|
2019-01-11 09:10:56 -08:00 |
|
Shannon Romano
|
4845220d16
|
Merge pull request #14682 from roxanneskelly/Case20377
Bulk Avatar Traits related ack data was not reset in certain cases when it should be
|
2019-01-10 20:15:52 -08:00 |
|
NissimHadar
|
524a8e54e0
|
Can create nitpick installer.
|
2019-01-10 15:37:23 -08:00 |
|
NissimHadar
|
331cc21ef1
|
Updated Install section to be clearer.
|
2019-01-10 12:12:13 -08:00 |
|
Roxanne Skelly
|
df97ca57b4
|
Bulk Avatar Traits related ack data was not reset when avatars were
ignored, etc.
|
2019-01-10 12:04:48 -08:00 |
|
John Conklin II
|
83cb60f46f
|
Merge pull request #14621 from birarda/feat/message-cycle-cap
cap the number of considered message channels in PacketQueue
|
2019-01-09 17:43:36 -08:00 |
|
John Conklin II
|
816de0d684
|
Merge pull request #14672 from SimonWalton-HiFi/avatar-mixer-entities-stats
Track avatar-mixer send-stats with finer granularity
|
2019-01-09 17:14:51 -08:00 |
|
Simon Walton
|
1245abbb53
|
Merge branch 'master' into avatar-mixer-entities-stats
|
2019-01-09 16:07:26 -08:00 |
|
John Conklin II
|
2757590158
|
Merge pull request #14633 from roxanneskelly/Case20377
Trait-level flow control
|
2019-01-09 15:57:13 -08:00 |
|
Shannon Romano
|
87f966773c
|
Merge pull request #14601 from SimonWalton-HiFi/reliable-service-min-timeout
Set minimum timeout for retransmits within reliable network service
|
2019-01-09 15:35:40 -08:00 |
|
John Conklin II
|
e4abb66199
|
Merge pull request #14627 from AndrewMeadows/fewer-avatar-entity-updates
case 20304: please don't flood the avatar-mixer with unnecessary AvatarEntity udpates
|
2019-01-09 14:55:23 -08:00 |
|
Simon Walton
|
5bcdf143b9
|
Add per-destination-avatar traits-rate stats
|
2019-01-09 13:45:07 -08:00 |
|
NissimHadar
|
c327ba8f36
|
Removed file that shouldn't be under configuration control.
|
2019-01-09 13:43:40 -08:00 |
|
NissimHadar
|
e5989056c1
|
Updated Installer readme for Windows.
|
2019-01-09 13:43:08 -08:00 |
|
birarda
|
3c6b7e3bd0
|
add a cap to cycled message channels in SendQueue
|
2019-01-09 13:06:30 -08:00 |
|
John Conklin II
|
100c88e800
|
Merge pull request #14669 from kencooke/audio-mixer-mastergain-solo-fix
Apply master volume to audio streams when solo is active
|
2019-01-09 12:03:02 -08:00 |
|
Simon Walton
|
cb6b86a236
|
Tweak web display
|
2019-01-09 09:36:17 -08:00 |
|
Simon Walton
|
73d688610f
|
Track stats for total AvatarData bytes, traits bytes and identity bytes
|
2019-01-08 18:33:00 -08:00 |
|
Jamil Akram
|
39f4af505c
|
Merge pull request #14671 from SamGondelman/lightFix
Case 20534: Fix light crash
|
2019-01-08 14:43:11 -08:00 |
|
Jamil Akram
|
ce05dcd59e
|
Merge pull request #14670 from thoys/feat/create/textEntityAddMissingProperties
MS20150: add missing Text properties to Create App
|
2019-01-08 13:02:38 -08:00 |
|
SamGondelman
|
928ea55d95
|
fix light crash?
|
2019-01-08 11:47:28 -08:00 |
|
Thijs Wenker
|
24022f0ccc
|
add missing Text properties to Create App
|
2019-01-08 20:38:31 +01:00 |
|
Roxanne Skelly
|
910c359443
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
|
2019-01-08 10:50:45 -08:00 |
|
Roxanne Skelly
|
0297d337d5
|
Add some comments as per CR request
|
2019-01-08 10:50:16 -08:00 |
|
Ken Cooke
|
963269f3f6
|
Apply master volume to audio streams when solo is active
|
2019-01-08 10:50:11 -08:00 |
|
John Conklin II
|
00a9367f14
|
Merge pull request #14662 from dback2/addGridEntitiesToCreate
Add grid entities to create
|
2019-01-08 10:12:34 -08:00 |
|
Jamil Akram
|
4c6b14bf72
|
Merge pull request #14642 from dback2/propertyRangeAudit
Entity property range/step audit
|
2019-01-08 09:42:59 -08:00 |
|
John Conklin II
|
ed4f2d9c10
|
Merge pull request #14439 from AndrewMeadows/shaped-zones
Case 15518: shaped zones
|
2019-01-08 09:06:45 -08:00 |
|
David Back
|
0791443c5c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit
|
2019-01-07 18:29:36 -08:00 |
|
David Back
|
d9e229d38e
|
remove add Grid entity button, fix color
|
2019-01-07 18:20:20 -08:00 |
|
David Back
|
90e2feb977
|
replace placeholder icon with real icon from Alan
|
2019-01-07 18:20:20 -08:00 |
|
David Back
|
7581c77be8
|
update tooltips, use Cube icon for now
|
2019-01-07 18:20:20 -08:00 |
|
David Back
|
e0e9a7de15
|
tabs
|
2019-01-07 18:20:20 -08:00 |
|
David Back
|
9013eee352
|
add grid entities to create - icons pending
|
2019-01-07 18:20:19 -08:00 |
|
Roxanne Skelly
|
d54fec4476
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
|
2019-01-07 18:17:40 -08:00 |
|
Antonina Savinova
|
a9bec719d6
|
Merge pull request #14668 from SamGondelman/crashFix
Fix crash
|
2019-01-07 18:16:33 -08:00 |
|
SamGondelman
|
f60b272f11
|
fix crash
|
2019-01-07 17:24:07 -08:00 |
|
Sam Gondelman
|
2c0b2e13ab
|
Merge pull request #14665 from SamGondelman/exportFix
Case 20533: Fix export entities
|
2019-01-07 15:47:01 -08:00 |
|
David Back
|
84b2a7d474
|
Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit
|
2019-01-07 15:42:02 -08:00 |
|
Sam Gondelman
|
1fe62ecb10
|
Merge pull request #14657 from SamGondelman/propFix
Case 20504: Trying to fix avatar entity issue
|
2019-01-07 15:37:52 -08:00 |
|
David Back
|
3aa245036b
|
Merge branch 'master' into propertyRangeAudit
|
2019-01-07 15:36:18 -08:00 |
|
John Conklin II
|
edd329c601
|
Merge pull request #14663 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch
MS20142 - CreateApp - Fix active colorPicker to update on selection update
|
2019-01-07 15:00:36 -08:00 |
|
Sam Gondelman
|
db3187ec6c
|
Merge branch 'master' into propFix
|
2019-01-07 14:57:38 -08:00 |
|
Adam Smith
|
7e75ed5daa
|
Merge pull request #14586 from SamGondelman/NOverlays8
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
|
2019-01-07 14:53:27 -08:00 |
|
SamGondelman
|
791257bd0a
|
convert old created to quint
|
2019-01-07 14:17:01 -08:00 |
|
SamGondelman
|
62dbca6ce7
|
fix export entities
|
2019-01-07 14:08:52 -08:00 |
|