Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-09 11:32:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65682 commits 6 branches 1 tag 1.1 GiB
Commit graph

65682 commits

This branch
This branch
All branches
Author SHA1 Message Date
vladest
43e7f282ec cleanup 2018-03-04 20:44:46 +01:00
vladest
c2c7962f66 return styling. set implicit sizes 2018-03-04 19:49:47 +01:00
vladest
9f151566bf temporarily remove styling 2018-03-04 18:46:27 +01:00
vladest
1d43ca48bd remove wrap 2018-03-04 17:59:56 +01:00
vladest
12a70d57c2 Set Y pos for indicator explicetly 2018-03-04 17:24:52 +01:00
NissimHadar
b32ad2f69c createTests fixed. 2018-03-03 18:22:51 -08:00
NissimHadar
0a2610a9e0 Evaluation seems to work. 2018-03-03 09:58:30 -08:00
NissimHadar
361b5331ba File sizes are wrong, and so is format. 2018-03-02 18:09:32 -08:00
Atlante45
85b4c3b422 Protect session UUID from concurrent read/writes 2018-03-02 17:34:18 -08:00
Simon Walton
75db77b1e3 Merge remote-tracking branch 'upstream/master' 2018-03-02 17:30:11 -08:00
NissimHadar
96c7cc8197 Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester 2018-03-02 16:49:30 -08:00
NissimHadar
4b836a2ca9 Stores downloaded images in correct folder and with correct filenames. 2018-03-02 16:49:09 -08:00
Sam Gateau
8856d4af4f
Merge pull request #12530 from samcake/punk 
Fixing the graphics bugs introduced since last recent dual quaternion change
 2018-03-02 16:12:23 -08:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
NissimHadar
d29adcd000 Can download multiple images from GitHub. 2018-03-02 16:08:14 -08:00
John Conklin II
ed07b3c28b
Merge pull request #12531 from AndrewMeadows/use-pick-not-raypick 
Purge RayPick and LaserPointers from default scripts
 2018-03-02 14:59:32 -08:00
Dante Ruiz
d12a4f0c18 little change 2018-03-02 14:30:02 -08:00
Dante Ruiz
5dc336bfae remove dead code and eslint files 2018-03-02 14:23:35 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading 
Improve font loading via QRC instead of file path
 2018-03-02 14:22:17 -08:00
samcake
fc8f1c1e65 Resolving conflicts 2018-03-02 14:20:33 -08:00
Dante Ruiz
05fb3cfd9a fixing hyper link for entities 2018-03-02 14:03:24 -08:00
Brad Hefta-Gaub
762e36ef19
Merge pull request #12545 from birarda/bug/fix-nlpacket-ascii 
fix ASCII art for packet headers in NLPacket
 2018-03-02 13:49:27 -08:00
Cristian Luis Duarte
76e4a5bef2 Android - Change for test, this cast should avoid crashes due to SIGSEV in ToneMappingDeferred::run inputs.get1(). 2018-03-02 18:46:14 -03:00
John Conklin II
7ebe3df2b1
Merge pull request #12537 from zfox23/fixJsRequest 
Fix undefined request from JS
 2018-03-02 13:39:27 -08:00
John Conklin II
ff94587518
Merge pull request #12544 from jherico/fix_android 
Disable virtual trackpad rendering on non-Android builds
 2018-03-02 13:37:08 -08:00
Brad Hefta-Gaub
746f43c0fc
Merge pull request #12538 from huffman/fix/gzipped-json-export 
Fix Edit -> Export Entities exporting gzipped json
 2018-03-02 13:34:23 -08:00
Gabriel Calero
01699e26a5 Fix QML debug info: print last QML loaded file instead of Desktop.qml 2018-03-02 18:04:36 -03:00
Stephen Birarda
4f151a4237 fix ASCII art for packet headers in NLPacket 2018-03-02 12:41:22 -08:00
John Conklin II
be30d8d4ec
Merge pull request #12542 from zfox23/RC65_fixJsRequest 
RC65: Fix undefined request from JS
 2018-03-02 12:34:14 -08:00
Gabriel Calero
d64a6ecda7 Fix keyboard in Samsung Note 8 2018-03-02 16:56:06 -03:00
Brad Davis
9e8368e50e Disable virtual trackpad rendering on non-Android builds 2018-03-02 11:12:44 -08:00
Dante Ruiz
7ce13a3ce7 adding comment 2018-03-02 11:06:28 -08:00
Dante Ruiz
55d8cfd4c1 make sure dont make audio devices that don't use stereo use stereo 2018-03-02 10:56:44 -08:00
samcake
b8fb97c824 Resolving conflicts 2018-03-02 10:36:55 -08:00
Zach Fox
a5a109e4f1 Fix undefined request from JS 2018-03-02 10:05:32 -08:00
John Conklin II
678584538d
Merge pull request #12532 from samcake/RC65 
RC65  Fix: Applying the fix for shadows and transitions on Dual Quat Skinned meshes
 2018-03-02 09:23:38 -08:00
NissimHadar
07267f9fe6 WIP. 2018-03-02 09:13:07 -08:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
NissimHadar
5bb4023fb5 First version - can download fixed URL to fixed location. 2018-03-01 19:23:17 -08:00
Atlante45
2067c95931 Fix NVTT for mac 2018-03-01 18:05:05 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
SamGondelman
a66125fbb7 scriptablematerial -> scriptablemateriallayer 2018-03-01 16:56:51 -08:00
David Rowe
7107e1539f Remove deprecated Window.location.protocolVersion() function from API 2018-03-02 13:45:31 +13:00
Ryan Huffman
70bdedc4b3 Fix Edit -> Export Entities exporting gzipped json 
We were not respecting the doGzip flag.
 2018-03-01 16:42:41 -08:00
Zach Fox
c4e90c24eb Fix undefined request from JS 2018-03-01 16:40:24 -08:00
SamGondelman
e3b65a9201 Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-03-01 16:39:31 -08:00
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00
David Rowe
b50044fb2b Remove deprecated Window.openFileChanged() signal from API 2018-03-02 13:15:27 +13:00
Brad Hefta-Gaub
d24cea2f07
Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers 
if a node can't change locks, don't allow it to create an already-locked entity
 2018-03-01 14:56:29 -08:00
Brad Hefta-Gaub
2bc37d37bd
Merge pull request #12512 from birarda/update-brace-expansion-for-cve 
update fs-extra for dependency update of brace-expansion
 2018-03-01 14:53:02 -08:00