milad
|
2f4566b63c
|
merged master and fixed height
|
2019-07-25 15:42:03 -07:00 |
|
milad
|
4c0d8b6fda
|
improved layout to match the figment more
|
2019-07-25 15:42:02 -07:00 |
|
milad
|
993e5db2da
|
changed rectangle to have anchor.fill
|
2019-07-25 15:42:02 -07:00 |
|
milad
|
2498bf2fd8
|
Cr changes r1
|
2019-07-25 15:42:02 -07:00 |
|
milad
|
9f0fc8bd06
|
removed logs and prototype code
|
2019-07-25 15:42:02 -07:00 |
|
milad
|
189809dc2c
|
Fixed undefined error when displaying from the dictionary
|
2019-07-25 15:42:02 -07:00 |
|
milad
|
2b4dd327ec
|
removed log statements
|
2019-07-25 15:42:01 -07:00 |
|
milad
|
b0bc4639be
|
removed temp folder
|
2019-07-25 15:42:01 -07:00 |
|
milad
|
cd5df63f51
|
working version for all qml web files
|
2019-07-25 15:41:53 -07:00 |
|
milad
|
fb7a66b110
|
working version with just flickable
|
2019-07-25 15:38:23 -07:00 |
|
milad
|
43268c0f65
|
Working QML window
|
2019-07-25 15:38:23 -07:00 |
|
milad
|
dec176b921
|
checking to see if I did something blocking the build
|
2019-07-25 15:38:22 -07:00 |
|
Ryan Huffman
|
de233e456e
|
Merge pull request #15976 from huffman/feat/serverless-tutorial
DEV-266: Add serverless tutorial
|
2019-07-25 13:39:03 -07:00 |
|
Shannon Romano
|
c2186305b3
|
Merge pull request #15981 from luiscuenca/WLVersionAndUpdate
DEV-243 | DEV-221: Display Window Launcher version number and autoupdate
|
2019-07-25 13:28:21 -07:00 |
|
Howard Stearns
|
520ba59899
|
Merge pull request #15980 from SimonWalton-HiFi/audio-injector-shutdown
BUGZ-985: Guard against AudioInjectorManager takedown in scripted audio injector destructor
|
2019-07-25 12:50:07 -07:00 |
|
Zach Fox
|
12a9837a4b
|
Merge pull request #15984 from zfox23/removeSomeEventBridgeCode
BUGZ-969: Remove some audio-related code that hasn't worked in a while
|
2019-07-25 12:41:43 -07:00 |
|
Zach Fox
|
6e33f3f23a
|
BUGZ-969: Remove some audio-related code that hasn't worked in a while
|
2019-07-25 11:49:28 -07:00 |
|
luiscuenca
|
c3ad65f628
|
add --skipSplash param
|
2019-07-25 11:22:20 -07:00 |
|
luiscuenca
|
13952bf27e
|
Fixes and seamless self update
|
2019-07-25 10:51:18 -07:00 |
|
luiscuenca
|
4d9557dfc1
|
Display version and autoupdate
|
2019-07-24 17:16:22 -07:00 |
|
Shannon Romano
|
7e91fe9e8b
|
Merge pull request #15979 from amerhifi/master
fix android local build
|
2019-07-24 17:04:47 -07:00 |
|
Ryan Huffman
|
2ec87f4e61
|
Add serverless tutorial
|
2019-07-24 16:38:03 -07:00 |
|
Anthony Thibault
|
abeba03a7e
|
Merge pull request #15975 from huffman/fix/interactive-window-qmlto-script-crash
BUGZ-1028: Fix qmlToScript getting called on script thread and causing crash
|
2019-07-24 15:39:25 -07:00 |
|
Simon Walton
|
53cf915e8d
|
Guard for AudioInjectorManager existance; clear an audio interface pointer
|
2019-07-24 14:51:41 -07:00 |
|
amer cerkic
|
bae3ebd577
|
fix android local build
|
2019-07-24 14:07:58 -07:00 |
|
Ryan Huffman
|
c4b63ed5e4
|
Fix qmlToScript getting called on script thread and causing crash
|
2019-07-24 13:44:20 -07:00 |
|
Zach Fox
|
e1c198903d
|
Merge pull request #15973 from zfox23/fixGatedLog
BUGZ-972: Fix errant log involving 'gated' property
|
2019-07-24 11:19:02 -07:00 |
|
Zach Fox
|
3c8a4e57e6
|
Merge pull request #15972 from zfox23/SUI/fixVRButtonDimensions
DEV-301: Adjust size of VR-mode header icon
|
2019-07-24 10:22:50 -07:00 |
|
Zach Fox
|
03b5f9f7f8
|
BUGZ-972: Fix errant log involving 'gated' property
|
2019-07-24 10:18:03 -07:00 |
|
Zach Fox
|
b918979fab
|
DEV-301: Adjust size of VR-mode header icon
|
2019-07-24 10:02:26 -07:00 |
|
Shannon Romano
|
3885f143d3
|
Merge pull request #15955 from danteruiz/launcher-version
DEV-220: Lilypad Launcher: (Mac) Add versioning info to Launcher screen
|
2019-07-24 09:39:44 -07:00 |
|
Shannon Romano
|
a8842bf521
|
Merge pull request #15968 from annabrewer/android-crash-fix
BUGZ-996: Android app crashes on startup
|
2019-07-24 09:33:50 -07:00 |
|
Shannon Romano
|
34cfb6bdb9
|
Merge pull request #15960 from ctrlaltdavid/fix-coding-standards-link
Fix link to coding standards
|
2019-07-24 09:26:18 -07:00 |
|
Shannon Romano
|
1883e1d482
|
Merge pull request #15969 from Atlante45/fix/ess-crash
BUGZ-1015: Don't store unused cpuident data arrays
|
2019-07-24 09:05:47 -07:00 |
|
Shannon Romano
|
9d3d7b4e06
|
Merge pull request #15970 from Atlante45/fix/es-crash
Make sure the send thread terminates before delete
|
2019-07-24 09:04:21 -07:00 |
|
Shannon Romano
|
2942bfaad0
|
Merge pull request #15939 from SamGondelman/shader
Condense directional light shaders using slp defines
|
2019-07-24 09:01:49 -07:00 |
|
dante ruiz
|
9c33454924
|
Merge branch 'master' of github.com:highfidelity/hifi into launcher-version
|
2019-07-23 16:56:31 -07:00 |
|
Anna
|
2051a9953c
|
change bounds checking to check if index is strictly less than 0
|
2019-07-23 16:00:11 -07:00 |
|
Shannon Romano
|
ad4f0f500c
|
Merge pull request #15956 from Atlante45/fix/x64_toolchain
Force build with x64 toolchain
|
2019-07-23 15:29:58 -07:00 |
|
Shannon Romano
|
849a25f576
|
Merge pull request #15966 from jherico/fix/bugz-987
BUGZ-987: fix depth testing of HUD layer 3D objects
|
2019-07-23 15:00:54 -07:00 |
|
Shannon Romano
|
b799abdac1
|
Merge pull request #15967 from sabrina-shanman/picks_too-many_grab-enabled
(BUGZ-955) Disable unnecessary picking (conservative subset)
|
2019-07-23 14:57:19 -07:00 |
|
Anna
|
a6c569dd78
|
fixed index out of bounds checking when getting cpu, gpu or display in PlatformInstance.cpp
|
2019-07-23 14:45:12 -07:00 |
|
Clement
|
7f9ad4ac25
|
Don't store unused cpuident data arrays
|
2019-07-23 14:23:12 -07:00 |
|
Clement
|
8dd18fbe62
|
Make sure the send thread terminates before delete
|
2019-07-23 14:21:07 -07:00 |
|
dante ruiz
|
08bfe00ac4
|
making requested changes
|
2019-07-23 14:09:46 -07:00 |
|
Shannon Romano
|
266230a53c
|
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api
Initial version of Avatar Reaction API
|
2019-07-23 13:13:31 -07:00 |
|
sabrina-shanman
|
d48c8d897c
|
Clarify that a Grabber member function toggles both picks and pointers
|
2019-07-23 12:58:07 -07:00 |
|
sabrina-shanman
|
abac1787a6
|
Fix using invalid pick API functions on HMD ray pointer
|
2019-07-23 12:58:07 -07:00 |
|
sabrina-shanman
|
79d09f68fd
|
Disable grab.js picks when in HMD
|
2019-07-23 12:58:07 -07:00 |
|
Brad Davis
|
449f3d00f9
|
BUGZ-987: fix depth testing of HUD layer 3D objects
|
2019-07-23 12:09:12 -07:00 |
|