Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 08:25:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65760 commits 29 branches 28 tags 1.2 GiB
Commit graph

65760 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
samcake
9cb8b0db5f Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-03-02 09:01:27 -08:00
samcake
a40f8cefa2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-03-02 09:01:16 -08:00
Sam Gateau
9ae1b5b37f
Merge pull request #12541 from samcake/master-workload 
Master workload merge
 2018-03-02 08:56:21 -08:00
samcake
d4d5f3a7f0 Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload 2018-03-02 08:50:47 -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
samcake
5b8e18f15d Adding the pipeline to render the view spheres 2018-03-01 17:57:44 -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
Andrew Meadows
fef3552851
Merge pull request #12535 from samcake/workload 
Workload: adding a ui app for debugging
 2018-03-01 14:35:46 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
LaShonda Hopper
fde1ca6262 [Case 4315] Ensures that Particle Tab Color Pickers obey colpick visual styling. 
Changes Committed:
    modified:   scripts/system/particle_explorer/particleExplorer.html
 2018-03-01 16:42:56 -05:00
LaShonda Hopper
b2c7ddbd05 [Case 4315] Particle System Tab has additional color picker support (details below). 
* Adds 3 additional keys/properties to hifi-entity-ui's specification support for
color pickers.
    * layoutType:  This correlates to colpick's layout property.  This is expected
        to be a string.  Valid values are those supported by colpick, see colpick.js for
        additional details.
           * Within hifi-entity-ui, if this value isn't specified the default is
             "hex" as was previously hard coded.
    * layoutColorScheme:  This correlates to colpicks's colorScheme property.  This is
        expected to be a string.  Valid values are those supported by colpick, see colpick.js
        for additional details.
            * Within hifi-entity-ui, if this value isn't specified the default is
              "dark" as was previously hard coded.
    * useSubmitButton:  This correlates to colpick's submit property.  This is expected
        to be a boolean.  See colpick.js for additional details.
            * Within hifi-entity-ui, if this value isn't specified the default is
              true as was previously hard coded.
* Amends particleExplorer.js color picker descriptors to make use of the new
  keys to bring the color pickers within the Particle Tab inline with the appearance
  of the Properties Tab color pickers submitted within PR #12241 which don't utilize
  the OK button.

Changes Committed:
    modified:   scripts/system/particle_explorer/hifi-entity-ui.js
    modified:   scripts/system/particle_explorer/particleExplorer.js
 2018-03-01 16:42:56 -05:00
samcake
6e7ef1e609 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-03-01 13:42:51 -08:00
samcake
3a9a93f502 Introducing a ui app for debugging the workload and fixing the vissible/invisisble behavior of the render item 2018-03-01 13:40:58 -08:00
David Rowe
5e311a86ee Document the "Image" pseudo-entity type 2018-03-02 10:20:13 +13:00
Cristian Luis Duarte
b5c3b78d57 Android - Virtual Pad - Limit joystick inside base circle. 2018-03-01 17:58:23 -03:00
Sam Gateau
8a0196b1fd
Merge pull request #12534 from AndrewMeadows/workload-006 
workload: clear orphaned workload::Space proxies when leaving domain
 2018-03-01 12:35:57 -08:00
Andrew Meadows
1e1d9907a4 also clear _staleProxies when clearing all else 2018-03-01 12:22:42 -08:00
Andrew Meadows
7a852a0e31 clear the Space 2018-03-01 12:11:30 -08:00
Andrew Meadows
18a6ac057a add Space::clear() method 2018-03-01 12:09:28 -08:00
NissimHadar
b3b40d68c2 Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester 2018-03-01 11:11:08 -08:00
NissimHadar
2a1c22e7a5 "Create Test" copies (and renames) images from snapshot folder to the corresponding test folder. 2018-03-01 11:10:45 -08:00
Dante Ruiz
4b572eda6b changing Name 2018-03-01 11:05:40 -08:00
Dante Ruiz
8cae20f53d adding stereo checkbox to audio settings 2018-03-01 11:03:18 -08:00
samcake
a227cf1edb Fixing bad key/pipeline pair 2018-03-01 10:49:58 -08:00
Anthony Thibault
d888e7fd95
Merge pull request #12528 from hyperlogic/bug-fix/fix-anim-tests 
Animation Unit Tests build and pass
 2018-03-01 10:48:15 -08:00
samcake
5440f62860 fixing a bad key /pipeline pair 2018-03-01 10:46:47 -08:00
Andrew Meadows
67c78a2df1 remember list of stale proxies 2018-03-01 10:21:25 -08:00
Andrew Meadows
f9db9e999e Merge 'master' into 'workload' 2018-03-01 10:19:06 -08:00
Zach Fox
877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading 2018-03-01 10:14:23 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update 
Image entity has correct orientation and is collisionless
 2018-03-01 09:57:08 -08:00