Commit Graph

Select branches

Hide Pull Requests

master

2019_12_Shanghai

Mono Color

• bb172a1a18 Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 uc deploy 2019-12-17 22:12:50 +0800
• 7f088b56b6 [IcdeSlide] add audio uc deploy 2019-12-17 22:11:17 +0800
• fe5608462e [IcdeSlide] Version 1.0 uc deploy 2019-12-17 22:10:20 +0800
• 5c276cef4f [submodule] Updated it. LH 2019-12-17 19:19:59 +0800
• a4a08d438d [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] Added preview. Updated asset. Commit miss files. LH 2019-12-17 19:19:16 +0800
• bdf682a65d modify monitor canvas tigerchen 2019-12-17 17:35:35 +0800
• 42de55da86 add sound files & change build settings tigerchen 2019-12-17 15:02:22 +0800
• 073eb75456 change clip path & add black bg tigerchen 2019-12-17 14:28:14 +0800
• 46bfbaad0f add sound files & remove useless file tigerchen 2019-12-17 14:17:26 +0800
• 7e5d8aa6bd [03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad] 1. Updated the audio. 2. Updated the Resources. LH 2019-12-17 09:59:35 +0800
• bc8f055916 [submodule] Updated. LH 2019-12-17 00:21:48 +0800
• fd72ca10f1 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC] Update the version. LH 2019-12-17 00:20:45 +0800
• e06b0690f7 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] Flip Y (bg/fg mov) LH 2019-12-17 00:20:14 +0800
• 8eae2d972b [03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad] 1. Updated the color_ring 2. Updated the Background.mp4. LH 2019-12-17 00:19:23 +0800
• fa41940802 [Setup] Added clear feature. LH 2019-12-17 00:18:34 +0800
• d8124c2e32 Modified .gitignore LH 2019-12-16 00:58:21 +0800
• ecb29f1594 更新 '_Setup/README.md' the78ester 2019-12-15 22:37:26 +0800
• 3ed630b562 [Xcode/AppleDeveloper/Certificates, Identifiers & Profiles/comultracombosConfigClient_01.mobileprovision] Added it. LH 2019-12-15 20:06:04 +0800
• 8a726fc961 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] Implemented TransitionEffect. LH 2019-12-15 19:02:43 +0800
• aca35f75c9 Added test code. LH 2019-12-15 02:15:54 +0800
• 61d1349bd5 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] Miss commit. LH 2019-12-15 02:12:35 +0800
• 415dc33dcf [Unity-19050-ConfigClient] Updated the package settings.. LH 2019-12-14 22:42:22 +0800
• de60e9ddab [ConfigClient] Added it. LH 2019-12-14 22:37:43 +0800
• 89ad204faf [submoudle] Updated. LH 2019-12-14 22:24:37 +0800
• 6c7f9dfcf6 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC] Added bg/fg feature. LH 2019-12-14 22:19:49 +0800
• 85cc48c456 [_Setup] Added setup batch. LH 2019-12-14 18:42:45 +0800
• 01e1f09e66 更新 '_Setup/README.md' the78ester 2019-12-14 00:41:34 +0800
• 3b7963c346 更新 '_Setup/README.md' the78ester 2019-12-14 00:40:20 +0800
• c4e5ef9313 更新 '_Setup/README.md' the78ester 2019-12-14 00:34:01 +0800
• 75528a72c5 Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 LH 2019-12-14 00:10:31 +0800
• 3f961b9066 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC] Updated. LH 2019-12-14 00:10:22 +0800
• f4263f4890 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] Updated background color. LH 2019-12-14 00:01:09 +0800
• 9d5f38fa08 [03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad] Updated the asset. LH 2019-12-13 23:57:48 +0800
• f990952c2e [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] Added movie feature. LH 2019-12-13 23:57:19 +0800
• bc4854fe54 clean scene & adjust vfx tigerchen 2019-12-13 19:27:36 +0800
• 966b72a031 add random color for tuio visualizer tigerchen 2019-12-13 19:26:26 +0800
• caa00b6aac Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 tigerchen 2019-12-13 18:55:57 +0800
• d18020ac33 create main canvas & use rectTransform tigerchen 2019-12-13 18:55:50 +0800
• 083f8f0d04 [03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad] Updated the Resources 1,2,4,5,6 LH 2019-12-13 18:08:14 +0800
• 19c7a1a86e IEnumerator bug fix tigerchen 2019-12-13 15:44:23 +0800
• f95b482003 add spout tigerchen 2019-12-13 11:58:32 +0800
• a4b2f32fe7 remove useless files & add spout tigerchen 2019-12-13 11:52:08 +0800
• 124c9aa278 add snow canvas group & fade function tigerchen 2019-12-13 11:26:24 +0800
• 1458745b33 adjust vfx tigerchen 2019-12-12 19:18:54 +0800
• a1a2e2de09 Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 tigerchen 2019-12-12 18:49:40 +0800
• e6ea093483 random ice & fix video flickering tigerchen 2019-12-12 18:49:27 +0800
• 71a732efa2 Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 LH 2019-12-12 17:25:36 +0800
• 77c27cba5d Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 chwan1 2019-12-12 17:24:52 +0800
• 98e8ca0a0f fix a bug that Flake video is not random in Unity-19050-05-BallPool chwan1 2019-12-12 17:24:46 +0800
• 11594ac6f8 [_Setup] Added 05_BallPoll batch & conf. LH 2019-12-12 17:24:04 +0800
• f36e78d8e5 更新 '_Setup/README.md' the78ester 2019-12-12 17:08:36 +0800
• ffef1db943 Unity-19050-05-BallPool finished chwan1 2019-12-12 17:02:00 +0800
• 6740869a51 更新 '_Setup/README.md' the78ester 2019-12-12 16:51:52 +0800
• 564ee0f078 Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 LH 2019-12-12 16:46:22 +0800
• 5f8ecc44ea [com.ultracombos.flockaroo] Updated it. LH 2019-12-12 16:46:15 +0800
• e0f841dace [03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad] Updated the version. LH 2019-12-12 16:44:49 +0800
• 0df07a2acd [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] 1. Rollback portrait position 2. Turn off Oil Paint Effect. LH 2019-12-12 16:41:10 +0800
• 4057a545e8 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC] Disabled Oil Paint Effect. LH 2019-12-12 16:39:26 +0800
• 3092d89fe1 add touchVisualizer tigerchen 2019-12-12 15:51:59 +0800
• 48a8ae9b3f Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 tigerchen 2019-12-12 12:23:27 +0800
• e07b672a55 fade function for bg movie tigerchen 2019-12-12 12:23:21 +0800
• 1f743d1010 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC] 1. Added oil effect. 2. Draw render texture only once. LH 2019-12-12 01:29:34 +0800
• a989960e2c [submodule] Updated it. LH 2019-12-12 00:05:05 +0800
• c00b750907 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] Updated the effect variables. LH 2019-12-11 23:58:16 +0800
• 3d8ac11021 [03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad] 1. Added Deco feature. 2. Modified CN / EN Deco. LH 2019-12-11 23:54:34 +0800
• 3eca6dd098 [03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad] Modified CN language text. LH 2019-12-11 18:43:59 +0800
• 16f9a9e24c [submudule] Updated. LH 2019-12-10 21:17:23 +0800
• 03a1e4dbd0 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC] Fixed no color bug. LH 2019-12-10 21:13:51 +0800
• 93525182bb [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] Added spout feature. LH 2019-12-10 21:12:58 +0800
• bd94cffa8a Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 LH 2019-12-10 20:08:31 +0800
• 3e9f32141b [submudules] Updated the spout to upm branch. LH 2019-12-10 20:08:16 +0800
• 0e7940ab48 [submodule] Added it. LH 2019-12-10 19:52:49 +0800
• 9897ed057b [submudules] Removed LH 2019-12-10 19:51:09 +0800
• b791baf13b [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] Layout the portrait. LH 2019-12-10 19:40:30 +0800
• 35868f1205 [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] Removed useless asset. LH 2019-12-10 19:39:05 +0800
• 391f268a80 Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 tigerchen 2019-12-10 19:13:02 +0800
• 36328949d9 add StatManager & horse dshow clip tigerchen 2019-12-10 19:12:48 +0800
• 40e20e22d5 change blend mode & adjust vfx tigerchen 2019-12-10 19:11:47 +0800
• 8c5dfe4887 Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 LH 2019-12-10 18:27:19 +0800
• dda25bea1b [03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC] Added color feature. LH 2019-12-10 18:26:57 +0800
• 09cca2a7ac [03_RoyalGallery/DotNet-PrinterController] Added 5x7 example. LH 2019-12-10 16:37:45 +0800
• a47678a467 [03_RoyalGallery/DotNet-PrinterController] Commit miss files. LH 2019-12-10 15:37:13 +0800
• a02c3bb97b [03_RoyalGallery/DotNet-PrinterController] Added files. LH 2019-12-10 15:36:43 +0800
• 3c25a876ae [03_RoyalGallery/DotNet-PrinterController] Created it. LH 2019-12-10 15:35:01 +0800
• 96de52e22f [Setup] Added LH setup. LH 2019-12-10 15:24:13 +0800
• 3a9b1cb745 [03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad] 1. Updated the standby movie. 2. Added standby text. LH 2019-12-10 15:23:36 +0800
• 6102aba39f change dshow clip path tigerchen 2019-12-10 15:04:48 +0800
• eceab86f30 separate postprocess volume from camera & rename gameobjects in scene tigerchen 2019-12-10 14:58:04 +0800
• 6bd2910541 Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 tigerchen 2019-12-10 14:47:23 +0800
• 3c1327e57b add vfx controller & post alpha function tigerchen 2019-12-10 14:47:16 +0800
• 2248cc5f4c Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 LH 2019-12-10 14:27:14 +0800
• 4b57c1a974 [Setup] Added files. LH 2019-12-10 14:27:03 +0800
• 81a2f773bc add postprocess confg params & add sounds folder tigerchen 2019-12-10 14:13:36 +0800
• 1f6cca915c Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2 tigerchen 2019-12-10 12:49:44 +0800
• 5fc2264d59 add vfx config params tigerchen 2019-12-10 12:49:37 +0800
• 0b26fda347 [AppleDeveloper] Added Certificates, Identifiers & Profiles. LH 2019-12-10 12:36:23 +0800
• 74dd9bff57 [Unity-19050-01_ForstCoronation] Removed it. tigerchen 2019-12-10 11:06:49 +0800
• 9745a4b2c8 [submudule] Updated. tigerchen 2019-12-10 11:02:30 +0800
• c4f89d8970 [01_ForstCoronation/Unity-19050-01_ForstCoronation] Updated. tigerchen 2019-12-10 10:58:59 +0800
• e7827a8ded [01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation] Updated asset. tigerchen 2019-12-10 10:57:21 +0800