humbletim
|
058c81aa1a
|
Merge branch 'hifi-master' into kpi-v1-modkit-rc
|
2019-07-26 01:36:52 -04:00 |
|
Kalila R
|
bac59b52aa
|
Added checkbox for script plugins to security.qml
|
2019-07-26 01:32:14 -04:00 |
|
humbletim
|
52d2938be3
|
DeprecatedScriptPlugin => ExampleScriptPlugin
|
2019-07-26 01:32:09 -04:00 |
|
humbletim
|
d334a2e5e2
|
QML-only write access for 'private/' Settings keys
|
2019-07-26 01:32:01 -04:00 |
|
humbletim
|
6ae75ecafe
|
segregated scripting/ plugins (re: permissions checkbox)
|
2019-07-26 01:31:42 -04:00 |
|
Shannon Romano
|
4dc67b5c58
|
Merge pull request #15987 from danteruiz/launcher-zip
DEV-317: Edit postbiuld.py to produce zip file for the Mac Launcher.
|
2019-07-25 17:07:08 -07:00 |
|
Ryan Huffman
|
ef0977248d
|
Merge pull request #15986 from huffman/fix/create-not-working-patch
Fix non-functional Create
|
2019-07-25 16:17:43 -07:00 |
|
dante ruiz
|
58dea69ecf
|
create zip file for launcher
|
2019-07-25 15:41:34 -07:00 |
|
Ryan Huffman
|
9872c1c2f7
|
Add missing emit inside of
|
2019-07-25 13:55:44 -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 |
|
amer cerkic
|
5d7286b055
|
removed change from my master branch, that is getting checked in on separate pr
|
2019-07-24 16:05:13 -07:00 |
|
amer cerkic
|
db945851ac
|
fixed merge conflict
|
2019-07-24 16:03:23 -07:00 |
|
amer cerkic
|
c57f60d887
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2019-07-24 15:55:05 -07:00 |
|
amer cerkic
|
e6dd52d331
|
Merge branch 'master' into bugz-1029a
|
2019-07-24 15:53:23 -07:00 |
|
amer cerkic
|
3315271493
|
reverting commit:
|
2019-07-24 15:43:31 -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
|
bea31237b7
|
addressing comments
|
2019-07-24 14:30:43 -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 |
|
amer cerkic
|
f94b082946
|
addressing comment
|
2019-07-24 11:47:10 -07:00 |
|
amer cerkic
|
ac17493a40
|
removing comments
|
2019-07-24 11:37:38 -07:00 |
|
amer cerkic
|
8c022b025d
|
implementing Dante's change to connect the slots
|
2019-07-24 11:19:32 -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 |
|
amer cerkic
|
ddc678bbc0
|
added interactivewindow proxy. moved event bridge binding to the proxy instead
|
2019-07-23 16:57:53 -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 |
|