David Back
|
0781171912
|
Merge branch 'newPropertySliders' of github.com:dback2/hifi into newPropertySliders
|
2018-11-12 12:20:05 -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 |
|
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 |
|
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 |
|
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 |
|
Zach Fox
|
8d325d8dd9
|
Actually fix MS19803: Replace missing imports
|
2018-11-09 15:02:57 -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 |
|
Gabriel Calero
|
4f4239f3c9
|
Send state parameter to oauth server to redirect to steam login
|
2018-11-09 16:12:18 -03:00 |
|
Zach Fox
|
df7486d0f5
|
Remove unused variable, fixing unix build warning
|
2018-11-09 10:40:46 -08:00 |
|
Zach Fox
|
5cf2041c65
|
Remove unused variable
|
2018-11-09 10:38:20 -08:00 |
|
Jeff Clinton
|
3d01949e43
|
Merge pull request #14305 from AndrewMeadows/zero-vel-neargrab-nondynamic
Case 19495: zero velocities of non-dynamic entities on nearGrab release
|
2018-11-09 10:10:49 -08:00 |
|
David Back
|
30bd5c5e42
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
|
2018-11-09 09:49:14 -08:00 |
|
Howard Stearns
|
9ca8ed9e17
|
Merge pull request #14236 from roxanneskelly/SetupLogging
Add logging to the windows installer to track install options and install steps
|
2018-11-09 09:35:54 -08:00 |
|
David Back
|
a1e2ca1f74
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
|
2018-11-09 09:27:12 -08:00 |
|
Thijs Wenker
|
99fcef105f
|
spaceMode / desiredSpaceMode explanation
|
2018-11-09 17:59:00 +01:00 |
|
Jeff Clinton
|
43f304ea86
|
Merge pull request #14373 from danteruiz/image-entity-crash
fix image entity crash
|
2018-11-09 08:42:44 -08:00 |
|
Sam Gateau
|
e263776b19
|
Address the mac bug with ResourceBUffer implemented with TBO
|
2018-11-09 13:22:27 -03:00 |
|
Gabriel Calero
|
7687eb9948
|
Revert "Test redirect to steam"
This reverts commit 729a0b6a59.
|
2018-11-09 13:10:22 -03:00 |
|
Gabriel Calero
|
d9f68af634
|
Code review + minor ui fixes
|
2018-11-09 12:49:02 -03:00 |
|
Gabriel Calero
|
729a0b6a59
|
Test redirect to steam
|
2018-11-09 11:00:40 -03:00 |
|
Simon Walton
|
d183968175
|
Add skipThoseWithBadParents functionality to octree visitor; reviewer suggestions
|
2018-11-08 18:20:20 -08:00 |
|
Brad Hefta-Gaub
|
2ba5474195
|
Merge pull request #13059 from marko8904/updateLicense
Updated the license date
|
2018-11-08 18:18:58 -08:00 |
|
David Rowe
|
de61f0f010
|
Add missing JSDoc noticed in passing
|
2018-11-09 14:00:47 +13:00 |
|
David Rowe
|
c9b3fda724
|
Merge branch 'master' into M19768
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
|
2018-11-09 13:56:44 +13:00 |
|
Thijs Wenker
|
e483b1342c
|
CR fixes
|
2018-11-09 01:56:17 +01:00 |
|
Brad Davis
|
3e0dc35e54
|
Removing outdated external build instructions
|
2018-11-08 16:46:36 -08:00 |
|
David Rowe
|
aca7143449
|
Fix interstitial music not playing at Interface start-up
|
2018-11-09 13:41:07 +13:00 |
|
Ryan Huffman
|
3b57e45fdd
|
Remove redundant dimensions in default entity properties
|
2018-11-08 16:36:55 -08:00 |
|
Ryan Huffman
|
44d0a7254c
|
Update the styling for the Entity Properties window
|
2018-11-08 16:36:55 -08:00 |
|
David Rowe
|
5c97954e66
|
Merge branch 'master' into M19404
# Conflicts:
# scripts/system/interstitialPage.js
|
2018-11-09 13:35:11 +13:00 |
|
Thijs Wenker
|
9005efb639
|
style fixes
|
2018-11-09 01:30:05 +01:00 |
|