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
77844 commits 29 branches 0 tags 1.1 GiB
Commit graph

77844 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
70531bca52 Updated with new Ubuntu zip instructions. 2019-04-23 16:51:27 -07:00
NissimHadar
e755e717b1 Restored code. 2019-04-23 15:59:03 -07:00
NissimHadar
f4b1aedbae Minor cleanup. 2019-04-23 15:06:40 -07:00
NissimHadar
68f9b473a6 Updated python interface. 2019-04-23 15:06:17 -07:00
NissimHadar
9b8f079899 Testing. 2019-04-23 13:37:47 -07:00
NissimHadar
d3e3fa5249 Added debug message. 2019-04-23 13:20:13 -07:00
NissimHadar
ffa0902dfc testing. 2019-04-23 13:04:16 -07:00
NissimHadar
2edf1676ea Corrected filenames for Mac and Ubuntu. 2019-04-23 10:45:33 -07:00
NissimHadar
c9d128ae71 testing 2019-04-23 10:39:52 -07:00
NissimHadar
0179ba8e67 testing - removed oven. 2019-04-23 09:12:47 -07:00
NissimHadar
2963dd8fa5 testing 2019-04-23 08:18:41 -07:00
NissimHadar
e7b780fcb9 testing 2019-04-23 08:11:09 -07:00
NissimHadar
182799b4ec testing 2019-04-23 08:07:25 -07:00
NissimHadar
55e1841358 testing 2019-04-23 07:58:33 -07:00
NissimHadar
5144c3b0a8 testing 2019-04-23 07:22:29 -07:00
NissimHadar
bffc0e8a85 Re-ordered commands. 2019-04-22 23:28:43 -07:00
NissimHadar
01a838b5cb Updated for Jenkins. 2019-04-22 21:36:35 -07:00
NissimHadar
dd85e224a4 Activate Qt patch. 2019-04-22 20:58:15 -07:00
NissimHadar
d7197dba65 Use QT_CMAKE_PREFIX_PATH only on local builds. 2019-04-22 20:56:32 -07:00
NissimHadar
24110ebf86 Ready for Mac/Linux testing. 2019-04-22 17:58:20 -07:00
NissimHadar
4b26ef7c0f Updated with upload to AWS instructions. 2019-04-22 16:19:40 -07:00
NissimHadar
bfcdec62a2 Before testing. 2019-04-22 15:00:22 -07:00
NissimHadar
0da6e088cb Updated readme. 2019-04-22 13:15:10 -07:00
NissimHadar
71bf3f2e14 Installation folder can be made. 2019-04-21 20:18:59 -07:00
Sabrina Shanman
16da80b9b6
Merge pull request #15425 from sabrina-shanman/bug_hfm_main-thread 
(case 22011) Fix model processing occurring on main thread
 2019-04-19 15:40:54 -07:00
Shannon Romano
71ca653498
Merge pull request #15360 from thoys/feat/create/editMultipleProperties 
Case 21228: [Create App] allow editing properties of multiple entities simultaneously
 2019-04-19 13:32:59 -07:00
Shannon Romano
c09e0eca1d
Merge pull request #15416 from SamGondelman/transparent83 
Case 22283: Fix transparent textures on baked assets
 2019-04-19 12:35:20 -07:00
Sam Gondelman
38ca699ff5
Merge pull request #15406 from sabrina-shanman/bug_oven_fst-rebake 
(case 22271) (RC83) Fix baked models unable to rebake
 2019-04-19 10:44:54 -07:00
Shannon Romano
4962bc8c10
Merge pull request #15395 from SamGondelman/oven 
Case 22213: Fix materialJSON paths in domain baker
 2019-04-19 10:39:42 -07:00
sabrina-shanman
7333b02f34 Fix model processing occurring on main thread 2019-04-19 09:48:30 -07:00
Shannon Romano
828677cd10
Merge pull request #15335 from NissimHadar/22067-updateNitpickToUseNewHifiURLs 
Case 22067: Added 'metaverse' to dev-build URL - v3.2.1
 2019-04-19 09:23:49 -07:00
Shannon Romano
d5ab49c64c
Merge pull request #15402 from sabrina-shanman/hfm_bug_model-materials_master 
(case 22216) Fix Interface not loading some baked models correctly
 2019-04-19 08:53:40 -07:00
NissimHadar
69433b1f8a
Merge pull request #15339 from NissimHadar/22076-changeTimeStampURLToEnvironmentVariable 
Case 22076: Use optional environment variable for timestamp server URL
 2019-04-19 07:39:04 -07:00
Sam Gondelman
fe3e66b74d
Merge pull request #15418 from SamGondelman/warnings 
Case 22287: Fix warnings
 2019-04-18 20:26:33 -07:00
Sam Gondelman
4f9911a655
Merge pull request #15356 from NissimHadar/22096-addVHACDUtilToInstaller 
Case 22096: Added vhacd-util and Oven to all installers.
 2019-04-18 20:25:02 -07:00
Sam Gondelman
2604afa454
Merge pull request #15396 from SamGondelman/oven2 
Case 22244: Fix oven crash (RC83)
 2019-04-18 20:22:36 -07:00
SamGondelman
7fa81ffef3 fix warnings 2019-04-18 12:48:46 -07:00
SamGondelman
27f1255899 fix transparent textures on baked assets 
(cherry picked from commit b89dbf8346)
 2019-04-18 11:23:45 -07:00
Thijs Wenker
386d392144 The step arrows are actually clickable, they were missing multi-diff behavior before this change. < = > 2019-04-18 19:05:40 +02:00
Shannon Romano
6c15719618
Merge pull request #15310 from danteruiz/fix-keyboard-scaling 
Case 21513: Keyboad doesn't scale to avatar after reloading content
 2019-04-17 16:59:42 -07:00
sabrina-shanman
d80b40e5a5 Fix baked FSTs unable to be rebaked by creating an FST in the original 
output folder
 2019-04-17 16:37:01 -07:00
Shannon Romano
bbab0b59b7
Merge pull request #15332 from raveenajain/gltf_brainstem_fix 
Case 22060 fix model
 2019-04-17 16:29:25 -07:00
Thijs Wenker
dc9f8895f8 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2019-04-18 00:21:11 +02:00
sabrina-shanman
693cdabc2c Small style fix for materialID bounds check in FBXSerializer_Mesh.cpp 2019-04-17 13:26:19 -07:00
sabrina-shanman
53f74abd49 Fix another Interface issue loading baked models 2019-04-17 13:24:04 -07:00
sabrina-shanman
343b853b59 Fix Interface not loading some baked models correctly 2019-04-17 13:24:04 -07:00
sabrina-shanman
b711ee8b8a Fix MaterialBaker not including names in baked multi-materials 2019-04-17 13:24:04 -07:00
raveenajain
2fab5a0945 parents, skeleton, break fix 2019-04-17 21:14:44 +01:00
Shannon Romano
da314694b4
Merge pull request #15271 from amantley/overrideHandAnimsSquashed 
Allow Hand Animations to be Overridden
 2019-04-17 11:53:41 -07:00
Shannon Romano
5d1c1010c5
Merge pull request #15294 from sethalves/fix-refreshGroupsCache-asan-error 
case 21977: fix asan reported error when returning QString reference to refreshGroupsCache
 2019-04-17 11:43:12 -07:00