iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50 Commits 1 Branch 0 Tags 6.5 GiB
a15e8cf91e
Commit Graph

50 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
M1_IDMhan
a15e8cf91e #15 Ready to movement in ship 2023-08-10 22:33:10 +09:00
M1_IDMhan
8af4158f44 #10 Add Projectile Asset 2023-08-10 17:23:04 +09:00
M1_IDMhan
784b0c364d #13 Boat now make mouse spot and line renderer 2023-08-10 15:39:59 +09:00
M1_IDMhan
51b44fddb8 #13 Boat Prefabs change 2023-08-10 13:42:03 +09:00
M1_IDMhan
5f95f67232 #13 Update boat and component references 2023-08-10 10:32:21 +09:00
M1_IDMhan
f47cabc061 #13 Remove redundant water materials, optimize Toon Water Material 2 and NavMesh settings, add new prefabs to main scene 2023-08-10 10:31:12 +09:00
M1_IDMhan
b65931de1a #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
M1_IDMhan
749d3dc633 #13 Assault Mode Test 2023-08-09 01:58:35 +09:00
M1_IDMhan
68b2e11b1a #13 Assasult Mode Test 2023-08-08 16:08:41 +09:00
NTG
ea03670618 #12 Add conditions for using the camera zoom function 2023-08-08 02:23:37 +09:00
NTG
517ebcf21f closed #12 Add island camera setting (ref.Bad North) 
Camera function
- Zoom-in, Zoom-out, rotation

Additional commit content
- Add scene 02.Main_TG2
 2023-08-08 01:43:26 +09:00
NTG
6051afd27c Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-08-08 01:13:34 +09:00
M1_IDMhan
775c58ca76 Git Server Test 2023-08-07 22:18:15 +09:00
koko
05cf8201d8 아일랜드 테스트 씬 업로드 2023-08-06 02:40:08 +09:00
M1_IDMhan
174619aeee Add GUI Pack, Ordin Asset 2023-08-05 01:53:27 +09:00
M1_IDMhan
551b0ac8ed #11 Shader Change 2023-08-05 01:02:49 +09:00
mappy
2cf45d3dea 로우 폴리 베드노스 맵 테스트 씬 추가 2023-08-03 17:00:22 +09:00
NTG_Lenovo
8bd4a3f3ca #7 Add FieldOfView script in aiPrefab 
Additional commit content
- Add arrow prefab, script, objectPool system
- fixed 02.Main_TG Scene
- testing fieldOfView
 2023-08-03 17:00:14 +09:00
mappy
613cd78fa4 Merge remote-tracking branch 'origin/main' 2023-08-03 14:50:29 +09:00
mappy
e22ac739d1 메터리얼 색깔 입력, 테스트 씬 수정 2023-08-03 14:50:08 +09:00
NTG_Lenovo
f1c4bdc95b 1. move script folder location 
2. change namespace "BlueWater -> BlueWaterProject"
 2023-08-03 14:49:05 +09:00
NTG_Lenovo
bd465b9f89 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 
# Conflicts:
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs.meta
 2023-08-03 14:33:33 +09:00
NTG_Lenovo
bd9c1a6cef #7 Add NavMeshAgent and layer 
fixed aiPrefab
 2023-08-03 14:32:17 +09:00
M1_IDMhan
9c462a3910 #5 bad north testmap 2023-08-03 13:15:00 +09:00
NTG_Lenovo
08826dfc19 Code cleanup 2023-08-03 12:54:59 +09:00
NTG_Lenovo
c86dc6b7b2 #7 Add rigidbody and collider of aiPrefab 
Additional commit content
- Set aiStat for testing
- Add ai interface script
- Add layer and fix physics setting
 2023-08-03 12:38:50 +09:00
M1_IDMhan
0e44c44b85 #6 ship move 2023-08-03 11:54:21 +09:00
M1_IDMhan
3973258f79 #6 Default Gerstner Wave 2023-08-03 10:03:08 +09:00
M1_IDMhan
922ed8e56e #6 Add Toon Water And GerstnerWave / InputAction Change 2023-08-03 02:10:40 +09:00
M1_IDMhan
b33c3859d0 #11 Extra Material Of Quibli 2023-08-02 22:48:17 +09:00
M1_IDMhan
5624e82819 #11 Quibli Material 2023-08-02 22:47:03 +09:00
M1_IDMhan
ddcb3e31b0 #6 InputAction, #5 Add Quibli Asset 2023-08-02 18:12:26 +09:00
NTG_Lenovo
7380e480cc closed #1 add prefab of ai(Pirate, Enemy) 
#7 add AiController and fixing script
 2023-08-02 16:45:11 +09:00
M1_IDMhan
f6b7a433df #5 Add Cube World, Doozy, LostTemple Asset 2023-08-02 15:08:03 +09:00
M1_IDMhan
13bb03c6ad #6 Water Color And Fog Setting 2023-08-02 14:37:30 +09:00
M1_IDMhan
5c2d84e613 #6 Water And Ship 2023-08-02 14:36:11 +09:00
NTG_Lenovo
9190fa313c Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-08-02 10:19:19 +09:00
mappy
222ad73761 테스트 씬 업로드 2023-08-01 16:56:55 +09:00
NTG_Lenovo
79d31e7f2d #4 Changing the AiWeight script 
and add Utils script
 2023-08-01 16:56:29 +09:00
mappy
53d042bfb8 Merge remote-tracking branch 'origin/main' 2023-08-01 16:34:52 +09:00
mappy
b606fbca41 테스트 씬 첫 번째 업로드 2023-08-01 16:25:29 +09:00
M1_IDMhan
be08df77d0 Add AStar Asset 2023-08-01 15:49:57 +09:00
NTG_Lenovo
7f62d89fd7 1. Add Navigation Package 
2. Add 4types of prefab and animation
 2023-08-01 15:39:04 +09:00
NTG_Lenovo
dd53991f62 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-08-01 14:52:37 +09:00
M1_IDMhan
c57b1bdd6e #2 URP Setting Change 2023-08-01 14:50:37 +09:00
M1_IDMhan
e7a8d13457 #2 Add Crest Water 2023-08-01 14:46:51 +09:00
M1_IDMhan
ebb6dc49b9 gitlab-ci.yml create 2023-08-01 13:54:25 +09:00
NTG_Lenovo
d767e3bde5 Add NTG Branch Test 2023-08-01 13:22:07 +09:00
M1_IDMhan
37c2da9b9c BlueWater First Push 2023-08-01 13:03:57 +09:00
DM Han
8ba5d46d19 Initial commit 2023-08-01 02:50:21 +00:00