Gabriel Calero
|
0aaf92ce79
|
Fix UI issue: login confirmation sometimes does not appear
|
2018-11-12 19:51:28 -03:00 |
|
amantley
|
bcd651a65d
|
adding the member variable to keep track of the orig bind matrices to fbx.h
|
2018-11-12 14:39:48 -08:00 |
|
amantley
|
3f732baf86
|
Merge remote-tracking branch 'upstream/master' into avatarPipelineOffsets
|
2018-11-12 14:38:17 -08:00 |
|
John Conklin II
|
ec4f2f781d
|
Merge pull request #14352 from Atlante45/feat/solo-source
[master] Add audio soloing feature
|
2018-11-12 14:07:30 -08:00 |
|
NissimHadar
|
5d47efa0b8
|
Merge branch 'MAC' of https://github.com/NissimHadar/hifi into MAC
|
2018-11-12 14:01:30 -08:00 |
|
NissimHadar
|
07515eab68
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-12 14:00:46 -08:00 |
|
NissimHadar
|
6e3ead0c5f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-12 14:00:24 -08:00 |
|
r3tk0n
|
597f83e6d5
|
HoMerge branch 'master' of https://github.com/highfidelity/hifi into 19550-oculus-store-v2
|
2018-11-12 13:58:37 -08:00 |
|
Roxanne Skelly
|
762033580d
|
And remove another url log item.
|
2018-11-12 13:48:08 -08:00 |
|
Roxanne Skelly
|
7a14cb1bbc
|
Remove additional url logging message.
|
2018-11-12 13:36:14 -08:00 |
|
SamGondelman
|
df1a848811
|
fix fade out
|
2018-11-12 12:58:40 -08:00 |
|
Howard Stearns
|
66ae01e0c3
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-12 12:55:20 -08:00 |
|
Simon Walton
|
8c347fae70
|
Fixes for domain server use of changed OctreeDataUtils
|
2018-11-12 12:45:01 -08:00 |
|
Jamil Akram
|
6511b60aa4
|
Merge pull request #14264 from ctrlaltdavid/M19085
Fix AvatarManager.getPalData() returning data for just a single avatar
|
2018-11-12 12:27:58 -08:00 |
|
NissimHadar
|
050a13433b
|
Merge branch 'MAC' of github.com:NissimHadar/hifi into MAC
|
2018-11-12 12:20:32 -08:00 |
|
David Back
|
bdded0d67a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
|
2018-11-12 12:20:27 -08:00 |
|
David Back
|
0781171912
|
Merge branch 'newPropertySliders' of github.com:dback2/hifi into newPropertySliders
|
2018-11-12 12:20:05 -08:00 |
|
NissimHadar
|
05033b7da1
|
Echo status to screen
|
2018-11-12 12:19:32 -08:00 |
|
John Conklin II
|
cd3dc04dc5
|
Merge pull request #14159 from alexiamandeville/WoodyUpdate
Updating Woody avatar for new UV seams
|
2018-11-12 12:12:49 -08:00 |
|
David Back
|
a0d5b1117a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
|
2018-11-12 11:41:00 -08:00 |
|
Gabriel Calero
|
90295a06ba
|
Handle empty oauth redirect url
|
2018-11-12 16:26:01 -03:00 |
|
amantley
|
92befbc5bf
|
implementing backup of cluster matrices
|
2018-11-12 11:12:56 -08:00 |
|
NissimHadar
|
4a158ea789
|
Fixed Linux compilation error.
|
2018-11-12 11:07:18 -08:00 |
|
NissimHadar
|
a535519fbc
|
Typo.
|
2018-11-12 11:00:24 -08:00 |
|
John Conklin II
|
512b847684
|
Merge pull request #14339 from hyperlogic/bug-fix/anim-debug-draw-crash
AnimDebugDraw: Prevent multi-threaded access to shared map collection.
|
2018-11-12 10:47:01 -08:00 |
|
John Conklin II
|
9d404a6cf3
|
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
|
2018-11-12 10:45:52 -08:00 |
|
John Conklin II
|
33da88f174
|
Merge pull request #14351 from luiscuenca/tweakTransitAnimations
Tweak transit animations
|
2018-11-12 10:39:56 -08:00 |
|
Ryan Huffman
|
5e6d0c0f94
|
Merge pull request #14376 from thoys/feat/create/localGlobalToggle
[CreateApp] Local/World toggle
|
2018-11-12 10:37:55 -08:00 |
|
Wayne Chen
|
ea325acef9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-11-12 10:28:03 -08:00 |
|
David Back
|
eeb8ede8ff
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
|
2018-11-12 10:10:38 -08:00 |
|
Roxanne Skelly
|
e895021652
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case19808
|
2018-11-12 10:02:16 -08:00 |
|
Brad Hefta-Gaub
|
22dd958582
|
Merge pull request #14297 from jherico/feature/vcpkg
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
|
2018-11-12 09:52:02 -08:00 |
|
NissimHadar
|
ae28de119f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-12 08:27:17 -08:00 |
|
John Conklin II
|
dc4b967ff5
|
Merge pull request #14331 from SimonWalton-HiFi/large-avatars-bad-position
Clamp avatar-joint translations that hit the compressed-format limit
|
2018-11-11 16:27:56 -08:00 |
|
unknown
|
4eab623fd8
|
remove debugPrint function
|
2018-11-09 17:25:48 -08:00 |
|
unknown
|
0160ab23ab
|
fix color pickers
|
2018-11-09 17:23:51 -08:00 |
|
unknown
|
08d9eda7d7
|
fix property bugs / style issues
|
2018-11-09 17:08:10 -08:00 |
|
Seth Alves
|
500b2b7adf
|
Merge pull request #14381 from zfox23/MS19803_retry
Actually fix MS19803: Replace missing imports
|
2018-11-09 16:38:26 -08:00 |
|
Jeff Clinton
|
12b833d121
|
Merge pull request #14167 from ElderOrb/FB18859
Make material entities to be presented in avatarapp
|
2018-11-09 15:32:27 -08:00 |
|
amantley
|
5bb2378cd9
|
changes to get the engineer working
|
2018-11-09 15:10:14 -08:00 |
|
Zach Fox
|
8d325d8dd9
|
Actually fix MS19803: Replace missing imports
|
2018-11-09 15:02:57 -08:00 |
|
Wayne Chen
|
c927cd6287
|
wip on overlay spawn in play area
|
2018-11-09 15:02:14 -08:00 |
|
Howard Stearns
|
64bf7ba833
|
Merge pull request #14380 from zfox23/MS19803_securityQml
MS19803: Remove extra "as" in Security.qml
|
2018-11-09 14:29:54 -08:00 |
|
Roxanne Skelly
|
cd4e56e7d5
|
Case 19808 - Change MARKET and WALLET in tray notifier to be INVENTORY
along with other appropriate messaging changes.
|
2018-11-09 14:26:20 -08:00 |
|
Zach Fox
|
be5dc36ccd
|
Actually fix build error...hopefully!
|
2018-11-09 14:23:15 -08:00 |
|
SamGondelman
|
1d1510e18e
|
Merge remote-tracking branch 'upstream/master' into police
|
2018-11-09 13:32:41 -08:00 |
|
David Back
|
615ffebb2c
|
new draggable numbers WIP
|
2018-11-09 13:14:05 -08:00 |
|
Jeff Clinton
|
ee9154a801
|
Merge pull request #14341 from sethalves/fix-mouse-equip
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
|
2018-11-09 12:54:36 -08:00 |
|
Jeff Clinton
|
b9c11aad7b
|
Merge pull request #14259 from SamGondelman/webLock
Case 18986: Enable interaction with locked web entity
|
2018-11-09 12:21:13 -08:00 |
|
Zach Fox
|
1ce6079c5a
|
Remove extra as
|
2018-11-09 11:26:18 -08:00 |
|