Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79748 commits 71 branches 56 tags 1.2 GiB
Commit graph

79748 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
2f74f8253f finishing requested changes 2019-07-11 15:39:59 -07:00
SamGondelman
046b25ab67 fix haze on web entities, deferred and forward 2019-07-11 14:56:17 -07:00
Andrew Meadows
0d943ca55a more warning supression 2019-07-11 14:47:31 -07:00
Zach Fox
4c7d0fc6f4 Updated layout 2019-07-11 14:46:05 -07:00
howard-stearns
2eb3fdb1ec Merge branch 'master' of https://github.com/highfidelity/hifi into mac-sleep-monitor 2019-07-11 14:35:00 -07:00
amer cerkic
15e7663ed5 removing the destroy call since its not necessary 2019-07-11 14:27:41 -07:00
Andrew Meadows
f165184fb2 eliminate warnings about signed-vs-unsigned comparison 2019-07-11 14:09:37 -07:00
SamGondelman
7793e07eeb fix polyvox 2019-07-11 13:34:58 -07:00
Shannon Romano
dd9b4a8143
Merge pull request #15917 from PrestonB1123/disablePShortcut 
disabled P shortcut and re-enabled in metaverse
 2019-07-11 13:32:11 -07:00
SamGondelman
22a7a97a9a fix forward web + parabola blending 2019-07-11 12:23:04 -07:00
amer cerkic
efccd10a65 adding a destroy call to hmd scripting interface to ensure that it does not call isHmd mode on already dead display plugin. Also moved displayplugin reset below ui destroy calls to make sure it does not get called after its been destroyed 2019-07-11 12:15:15 -07:00
PrestonB1123
07c71cbadb disabled P shortcut and re-enabled in metaverse 2019-07-11 12:05:15 -07:00
Zach Fox
ce2b7e5baa Finish all of the logic and most of the layout 2019-07-11 12:05:13 -07:00
Andrew Meadows
ba8978862d improved names for workload::Region constants 2019-07-11 11:17:04 -07:00
luiscuenca
bc5f8ad775
Remove unneeded response 2019-07-11 11:13:58 -07:00
SamGondelman
9539664749 add haze to skybox 2019-07-11 11:00:30 -07:00
howard-stearns
8d3dc52ac0 mac sleep monitor checkpoint 2019-07-11 10:58:31 -07:00
luiscuenca
9c56f74662
Get recent builds asynchronously 2019-07-11 10:28:49 -07:00
Shannon Romano
a4aa5d7eb4
Merge pull request #15915 from danteruiz/new-scripts-arg 
DEV-172: Lilypad Launcher (Mac): Instrument the launcher to use the new "override default scripts" command line switch
 2019-07-11 09:55:44 -07:00
Zach Fox
2471a3eb72 Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings 2019-07-11 09:02:42 -07:00
SamGondelman
6ce809fb2a merge with master 2019-07-11 09:01:30 -07:00
dante ruiz
2ffacfea83 change script params 2019-07-11 08:51:47 -07:00
SamGondelman
d545ba5bc6 haze on most entities, working on skybox 2019-07-10 23:52:50 -07:00
Shannon Romano
eb1cb3b11c
Merge pull request #15910 from luiscuenca/WLdefaultScriptsOverride 
DEV-166: Instrument the Windows Launcher to use the defaultScriptsOverride parameter
 2019-07-10 18:44:54 -07:00
dante ruiz
c4a0b39068 requested changes 2019-07-10 17:56:54 -07:00
Shannon Romano
54b07e9c9b
Merge pull request #15905 from SamGondelman/text 
BUGZ-967: Fix text visibility toggle
 2019-07-10 17:47:10 -07:00
Simon Walton
645a99c200 Generate RSA key-pair early in start-up 2019-07-10 17:36:25 -07:00
amer cerkic
d5d5741d42 removed extra lines 2019-07-10 17:17:53 -07:00
Shannon Romano
2dfc03ea47
Merge pull request #15909 from luiscuenca/WLtrimSpaces 
BUGZ-656: Trim spaces for orgname and username fields on Windows Launcher
 2019-07-10 17:17:29 -07:00
amer cerkic
73097113c7 adding a null check to the display plugin. Possible that display plugin was disposed off during the check if hmdmode 2019-07-10 17:13:34 -07:00
luiscuenca
562a181377
replace backslashes on script override 2019-07-10 16:56:17 -07:00
Zach Fox
4caa00d6cc Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface 2019-07-10 16:42:48 -07:00
luiscuenca
94002436e9
Override default script 2019-07-10 16:05:24 -07:00
Amer
4c145386e5
Merge pull request #15899 from amerhifi/bugz-907 
Case bugz-907: On launch default to non hmd device
 2019-07-10 16:03:29 -07:00
Howard Stearns
084b2edad4
Merge pull request #15908 from SimonWalton-HiFi/keygen-thread-logging 
BUGZ-918: Verbose RSA-keypair logging
 2019-07-10 15:57:30 -07:00
luiscuenca
c8ed1e369d
Trim spaces on orgname and username 2019-07-10 15:45:14 -07:00
Howard Stearns
7eaa29c147
Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui 
new-account wallets in simplified UI
 2019-07-10 15:09:59 -07:00
Simon Walton
7a64ed10f6 Verbose RSA-keypair logging 2019-07-10 15:08:51 -07:00
Sam Gondelman
a64d307bdf
make sure we don't have transparent shadow casters 2019-07-10 14:21:56 -07:00
Andrew Meadows
1a5a925a4c fix a typo 2019-07-10 14:18:34 -07:00
amer cerkic
e463a828ef removed extra line 2019-07-10 14:09:51 -07:00
amer cerkic
bc51b8e709 removed extra space 2019-07-10 14:08:20 -07:00
amer cerkic
fc21f6088a undoing code structures changes to else blocks 2019-07-10 14:07:10 -07:00
Zach Fox
ebfbe46760
Merge pull request #15907 from zfox23/moveSimplifiedUIJS 
DEV-165: Move Simplified UI scripts around; remove extra copy of scripts; never pause other scripts
 2019-07-10 13:52:19 -07:00
Zach Fox
712d608c15 Better logic in bootstrapper to not load alread running scripts 2019-07-10 13:23:50 -07:00
Zach Fox
85b563461a DEV-165: Move Simplified UI scripts around; remove extra copy of scripts; never pause other scripts 2019-07-10 12:06:08 -07:00
dante ruiz
7c024b4e8a fix interactive window crash 2019-07-10 11:49:36 -07:00
SamGondelman
9a866a129d fix text visibility toggle 2019-07-10 10:20:27 -07:00
Shannon Romano
f235778a6e
Merge pull request #15866 from huffman/feat/override-default-scripts 
DEV-164: Add defaultScriptsOverride option
 2019-07-10 10:16:55 -07:00
Zach Fox
57c820f42f
Merge pull request #15897 from zfox23/SUI/emoteAppPrototype 
Implement DEV-218 & DEV-219 and commit a starting point for the Emote app
 2019-07-10 09:53:09 -07:00