Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 16:32:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80152 commits 75 branches 59 tags 1.2 GiB
Commit graph

80152 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roxanne Skelly
701c457ad4 Fix issue where reset of server was prematurely causing the drop of 
an ajax connection which was causing an error popup.
 2019-07-26 16:57:05 -07:00
David Rowe
9e5cf5fe75 Config.h is now exposed as the Workload API 2019-07-27 11:50:07 +12:00
Simon Walton
d9572d9e8c Improved avatar-verify diagnostics 2019-07-26 15:35:09 -07:00
Anthony J. Thibault
2f949a4d4d Disable head ik while reacting 
Also, split getReactions() API into two calls

* getTriggerReactions() - lists all reactions that can be triggered with MyAvatar.triggerReaction().
* getBeginReactions() - lists all reactions that can be used with MyAvatar.beginReaction() and MyAvatar.endReaction().
 2019-07-26 15:26:43 -07:00
Sam Gateau
7486e906eb
Merge pull request #15983 from samcake/toulouse 
BUGZ-1080: Changing the default Intel GPU platform profile from mid to low
 2019-07-27 00:13:45 +02:00
Roxanne Skelly
03b146cfb2 fix issue with .json.gz files failing to upload properly 2019-07-26 13:55:59 -07:00
amer cerkic
de0b038ee1 trunked to a lambda for simplicity 2019-07-26 13:52:38 -07:00
Anthony Thibault
5375e53ecb
Merge pull request #15974 from luiscuenca/avatarSitAPI 
DEV-269: First Class Sitting API
 2019-07-26 13:36:00 -07:00
Ryan Huffman
2de26ff653
Merge pull request #15993 from luiscuenca/WLDisplayErrorWhenNotConnected 
BUGZ-815: WL Display error when connection fails
 2019-07-26 13:23:14 -07:00
amer cerkic
087b19d64d removed extra space 2019-07-26 13:15:01 -07:00
amer cerkic
b2e07fd990 changing raw pointer to unique pointer with custom deleter 2019-07-26 13:02:59 -07:00
Anna
0d2b2a2aef added tone mapping config 2019-07-26 12:53:18 -07:00
Howard Stearns
6ef0821801 steam gets the oculus store commerce treatment 2019-07-26 12:44:48 -07:00
luiscuenca
c77da03535
Display error when connection fails 2019-07-26 12:01:33 -07:00
Anna
16595d9412 created tonemapandresample 2019-07-26 11:56:25 -07:00
MiladNazeri
e6e771df7b
Merge pull request #15977 from MiladNazeri/permissionsUIFix 
[DEV-190] + [DEV-191] :: Permissions UI
 2019-07-26 11:25:18 -07:00
Zach Fox
1a81765d71
Merge pull request #15989 from MiladNazeri/nametagDisplayRenderingFix 
[BUGZ-1073] - Add extra padding to the nametag
 2019-07-26 10:22:37 -07:00
Simon Walton
2ebc6e66fe Merge remote-tracking branch 'upstream/master' into scriptaudioinjector-delete-via-signal 
Need 985 PR.
 2019-07-26 09:53:23 -07:00
Roxanne Skelly
908cb8156b fix coding standards issue 2019-07-26 09:40:17 -07:00
Brad Davis
11d7890f48 BUGZ-964: fix for incorrect color curve when rendering 3D into QML 2019-07-25 18:24:53 -07:00
Roxanne Skelly
b770ff7b79 BUGZ-829 - error handling for web uploaded model files 2019-07-25 18:14:11 -07:00
Simon Walton
a9d3413626 Delete script audio-injector wrapper when wrapped object goes 2019-07-25 17:51:01 -07:00
luiscuenca
c1b818cd9b
Set timeout before enabling drive keys 2019-07-25 17:40:09 -07:00
sabrina-shanman
601b579c42 Set the LOD angle in simplifiedUI to current effective default, to be adjusted later 2019-07-25 17:32:56 -07:00
sabrina-shanman
3da5896e22 Bring back lodQualityLevel 2019-07-25 17:16:14 -07:00
sabrina-shanman
94e725dc2a Fix rare case where script would fail to set LOD after disabling auto LOD 2019-07-25 17:15:28 -07:00
sabrina-shanman
4b5a45209e Prefer using LODManager.lodAngleDeg for setting manual LOD 2019-07-25 17:15:22 -07:00
Anna
c3fbabb14e Merge branch 'master' of github.com:highfidelity/hifi 2019-07-25 17:09:03 -07: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
milad
f87e306ad4 adding extra padding to the initial textbox calculation 2019-07-25 16:35:30 -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
David Rowe
0555cf1804 Revisions and typos 2019-07-26 10:50:53 +12:00
MiladNazeri
b0723599d8 Update interface/resources/qml/controlsUit/PermissionPopup.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-07-25 15:47:48 -07:00
MiladNazeri
b419be97be Update interface/resources/qml/controlsUit/PermissionPopup.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-07-25 15:47:24 -07:00
MiladNazeri
cf23b7a303 Update interface/resources/qml/controlsUit/PermissionPopup.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-07-25 15:47:17 -07:00
MiladNazeri
20b709b382 Update interface/resources/qml/controlsUit/PermissionPopup.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-07-25 15:46:10 -07:00
milad
5083e449b0 cr round 2 2019-07-25 15:42:25 -07:00
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
dante ruiz
58dea69ecf create zip file for launcher 2019-07-25 15:41:34 -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