Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-14 16:37:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
78932 commits 22 branches 0 tags 1.2 GiB
Commit graph

78932 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
6f74098032 Fixing the getCPUIDEX 2019-05-28 00:26:30 -07:00
Sam Gateau
99f8b61727 Trying to unify the getCPUID function in CPUIdent 2019-05-28 00:14:50 -07:00
Sam Gateau
42d1b340cd Trying to unify the getCPUID function in CPUIdent 2019-05-28 00:00:45 -07:00
Sam Gateau
7c477740d3 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-05-27 12:48:20 -07:00
Sam Gateau
546639fdfe Adding a script and ui to check the values returned by the PlatformInfo ui 2019-05-26 12:30:50 -07:00
Sam Gateau
bd3881ef14
Merge pull request #15634 from SamGondelman/skyboxColor 
BUGZ-380: Revert skybox color behavior
 2019-05-26 10:43:54 -07:00
Shannon Romano
12996b2d7d
Merge pull request #15637 from kencooke/audio-init-racecond-crashfix 
BUGZ-158: Crash when switching audio devices on Mac
 2019-05-25 16:26:56 -07:00
Sam Gateau
5001a04326 Updating the platform lib, implementing the first version of the profiler and exposing all these through the PlatformInfoScriptingInterface 2019-05-25 15:53:54 -07:00
Brad Hefta-Gaub
3ce790b459
Merge pull request #15636 from annabrewer/build-update 
BUGZ-354: Update Android and Windows build documentation to reflect latest changes
 2019-05-25 11:59:10 -07:00
Ken Cooke
501ceaa6aa Add lock-free wait for initialization to the audio output callback. 
Eliminates race condition without making assumptions about the internal audio threading model.
 2019-05-25 10:47:26 -07:00
Anna
5c0d7c831f made android instructions more general and added VS 2019 support 2019-05-24 19:06:38 -07:00
Anna
d138e2c994 test commit 2019-05-24 19:01:50 -07:00
Anna
9b5b994dd7 Merge branch 'master' of github.com:highfidelity/hifi into build-update 2019-05-24 19:00:52 -07:00
Andrew Meadows
a6a877d930 clear _entitiesToDeleteLater on shutdown 2019-05-24 16:17:55 -07:00
Andrew Meadows
5988f8cce6 avoid calling removeOwnershipData() from multiple threads 2019-05-24 16:12:21 -07:00
SamGondelman
61280214ca revert skybox color behavior 2019-05-24 15:52:50 -07:00
Amer
9b26f70e2f
Merge pull request #15633 from amerhifi/master 
BUGZ 220: Docked Widget Whitelisting
 2019-05-24 15:52:18 -07:00
Roxanne Skelly
82f8687e9f ubuntu builds are picky (fix initializer order issue) 2019-05-24 15:47:30 -07:00
Roxanne Skelly
41be22a7bb ubuntu build fix and CR fix 2019-05-24 15:22:33 -07:00
Roxanne Skelly
c6de86a80c Log packet processing time for domain server list request packets 2019-05-24 14:52:55 -07:00
Zach Fox
b72d3a2a8e
Merge pull request #15632 from MiladNazeri/nameTagDisplayNameFix 
Name tag display name fix
 2019-05-24 14:47:49 -07:00
amerhifi
5a3585ea5b adressing pr comments 2019-05-24 14:36:42 -07:00
milad
03600f23ba removed terenary expression 2019-05-24 14:12:36 -07:00
amerhifi
6f04e039fe adding whitelisting for dockedWidgets 2019-05-24 14:12:24 -07:00
milad
81dd097940 added an extra line 2019-05-24 14:00:32 -07:00
milad
46475c23c1 removed log 2019-05-24 13:59:01 -07:00
milad
27c4841887 Updated Nametag to use the sessionDisplayName or the displayName as default 2019-05-24 13:57:18 -07:00
milad
83171a7cde Merge branch 'master' of github.com:highfidelity/hifi 2019-05-24 13:55:54 -07:00
SamGondelman
41e486b120 re-enable quest keyboard 2019-05-24 13:14:54 -07:00
Zach Fox
2bf95fe683
Merge pull request #15630 from zfox23/SUI/settingsFixes02 
Fix BUGZ-312; BUGZ-311
 2019-05-24 13:07:43 -07:00
Zach Fox
6cf2145c16 Fix BUGZ-312; BUGZ-311 2019-05-24 12:58:38 -07:00
Zach Fox
26fd5f4302
Merge pull request #15629 from zfox23/BUGZ-344 
Fix BUGZ-344: Avatar Menu says "You have not created any avatars" but I have
 2019-05-24 12:25:16 -07:00
Zach Fox
51d22c1988 Fix BUGZ-344 2019-05-24 12:12:55 -07:00
Zach Fox
6c9c3f76ed
Merge pull request #15628 from zfox23/moveDefaultScriptsAgain 
Move SimplifiedUI folder again, and make the associated defaultScripts.js actually work
 2019-05-24 11:29:23 -07:00
Sam Gateau
a5d17883d0
Merge pull request #15602 from SamGondelman/tests 
BUGZ-21, Case 22219: Fix skyboxes/ambient maps on AMD
 2019-05-24 11:29:04 -07:00
amerhifi
ee3e2f0dd7 merge master 2019-05-24 11:00:30 -07:00
amerhifi
bd88a68a0f testing context passing to dockWidget via whitelisting. 2019-05-24 10:58:13 -07:00
Zach Fox
f69e4cd47d Move default scripts again and make them actually work 2019-05-24 10:05:54 -07:00
Roxanne Skelly
aaee796aef Merge branch 'master' of https://github.com/highfidelity/hifi into domaincheckin 2019-05-24 09:38:37 -07:00
SamGondelman
dc3b2d97e3 fix the actual problem 2019-05-24 09:36:37 -07:00
Brad Hefta-Gaub
f9773dfdd8
Merge pull request #15615 from jherico/feature/post-build-script 
DEV-50: Add postbuild script
 2019-05-24 09:17:37 -07:00
Brad Hefta-Gaub
5765957fe1
Merge pull request #15618 from luiscuenca/addCredentials 
Pass tokens as params for automatic login
 2019-05-24 09:13:53 -07:00
milad
fb9ad762a2 merge conflict fix 2019-05-23 22:33:11 -07:00
luiscuenca
050682c84c
Keep logged in after first run 2019-05-23 19:53:37 -07:00
luiscuenca
42c1f4be33
fix typo and entry on first run when --url is set 2019-05-23 17:07:06 -07:00
Shannon Romano
49f6794789
Merge pull request #15624 from hyperlogic/feature/qt-5.12.3-windows-symbols 
Update windows build with symbols for release qt-5.12.3
 2019-05-23 16:18:58 -07:00
Anthony J. Thibault
a394145239 Merge branch 'master' into feature/qt-5.12.3-windows-symbols 2019-05-23 15:45:49 -07:00
Roxanne Skelly
cc3ce96227 fix ubuntu build issue 2019-05-23 15:24:41 -07:00
Shannon Romano
aadac2e5ce
Merge pull request #15607 from sethalves/fix-ubuntu-18.10 
only worry about Ubuntu major versions when selecting Qt package
 2019-05-23 15:22:06 -07:00
Shannon Romano
cc2e5af34d
Merge pull request #15619 from kencooke/audio-mac-callback-crashfix 
BUGZ-158: Crash when switching audio devices on Mac
 2019-05-23 15:20:08 -07:00