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

79425 commits

This branch
This branch
All branches
Author SHA1 Message Date
jennaingersoll
150ae31a88
Merge pull request #15748 from ctrlaltdavid/DOC-85 
DOC-85: Revise new MyAvatar signals' JSDoc
 2019-06-19 15:16:46 -07:00
Roxanne Skelly
0576e6ae3e remove newline for sysinfo to make splunk queries easier 2019-06-19 15:10:02 -07:00
Simon Walton
7701710aa5 Consider a NetworkClipLoader resource with null URL to be failed 2019-06-19 15:02:16 -07:00
Shannon Romano
12357e5ced
Merge pull request #15797 from annabrewer/gamma-correction-correction 
BUGZ-271: Android gamma correction is too high
 2019-06-19 14:39:09 -07:00
SamGondelman
46f913c73b Merge remote-tracking branch 'origin/master' 2019-06-19 14:30:59 -07:00
Brad Davis
abb71ba604 Don't request an OpenGL 2.0 context via the dock widget 2019-06-19 14:10:53 -07:00
Shannon Romano
3d72370d1a
Merge pull request #15792 from MiladNazeri/nametagFixes 
Bugz-504: more stable nametag updates
 2019-06-19 14:07:19 -07:00
Roxanne Skelly
2ed5e8aefb add OS type to connect message 2019-06-19 13:53:38 -07:00
Anna
00820b9a9b Merge branch 'master' of github.com:highfidelity/hifi into gamma-correction-correction 2019-06-19 13:49:55 -07:00
Zach Fox
8fdfdbaae4 Another attempt, still not working 2019-06-19 13:31:21 -07:00
Gayathri
e6e0b06a80
Merge pull request #15789 from RebeccaStankus/migrateEditFiles 
JIRA 659-Create App shows a File not found message in the Properties and Grid Tab
 2019-06-19 15:16:37 -05:00
SamGondelman
ee8cdd6ae6 Merge remote-tracking branch 'origin/master' 2019-06-19 13:09:13 -07:00
Sam Gateau
7ad0975528 Merge branch 'master' of github.com:highfidelity/hifi into wall 2019-06-19 13:06:20 -07:00
Shannon Romano
38f414efc8
Merge pull request #15798 from hyperlogic/bug-fix/nitpick-interface-install-mac 
BUGZ-721: nitpick: [mac] preserve symlinks when installing interface.app
 2019-06-19 12:36:49 -07:00
RebeccaStankus
f5fa44dc21 Revert "Changed icons path to be relative" 
This reverts commit e277070423.
 2019-06-19 12:06:34 -07:00
Anthony Thibault
96179328e0 nitpick: [mac] preserve symlinks when installing interface.app 2019-06-19 11:20:32 -07:00
RebeccaStankus
e277070423 Changed icons path to be relative 2019-06-19 11:17:52 -07:00
Howard Stearns
ff1d828aaa
Merge pull request #15794 from SimonWalton-HiFi/limit-stats-dump-rate 
Limit the stats-dump rate on packet error
 2019-06-19 11:14:48 -07:00
Anna
45ac07de3b fixed pick profiling 2019-06-19 10:54:28 -07:00
RebeccaStankus
30dd667b17 Changed qml import method 2019-06-19 10:40:32 -07:00
Anna
a19efce173 implemented samuel's requested changes 2019-06-19 10:34:55 -07:00
RebeccaStankus
feaea12b24 Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles 2019-06-19 10:14:04 -07:00
Simon Walton
b95515933f
Merge pull request #15708 from SimonWalton-HiFi/stun-on-iface-change 
Force new IP port on local address change
 2019-06-19 10:12:36 -07:00
Sam Gateau
fdf06ea819 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 09:41:45 -07:00
Brad Hefta-Gaub
41c0dc0059
Merge pull request #15796 from SamGondelman/mac 
BUGZ-730: Fix deferred rendering on macbook air
 2019-06-19 08:31:30 -07:00
Milad Nazeri
61e4155eda cr-r1 2019-06-19 07:30:28 -07:00
Anna
803fe1e178 added comments 2019-06-18 19:33:31 -07:00
Anna
a1a3eccad9 fixed gamma on rift, removed extraneous code from quest, clarified variable names 2019-06-18 19:23:40 -07:00
Shannon Romano
50e9325d64
Merge pull request #15793 from sethalves/fix-qobject-template 
BUGZ-742: Q_OBJECT and template classes don't mix
 2019-06-18 18:08:46 -07:00
Sam Gateau
1ae06f01b0 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 17:41:56 -07:00
SamGondelman
3ff81607ab fix deferred rendering on macbook air 2019-06-18 17:17:21 -07:00
Zach Fox
7a4aa1e98c BUGZ-657; BUGZ-713: Add a copy of the system library JS files because lots of system scripts depend on them being in the default scripts location 2019-06-18 17:13:38 -07:00
Sam Gateau
251faf2171 Trying to clean up the solution... 2019-06-18 17:08:08 -07:00
Anna
301791c07e fixed gamma on quest 2019-06-18 16:56:14 -07:00
Simon Walton
7d80852544 Reduce reporting period to 1 s 2019-06-18 16:06:47 -07:00
Simon Walton
06b00e93ae Limit the stats-dump on packet error 2019-06-18 15:43:14 -07:00
Seth Alves
0a2f37f9a0 Q_OBJECT and template classes don't mix 2019-06-18 15:36:32 -07:00
Anna
0d543b0f3e Merge branch 'gamma-correction-correction' of github.com:annabrewer/hifi into quest-optimization 2019-06-18 15:26:31 -07:00
Anna
4cf8023d0e fixed gamma on windows 2019-06-18 15:19:02 -07:00
David Rowe
72fdbc0aa8 Entity information and manipulation 2019-06-19 10:18:48 +12:00
Zach Fox
99feabd4c9
Merge pull request #15791 from zfox23/SUI/highlightText1 
BUGZ-732: Enable text selection by mouse in Profile/Display Name field
 2019-06-18 14:45:05 -07:00
Milad Nazeri
422c70f300 fixed cache and extra line 2019-06-18 14:35:00 -07:00
Milad Nazeri
6196c6b746 more stable nametag updates 2019-06-18 14:32:11 -07:00
Zach Fox
18f703ee43 BUGZ-732: Enable text selection by mouse in Profile/Display Name field 2019-06-18 14:11:14 -07:00
Ken Cooke
5c837406ac
Merge pull request #15788 from kencooke/audio-simd-UBSan-warnings 
Fix UBSan warnings due to SIMD intrinsics
 2019-06-18 13:38:57 -07:00
Zach Fox
9b1c7b39bb
Merge pull request #15790 from zfox23/SUI/aboutTab 
Implement an "About" tab in the Settings app
 2019-06-18 13:16:30 -07:00
Zach Fox
f6822f17a9 Add computer description 2019-06-18 12:43:45 -07:00
Zach Fox
bd02a5eafd Better text formatting 2019-06-18 12:29:52 -07:00
Zach Fox
4670c11397 Tighten up the graphics on level 3 2019-06-18 12:26:03 -07:00
Zach Fox
ec4fc672b6 Better design; Interface version 2019-06-18 12:09:37 -07:00