Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
78025 commits 29 branches 0 tags 1.1 GiB
Commit graph

78025 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
f2678ddb73 Corrected both installers. 2019-04-29 12:57:08 -07:00
NissimHadar
d1a29daf36 Corrected both installers. 2019-04-29 12:56:49 -07:00
NissimHadar
53c5e966db Debugging when to use macdeployqt. 2019-04-29 12:47:39 -07:00
NissimHadar
52636564a1 Added macdeployqt to local builds for nitpick. 2019-04-29 12:36:02 -07:00
NissimHadar
7eaa45f5c1 Added macdeployqt to local builds. 2019-04-29 12:33:23 -07:00
NissimHadar
67fb5efa37 Do not always download Qt. 2019-04-28 18:25:00 -07:00
NissimHadar
79f73cf06c Minor cleanup 2019-04-27 22:52:55 -07:00
NissimHadar
88f2cfa965 Updated for Ubuntu 16.04 2019-04-27 22:22:57 -07:00
NissimHadar
03b4d1b472 Updated readme. 2019-04-27 11:00:15 -07:00
NissimHadar
6f7cc6d07f Corrected README.md for Mac. 2019-04-26 16:27:02 -07:00
NissimHadar
b84f8110f0 Updated for Mac. 2019-04-26 15:53:38 -07:00
NissimHadar
ced1f7d82b Typo 2019-04-26 15:30:40 -07:00
NissimHadar
08ca27bf42 Add qt.conf and updated README.md 2019-04-26 15:30:00 -07:00
NissimHadar
5aff0bf3e9 Make sure vcpkg'ed version of windeployqt.exe is used. 2019-04-25 15:07:34 -07:00
NissimHadar
230493035d To update the vcpkg Qt. 2019-04-25 14:28:11 -07:00
NissimHadar
a4d5aa8eac Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2 2019-04-25 14:26:29 -07:00
Shannon Romano
766854081a
Merge pull request #15457 from davidkelly/dk/22291 
Tiny logical error in wallet creation
 2019-04-25 14:10:00 -07:00
Sam Gondelman
26a0eb3993
Merge pull request #15456 from SamGondelman/openurl 
Case 22334: openUrl fix
 2019-04-25 14:06:46 -07:00
Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl 2019-04-25 13:21:27 -07:00
SamGondelman
0e4ea4aff2 fix openDirectory 2019-04-25 13:20:18 -07:00
Shannon Romano
164984b15d
Merge pull request #15459 from luiscuenca/sentHandsCrashFix 
Fix crash sending other avatars hands to flow
 2019-04-25 12:32:06 -07:00
Thijs Wenker
cdcdae2fda
Merge pull request #15393 from ctrlaltdavid/M22188 
Update Record app per Marketplace certification requirements
 2019-04-25 20:00:13 +02:00
Shannon Romano
392b372815
Merge pull request #15452 from AndrewMeadows/send-after-applying-bookmark 
Case 21884: send update after changing AvatarEntity via AvatarBookmarks.updateAvatarEntities()
 2019-04-25 10:31:25 -07:00
luiscuenca
6b33f4e027
Don't call function if flow is not active and made it thread safe 2019-04-25 10:31:05 -07:00
NissimHadar
9b22614135 Removed test code. 2019-04-25 10:16:15 -07:00
David Kelly
c63ee8d4f6 Tiny logical error in wallet creation 2019-04-25 09:21:06 -07:00
NissimHadar
90d7948e0d TEST 2019-04-25 09:01:10 -07:00
NissimHadar
450bc96c39 Cleanup. 2019-04-25 08:53:25 -07:00
NissimHadar
bf1d73b413 Undid testing. 2019-04-25 08:29:53 -07:00
NissimHadar
db77fda626 testing. 2019-04-25 07:46:23 -07:00
Howard Stearns
da1597c5d1
Merge pull request #15327 from Atlante45/fix/warnings 
Case 22065: Fix mac warnings
 2019-04-24 20:32:29 -07:00
NissimHadar
91eacf7d3c Added message to know Qt path. 2019-04-24 18:02:39 -07:00
NissimHadar
c05ac9a5dd testing. 2019-04-24 17:51:27 -07:00
NissimHadar
b40209588a Merge branch '22007-hifiQtBuildv2' of github.com:NissimHadar/hifi into 22007-hifiQtBuildv2 2019-04-24 17:40:57 -07:00
NissimHadar
ba9733aa03 Removed test code. 2019-04-24 17:40:08 -07:00
NissimHadar
331f692e34 Cleanup of readme. 2019-04-24 17:39:02 -07:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Shannon Romano
404be42bfb
Merge pull request #15409 from wayne-chen/fixShieldIconBehavior 
Case 22290: Fixing Shield Icon Behavior in Desktop Mode
 2019-04-24 16:35:02 -07:00
Shannon Romano
0051693da8
Merge pull request #15414 from wayne-chen/fixRelaunchMuteSettings 
Case 22298: Persist Mute Settings Between Sessions
 2019-04-24 16:34:34 -07:00
Andrew Meadows
084759a918 send update after changing entity 2019-04-24 16:32:39 -07:00
Shannon Romano
70c2b8b8c4
Merge pull request #15443 from Atlante45/fix/asset-server-baking-master 
Case 22333: Master: Fix asset server auto-baking
 2019-04-24 16:30:14 -07:00
Shannon Romano
10cfa9557d
Merge pull request #15448 from wayne-chen/fixMarketplaceLoginBug-83 
Case 22346: Market -- Please Login -- does not work
 2019-04-24 16:13:43 -07:00
NissimHadar
bd40ea057b Testing windeployqt 2019-04-24 14:42:18 -07:00
Sam Gondelman
1540c5d203
Merge pull request #15401 from SamGondelman/grid 
Case 22229: Create Grid ignorePickIntersection
 2019-04-24 12:24:27 -07:00
NissimHadar
2009ce95b2 Updated readme. 2019-04-24 11:37:46 -07:00
Shannon Romano
1b67042091
Merge pull request #15428 from raveenajain/gltf_debug 
case 22347: glTF move debug code
 2019-04-24 10:31:49 -07:00
NissimHadar
030f172999 Updated readme for "Fix" 2019-04-24 10:28:11 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-24 09:52:12 -07:00
Shannon Romano
4148ebfd18
Merge pull request #15447 from SamGondelman/materialData 
Case 22329: Don't try to bake materialURL if it points to materialData
 2019-04-24 09:26:52 -07:00
Shannon Romano
839aa0ebe8
Merge pull request #15446 from amerhifi/questCrashFix 
Case 22340 : turning on blit present for quest
 2019-04-24 09:24:24 -07:00