Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-02 18:09:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
64946 commits 74 branches 59 tags 1.2 GiB
Commit graph

1782 commits

Author SHA1 Message Date
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
Atlante45
80c0f2a21e Fix crash when passing --checkMinSpec flag 
That flag caused a DLL to be loaded before Application was
	instanced.
	This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
	the previous registration pointing the startup function in
	the main executable to be overridden with the address of the
	function in the DLL (Since they both link the same static
	library)
	This leads to the correct function running in the wrong address
	space (the DLLs), hence not initializing some global variables
	correctly.
 2018-02-22 16:29:38 -08:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals 
Material Entities
 2018-02-19 10:58:02 -08:00
Stephen Birarda
81662b5edc don't overwrite general description object with filtered one 2018-02-15 19:14:14 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals 2018-02-15 11:02:49 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
Stephen Birarda
4d4b42848b add alert for moved content settings 2018-02-14 16:31:28 -08:00
Stephen Birarda
37b8fa2c0c put back default values in settings response 2018-02-14 12:09:57 -08:00
Stephen Birarda
3516a8939a flag settings in description as being excluded from backups 2018-02-14 12:09:57 -08:00
Stephen Birarda
9f2015ba46 check correct element to determine if restart is required 2018-02-14 12:09:57 -08:00
Stephen Birarda
09c2390db4 change backup file name, fix safari button click bug 2018-02-14 12:09:57 -08:00
Stephen Birarda
11fe279f6f add domain settings backup and restore to web interface 2018-02-14 12:09:57 -08:00
Stephen Birarda
2f6b079d80 quick re-organization of settings groups 2018-02-14 12:09:57 -08:00
Stephen Birarda
0ace92798d repair 2.1 settings migration code for avatar height 2018-02-14 12:09:57 -08:00
Stephen Birarda
bb2df1eb37 rename entity server section to remove settings 2018-02-14 12:09:57 -08:00
Stephen Birarda
3969288996 re-hide advanced settings and show with collapsible 2018-02-14 12:09:57 -08:00
Stephen Birarda
b650753e43 hide confusing label from domain settings for now 2018-02-14 12:09:57 -08:00
Stephen Birarda
6e93eb5dfa update SVG icon for HMD with new colour 2018-02-14 12:09:57 -08:00
Stephen Birarda
2c2a6d5c60 add the empty label group to domain extra groups 2018-02-14 12:09:57 -08:00
Stephen Birarda
8c924ea106 update badge colour 2018-02-14 12:09:57 -08:00
Stephen Birarda
b0967dfc3a move some more settings to content, leave places in domain settings 2018-02-14 12:09:57 -08:00
Stephen Birarda
6240181474 initial separation of content settings and domain settings 2018-02-14 12:09:56 -08:00
Atlante45
e15ab2ca6c CR 2018-02-12 13:32:48 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -08:00
Atlante45
46449256ce CR 2018-02-09 11:38:46 -08:00
Atlante45
87f77b6257 Asset Server Backup 2018-02-09 11:32:42 -08:00
Stephen Birarda
7a21ae8d89 re-send a connection token packet if the current one is null 2018-02-02 15:25:43 -08:00
Stephen Birarda
98d581acd1 fix debug lines in DomainGatekeeper with extra parens 2018-02-02 13:47:48 -08:00
Atlante45
314c51ab3b Fix settings init in all exe 2018-01-26 15:53:08 -08:00
Thijs Wenker
1bfb62bd7f list assignment types in assignment-client help 2017-12-18 15:32:32 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Anthony J. Thibault
d1609fb964 domain-server warning fix 2017-11-28 17:48:34 -08:00
Stephen Birarda
e2082c0bcf apply machine fingerprint permissions if username absent 2017-11-27 19:02:40 -08:00
Stephen Birarda
8978254037 kick logged in by fingerprint/ip if enabled in DS settings 2017-11-27 18:23:14 -08:00
Atlante45
b398e235a2 Add tmpRezCertified to default perms 2017-11-22 13:40:44 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -08:00
Brad Hefta-Gaub
0945c1c50b
Merge pull request #11851 from Atlante45/feat/wizard 
Reworked wizard congratulation page.
 2017-11-21 09:15:59 -08:00
Brad Hefta-Gaub
74bafcbb10
Merge pull request #11795 from huffman/fix/ds-punchlist 
Punchlist fixes for DS
 2017-11-17 17:04:27 -08:00
Atlante45
1f23664c2f Update wizard's congratulation page 2017-11-17 16:33:22 -08:00
Ryan Huffman
b5c4517ee7 Update DS Settings strings 2017-11-13 15:59:57 -08:00
Atlante45
8f133fc7fa Congratulation page styling fixes 2017-11-10 18:12:43 -08:00
Atlante45
067436a743 CR 2017-11-10 18:12:33 -08:00
Atlante45
9cd8f372f2 Fix race condition 2017-11-10 16:21:06 -08:00
Atlante45
796909d366 Permissions page tweaks 2017-11-10 16:19:49 -08:00
Atlante45
2782ae03c5 Add back buttons 2017-11-10 15:48:44 -08:00
Atlante45
c047a1d0a4 Rework perms wizard page 2017-11-10 15:48:44 -08:00
Ryan Huffman
ecc76ab321 Remove dead code from ds settings 2017-11-10 15:35:05 -08:00
Ryan Huffman
2307cde599 Fix add-place button being added when account disconnected 2017-11-10 15:34:53 -08:00