Dante Ruiz
|
af97c7275e
|
Use loadQMlSource if no stack is aviable
|
2017-03-23 17:03:24 +01:00 |
|
Triplelexx
|
09cbace975
|
remove unused getBodyForwardDirection
|
2017-03-22 21:54:21 +00:00 |
|
Brad Davis
|
85c80f3be8
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
|
2017-03-22 14:25:23 -07:00 |
|
trent
|
36619cd2e4
|
Fixed issue with duplicate physics status icons per sub-object.
|
2017-03-22 15:07:29 -04:00 |
|
Triplelexx
|
fd312f6bf8
|
rename fronts to forwards
|
2017-03-22 18:49:34 +00:00 |
|
Dante Ruiz
|
3a89654111
|
saving work
|
2017-03-22 19:14:53 +01:00 |
|
Triplelexx
|
8df0395754
|
change getFrontDirection to getForwardDirection
|
2017-03-21 22:28:12 +00:00 |
|
Triplelexx
|
b7980569cc
|
change all references of IDENTITY_FRONT to IDENTITY_FORWARD
|
2017-03-21 22:13:33 +00:00 |
|
Seth Alves
|
91cac892d2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 14:04:58 -07:00 |
|
Chris Collins
|
4c789c44aa
|
Merge pull request #9922 from birarda/bug/stuck-ess
fix a couple of ESS issues during ES/ESS restart
|
2017-03-21 12:44:53 -07:00 |
|
Seth Alves
|
1da6349505
|
merge from upstream
|
2017-03-21 10:26:02 -07:00 |
|
Ryan Huffman
|
13222468e3
|
Merge pull request #9712 from huffman/feat/edit-particle-icon
Add particle system overlay in edit.js
|
2017-03-21 10:02:52 -07:00 |
|
Seth Alves
|
cc4ddd1387
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 08:43:35 -08:00 |
|
Chris Collins
|
ea13151d55
|
Merge pull request #9945 from mnafees/21233
21233: Remove Scripts Editor option from Edit menu and all related files
|
2017-03-21 08:01:36 -07:00 |
|
Vladyslav Stelmakhovskyi
|
fb0adae0b1
|
Scripts debug window in Tablet UI
|
2017-03-21 15:04:38 +01:00 |
|
Zach Pomerantz
|
20ea13e00a
|
Merge pull request #9897 from zzmp/record/noise-gate
Add AudioNoiseGate to recordings played through Interface
|
2017-03-21 00:21:20 -04:00 |
|
Brad Davis
|
e482eac437
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
|
2017-03-20 16:22:13 -07:00 |
|
Vladyslav Stelmakhovskyi
|
cedc3cf8b6
|
Fix naming. Move variable instantiation within scope
|
2017-03-20 23:43:01 +01:00 |
|
Stephen Birarda
|
a4d72c4e67
|
make AudioScriptingInterface a Dependency
|
2017-03-20 13:40:15 -07:00 |
|
Zach Fox
|
6c4b23195b
|
One-line warning fix...I swear I've done this before
|
2017-03-20 13:26:50 -07:00 |
|
Zach Fox
|
0506fc0033
|
New goTo() behavior; Fix goBack
|
2017-03-20 12:55:38 -07:00 |
|
Vladyslav Stelmakhovskyi
|
13cd500c2e
|
Make runningscripts able to open even if there is no scripts running
|
2017-03-20 20:46:37 +01:00 |
|
Brad Hefta-Gaub
|
bc5d7d8698
|
Merge pull request #9851 from AndrewMeadows/simulation-ownership-2
zero velocity of deactivated dynamic entities
|
2017-03-20 10:20:11 -07:00 |
|
Brad Hefta-Gaub
|
af790d8474
|
Merge pull request #9875 from birarda/bug/spin-strafe
fix double snap turn strafing
|
2017-03-20 10:08:05 -07:00 |
|
Chris Collins
|
af2748410d
|
Merge pull request #9932 from Triplelexx/21231
21231 - Remove About Interface from File menu
|
2017-03-20 09:55:57 -07:00 |
|
Chris Collins
|
509057c6d8
|
Merge pull request #9941 from Triplelexx/21232
21232 - Remove Mini Mirror from View menu
|
2017-03-20 09:55:37 -07:00 |
|
Chris Collins
|
ed27c550af
|
Merge pull request #9939 from ctrlaltdavid/21237
Disable Developer > Assets > ATP Asset Migration menu item
|
2017-03-20 06:29:33 -07:00 |
|
Chris Collins
|
2e6291f470
|
Merge pull request #9929 from ctrlaltdavid/21235
Replace Developer > Network > Disk cache editor with menu action
|
2017-03-20 06:26:36 -07:00 |
|
Seth Alves
|
424af2255b
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-19 21:17:30 -08:00 |
|
Mohammed Nafees
|
3612b9fccc
|
Remove Edit > Scripts Editor and all related source files
|
2017-03-20 00:25:50 -04:00 |
|
Vladyslav Stelmakhovskyi
|
696825580e
|
Merge branch 'tablet-ui' into tablet-ui-login-logout
|
2017-03-18 14:42:11 +01:00 |
|
Vladyslav Stelmakhovskyi
|
5e162a6447
|
Implemented login facility for tablet UI
|
2017-03-18 14:38:49 +01:00 |
|
Triplelexx
|
8e086a8fc8
|
fix build error
|
2017-03-18 03:51:55 +00:00 |
|
Triplelexx
|
a9b1a38665
|
remove Mini Mirror from View menu
Avatar inputs only contains the audio meter now.
|
2017-03-18 00:53:13 +00:00 |
|
David Rowe
|
ab7d82edb6
|
Use #ifdef instead of comment
|
2017-03-18 12:56:34 +13:00 |
|
David Rowe
|
38bb48e72c
|
Disable Developer > Assets > ATP Asset Migration menu item
|
2017-03-18 12:13:13 +13:00 |
|
David Rowe
|
e3b9d588ec
|
Merge branch 'master' into 21235
# Conflicts:
# interface/src/Menu.cpp
# interface/src/ui/DialogsManager.h
|
2017-03-18 09:42:36 +13:00 |
|
Brad Hefta-Gaub
|
a75acd139b
|
Merge pull request #9885 from sethalves/model-scripting
Model scripting
|
2017-03-17 13:13:17 -07:00 |
|
Triplelexx
|
eba6c8de5e
|
remove About Interface from File menu
|
2017-03-17 17:37:19 +00:00 |
|
Andrew Meadows
|
60e0eb0cf9
|
Merge pull request #9917 from Atlante45/fix/sit
Cancel Avatar velocity when sitting down.
|
2017-03-17 10:04:25 -07:00 |
|
Atlante45
|
698791295a
|
Expose DriveKeys enum to JS
|
2017-03-16 20:03:27 -07:00 |
|
David Rowe
|
939b4f1612
|
Remove Developer > Network > Disk Cache Editor menu item and dialog
|
2017-03-17 13:49:09 +13:00 |
|
Atlante45
|
5a1ce4bb05
|
CR
|
2017-03-16 17:46:47 -07:00 |
|
Atlante45
|
9155cc6334
|
Fix windows warnings
|
2017-03-16 17:44:56 -07:00 |
|
David Rowe
|
e21d7d9edf
|
Add Developer > Network > Clear Disk Cache menu action
|
2017-03-17 13:34:11 +13:00 |
|
David Rowe
|
dc71f502f0
|
Delete Developer > Network > RAM Caches Size menu item and dialog
|
2017-03-17 13:09:06 +13:00 |
|
Seth Alves
|
a5d19439f9
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-16 16:32:07 -07:00 |
|
Atlante45
|
42316e713d
|
CR drive keys
|
2017-03-16 16:24:52 -07:00 |
|
Atlante45
|
3e9474e878
|
CR
|
2017-03-16 16:24:36 -07:00 |
|
Atlante45
|
7517f224a8
|
Add MyAvatar drive keys capture capability
|
2017-03-16 15:44:17 -07:00 |
|
Zach Fox
|
fc2a501474
|
Cleanup JS<->QML messaging
|
2017-03-16 15:38:39 -07:00 |
|
Andrew Meadows
|
6f4d9bfba3
|
Merge pull request #9858 from kunalgosar/logBolding
Change to Log Font and Formatting
|
2017-03-16 13:09:37 -07:00 |
|
Zach Fox
|
b3821bb02d
|
fix location vs AddressManager woes
|
2017-03-16 12:57:21 -07:00 |
|
Seth Alves
|
eba2417f41
|
Merge pull request #9912 from AndrewMeadows/model-cleanup-4
minor cleanup of render pipeline for models and avatars
|
2017-03-16 10:39:43 -08:00 |
|
kunalgosar
|
e7a16d4294
|
code standard fixes
|
2017-03-16 10:53:35 -07:00 |
|
Zach Fox
|
05fec328c0
|
Make tablet popups work like they should
|
2017-03-16 10:38:46 -07:00 |
|
Seth Alves
|
31e0cfe296
|
Merge pull request #9825 from thoys/record-fixes
Avatar Recorder and Playback Fixes
|
2017-03-16 07:27:42 -08:00 |
|
Andrew Meadows
|
361e03fc78
|
remove unused variable
|
2017-03-15 16:57:31 -07:00 |
|
Seth Alves
|
693aee0628
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
|
2017-03-15 16:54:40 -07:00 |
|
howard-stearns
|
84fd17bd88
|
use location.metaverseServerUrl instead of hardcoded value.
|
2017-03-15 16:33:23 -07:00 |
|
Andrew Meadows
|
d3fa28d4bc
|
remove cruft and fix indentation
|
2017-03-15 16:17:59 -07:00 |
|
howard-stearns
|
155e1b8e85
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-15 15:45:36 -07:00 |
|
Andrew Meadows
|
f250c0d298
|
simpler bindTransform() for ModelMeshPartPayload
|
2017-03-15 14:41:13 -07:00 |
|
Vladyslav Stelmakhovskyi
|
a4c0ce4240
|
Typo fix
|
2017-03-15 22:13:37 +01:00 |
|
Vladyslav Stelmakhovskyi
|
856e15060d
|
Implemented Domain Connection statistics for Tablet UI
|
2017-03-15 21:05:13 +01:00 |
|
Seth Alves
|
b66ff19595
|
prefer-avatar-finger-over-stylus setting now defaults to true
|
2017-03-15 09:51:30 -08:00 |
|
Anthony Thibault
|
495deba771
|
Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races
Fixes for race conditions in DebugDraw
|
2017-03-15 10:38:26 -07:00 |
|
Zach Pomerantz
|
789bb7c855
|
rename audio(Mic)OutboundPPS
|
2017-03-15 13:30:39 -04:00 |
|
Seth Alves
|
c53b0dff93
|
Merge pull request #9891 from druiz17/tablet-xbox-fix
Allow the user to bring up the tablet when a message is open
|
2017-03-15 08:43:28 -08:00 |
|
Seth Alves
|
563d59bda9
|
Merge pull request #9886 from vladest/tablet-ui-entity-statistics
Tablet ui entity statistics
|
2017-03-15 08:40:52 -08:00 |
|
Seth Alves
|
b5919d89a5
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-15 08:26:10 -08:00 |
|
Vladyslav Stelmakhovskyi
|
181c7da51a
|
Fixed warnings
|
2017-03-15 14:55:53 +01:00 |
|
Dante Ruiz
|
45829574c2
|
Allow the user to bring up the tablet when a message is open in the tablet
|
2017-03-15 00:02:42 +01:00 |
|
samcake
|
e0f0cc2102
|
Fix the unsupported ktx format, it was coming from the BUmp map case
|
2017-03-14 15:49:44 -07:00 |
|
Stephen Birarda
|
490cb83489
|
move advanced movement control changes to MyAvatar
|
2017-03-14 15:03:01 -07:00 |
|
Stephen Birarda
|
1fe02477b0
|
fix LX behaviour in snap/advanced/basic
|
2017-03-14 14:21:21 -07:00 |
|
Vladyslav Stelmakhovskyi
|
e2a4011b05
|
Coloring implemented
|
2017-03-14 19:10:41 +01:00 |
|
Vladyslav Stelmakhovskyi
|
56d4bfe077
|
Servers stats added. TODO: coloring
|
2017-03-14 18:38:49 +01:00 |
|
Vladyslav Stelmakhovskyi
|
d9ca8a826d
|
TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats
|
2017-03-14 17:02:09 +01:00 |
|
Vladyslav Stelmakhovskyi
|
99c74cec41
|
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
|
2017-03-14 15:59:27 +01:00 |
|
Vladyslav Stelmakhovskyi
|
ee7dd458ca
|
Merge branch 'tablet-ui' into tablet-ui-graphics
|
2017-03-14 15:37:36 +01:00 |
|
Seth Alves
|
e8a9ff867d
|
merge from upstream
|
2017-03-13 17:57:01 -07:00 |
|
Brad Davis
|
eab91d061d
|
Merge pull request #9868 from zzmp/ktx/local-not-roaming
Use Local for WIN32 FileCache
|
2017-03-13 15:52:11 -07:00 |
|
Anthony J. Thibault
|
efc7fbacb1
|
Bug fix for potential crash when getting DebugDraw::instance
(cherry picked from commit b0ad9a8110)
|
2017-03-13 15:23:10 -07:00 |
|
Ryan Huffman
|
8a1bd781f0
|
Fix overlay findRayIntersection not properly handing multiple drawInFront overlays
|
2017-03-13 14:44:14 -07:00 |
|
Brad Davis
|
3bef5ad528
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
|
2017-03-13 14:30:25 -07:00 |
|
Zach Pomerantz
|
808973d7d2
|
use QStandardPaths instead of hardcoded paths
|
2017-03-13 17:26:42 -04:00 |
|
David Rowe
|
4dd7667fd7
|
Merge branch 'tablet-ui' into 21209
# Conflicts:
# interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
# interface/src/ui/overlays/Web3DOverlay.cpp
|
2017-03-14 08:50:01 +13:00 |
|
Vladyslav Stelmakhovskyi
|
9e9c64021c
|
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
|
2017-03-13 19:54:40 +01:00 |
|
howard-stearns
|
db06c2650f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-13 11:53:48 -07:00 |
|
Andrew Meadows
|
546f32431d
|
Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
Various noise gate, scope, and audio stats improvements
|
2017-03-13 11:52:16 -07:00 |
|
howard-stearns
|
ee3ca736fd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-13 11:51:39 -07:00 |
|
Vladyslav Stelmakhovskyi
|
48db6201e5
|
Basic statistics showed. TODO: servers statistics, coloring, wrapping
|
2017-03-13 19:48:50 +01:00 |
|
Andrew Meadows
|
6e7f4b0418
|
Merge pull request #9829 from ZappoMan/addDoubleClick
Add double click message support to entities and overlays
|
2017-03-13 10:44:54 -07:00 |
|
Zach Fox
|
beb848373b
|
Update from zfox23/PALv2 branch
|
2017-03-13 10:15:06 -07:00 |
|
Seth Alves
|
4f71a5b234
|
Merge pull request #9864 from vladest/tablet-ui-lod-settings
Add LOD settings to Tablet UI
|
2017-03-13 08:59:40 -08:00 |
|
Seth Alves
|
ffd4d1488c
|
Merge pull request #9866 from vladest/tablet-ui-lodtools
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
|
2017-03-13 08:59:06 -08:00 |
|
Vladyslav Stelmakhovskyi
|
49055cfa5c
|
Some statistics showed
|
2017-03-13 16:31:29 +01:00 |
|
Seth Alves
|
b3003acb97
|
Merge pull request #9856 from druiz17/tablet-imporove-dialogs
Bring of menu window if tablet is closed on desktop
|
2017-03-12 12:20:29 -08:00 |
|
Brad Hefta-Gaub
|
a38965d628
|
add more audio stats
|
2017-03-11 09:50:30 -08:00 |
|
Vladyslav Stelmakhovskyi
|
81bc56f124
|
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
|
2017-03-11 14:44:33 +01:00 |
|
Vladyslav Stelmakhovskyi
|
d70943dd6c
|
Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences
|
2017-03-11 12:23:31 +01:00 |
|
Vladyslav Stelmakhovskyi
|
9f7c5a1603
|
Add LOD settings to Tablet UI
|
2017-03-11 11:54:44 +01:00 |
|
David Rowe
|
74839b24a3
|
Merge branch 'tablet-ui' into 21209
|
2017-03-11 15:56:38 +13:00 |
|
Brad Hefta-Gaub
|
6ce50269ac
|
add audio mixer in/out stats to the client stats
|
2017-03-10 18:42:18 -08:00 |
|
Brad Hefta-Gaub
|
aa65f03509
|
fix mac warning and remove accidentally added whitespace
|
2017-03-10 18:14:00 -08:00 |
|
Brad Hefta-Gaub
|
7eb4b8f5f7
|
expose AudioScope to QML
|
2017-03-10 17:38:13 -08:00 |
|
Brad Hefta-Gaub
|
eaea718de1
|
add various scriping interfaces for managing the audio scope and detecting noise gate transitions
|
2017-03-10 17:08:19 -08:00 |
|
Anthony J. Thibault
|
07e10ae862
|
Merge branch 'tablet-ui' into feature/can-touch-this
|
2017-03-10 17:05:26 -08:00 |
|
Dante Ruiz
|
8a973dae3c
|
fixed bring menu dialogs in tablet
|
2017-03-10 23:21:29 +00:00 |
|
David Rowe
|
71713b10f3
|
Merge remote-tracking branch 'upstream/tablet-ui' into 21209
# Conflicts:
# interface/src/ui/overlays/Web3DOverlay.cpp
|
2017-03-11 09:14:06 +13:00 |
|
kunalgosar
|
a974282bdf
|
bolding timestamps on log
|
2017-03-10 11:55:36 -08:00 |
|
Dante Ruiz
|
78da936344
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-imporove-dialogs
|
2017-03-10 19:33:51 +00:00 |
|
Dante Ruiz
|
9b3810814e
|
fiexed putting menu items on the hud when tablet not open when on desktop screen
|
2017-03-10 18:40:18 +00:00 |
|
Seth Alves
|
fffff817a3
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-10 10:20:40 -08:00 |
|
Andrew Meadows
|
8ddcae2a15
|
restore transform of deactivated entities
|
2017-03-09 17:26:53 -08:00 |
|
Andrew Meadows
|
d4abdcb6c8
|
comments, namechange, and temporary debug code
|
2017-03-09 17:26:53 -08:00 |
|
Dante Ruiz
|
c6c0c6d382
|
toolbar becomes visible after taking a snapshot
|
2017-03-09 22:54:22 +00:00 |
|
Anthony J. Thibault
|
d8f04d90a7
|
Merge branch 'master' into feature/can-touch-this
|
2017-03-09 14:24:10 -08:00 |
|
druiz17
|
0069569e96
|
Merge branch 'tablet-ui' into 21197
|
2017-03-09 09:31:15 -08:00 |
|
druiz17
|
8750982567
|
Merge pull request #9785 from druiz17/menuFix
More dialog porting to tablet
|
2017-03-09 09:29:31 -08:00 |
|
Dante Ruiz
|
b58a27cf10
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
|
2017-03-09 16:26:28 +00:00 |
|
Seth Alves
|
9435c58c2c
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1
|
2017-03-08 16:10:38 -08:00 |
|
Seth Alves
|
7f47835733
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-08 16:10:18 -08:00 |
|
David Rowe
|
1fc6d82456
|
Tablet and desktop versions of avatar attachments dialog
|
2017-03-09 13:04:57 +13:00 |
|
Seth Alves
|
28ade45f97
|
make maxFPS a property
|
2017-03-08 15:30:15 -08:00 |
|
Seth Alves
|
ae48dae96f
|
get rid of toggleTabletUI lockout period
|
2017-03-08 15:29:46 -08:00 |
|
Atlante45
|
97c376a09c
|
Revert "avoid unnecessary copy of priority_queue"
This reverts commit e54812430e.
|
2017-03-08 14:08:58 -08:00 |
|
Atlante45
|
188287e345
|
Revert "minor cleanup"
This reverts commit 14e7392a89.
|
2017-03-08 14:08:52 -08:00 |
|
Atlante45
|
9a9f07df71
|
Revert "expand avatar update time budget"
This reverts commit 4bbbcb61be.
|
2017-03-08 14:08:48 -08:00 |
|
Atlante45
|
8bf9b70915
|
Revert "don't blend animations for otherAvatars"
This reverts commit faa272c67c.
|
2017-03-08 14:08:33 -08:00 |
|
David Rowe
|
1e3c717fd4
|
Method to show appropriate desktop or tablet dialog
|
2017-03-09 09:55:47 +13:00 |
|
Brad Davis
|
e94f803b84
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2017-03-08 09:03:21 -08:00 |
|
David Rowe
|
950f91965d
|
Merge branch 'tablet-ui-edit-js' into 21197
|
2017-03-08 17:35:58 +13:00 |
|
Seth Alves
|
adc3581d63
|
remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay
|
2017-03-07 19:32:34 -08:00 |
|
Brad Hefta-Gaub
|
8ae6f2727d
|
add support for double click messages to overlays and entities
|
2017-03-07 17:52:55 -08:00 |
|
Thijs Wenker
|
b54d6cb0e1
|
stop avatar controller while playing back a recording, which makes it not collide anymore
|
2017-03-08 00:07:49 +01:00 |
|
Vladyslav Stelmakhovskyi
|
a02807fb26
|
Merge branch 'menuFix' into menuFix_AssetServer
|
2017-03-07 21:07:53 +01:00 |
|
Anthony J. Thibault
|
b0ad9a8110
|
Bug fix for potential crash when getting DebugDraw::instance
|
2017-03-07 10:03:38 -08:00 |
|
Seth Alves
|
f594689fa8
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-07 09:24:50 -08:00 |
|
Dante Ruiz
|
10ce732e91
|
Merge branch 'master' into menuFix
|
2017-03-07 16:15:54 +00:00 |
|
Brad Hefta-Gaub
|
b111bcb826
|
Merge pull request #9818 from ctrlaltdavid/21205
Remove Developer > Network > Bandwith Details dialog
|
2017-03-06 22:02:33 -08:00 |
|
David Rowe
|
fb1ff5be89
|
Port Developer > Network > Networking to tablet
|
2017-03-07 17:02:29 +13:00 |
|
David Rowe
|
51739f2f99
|
Remove Developer > Network > Bandwith Details dialog
|
2017-03-07 15:02:26 +13:00 |
|
Brad Davis
|
8782fe1d93
|
Merge branch 'master' into smarter_textures
Conflicts:
libraries/model-networking/src/model-networking/TextureCache.cpp
|
2017-03-06 15:29:41 -08:00 |
|
Zach Fox
|
5223f872c1
|
Merge pull request #9753 from zfox23/FB_3234_TakeTwo
Optimize AvatarMixer with respect to Identity and Avatar Data
|
2017-03-06 13:37:29 -08:00 |
|
Andrew Meadows
|
1b8f6b9835
|
Merge pull request #9784 from samcake/blue
Fixing Emissive on overlay for models (opaque and transparent)
|
2017-03-06 13:24:00 -08:00 |
|
Vladyslav Stelmakhovskyi
|
0a36ebc5a0
|
Remove non relevant changes
|
2017-03-06 22:11:46 +01:00 |
|
David Rowe
|
af4bdd5943
|
Port Developer > Audio > Buffers to tablet
|
2017-03-07 09:57:02 +13:00 |
|
Vladyslav Stelmakhovskyi
|
6d9e7de6dc
|
Implemented AssetBrowser in Tablet view
|
2017-03-06 21:45:55 +01:00 |
|