A-Rival/Promether
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: A-Rival:ssasin
Branches Tags
A-Rival:master A-Rival:SJW1024 A-Rival:ssasin A-Rival:HappyTanuki A-Rival:develop A-Rival:Peter
A-Rival:server A-Rival:debug_client A-Rival:client
...
compare: A-Rival:SJW1024
Branches Tags
A-Rival:SJW1024 A-Rival:ssasin A-Rival:HappyTanuki A-Rival:develop A-Rival:master A-Rival:Peter
A-Rival:server A-Rival:debug_client A-Rival:client

19 Commits
ssasin ... SJW1024

Author SHA1 Message Date
SJW1024
d6c58e8c15 Merge remote-tracking branch 'origin/ssasin' into SJW1024 
# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/Bp_DefaultplayerController.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Bolla_Throw.uasset
#	Content/Character/Lb/Lb_RskillBurst.uasset
#	Content/Character/Lb/Lb_WskillDebuff.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
 2023-11-15 04:14:43 +09:00
HappyTanuki
8276b4f3f0 맵 병합 2023-11-15 03:41:11 +09:00
HappyTanuki
a1d0304ea8 Merge remote-tracking branch 'origin/ssasin' into SJW1024 
# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/Bp_DefaultplayerController.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Bolla_Throw.uasset
#	Content/Character/Lb/Lb_RskillBurst.uasset
#	Content/Character/Lb/Lb_WskillDebuff.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
 2023-11-15 02:17:44 +09:00
SJW1024
6691dfd3fa 캐릭터 스킬 최종 2023-11-15 02:14:46 +09:00
HappyTanuki
598a21efc3 머지 완료 2023-11-14 02:44:53 +09:00
HappyTanuki
24932cdd2b Merge branch 'HappyTanuki2' into SJW1024 
# Conflicts:
#	Content/Character/Allium/Alium_Q.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Q_Arrow.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/GameModeBase/Deathmatch.cpp
 2023-11-14 02:27:19 +09:00
SJW1024
334064270f 알리움 사운드 수정,. 리아나 스킬 제작중 2023-11-14 01:10:43 +09:00
HappyTanuki
db63221d3d 머지 완료 2023-11-14 01:00:29 +09:00
HappyTanuki
a21c1378f1 Merge branch 'SJW1024' into HappyTanuki2 
# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/BaseArrow.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
 2023-11-13 22:58:56 +09:00
SJW1024
b27742e32f 복구 2023-11-13 22:37:54 +09:00
SJW1024
9a6fc93fa1 삭제 2023-11-13 22:35:11 +09:00
SJW1024
4c3356ffc2 파운드 100%, 알리움 대상 지정 제외 전체 완성 2023-11-13 06:53:58 +09:00
HappyTanuki
8e4677250e 평타 구현 완료 2023-11-10 00:22:09 +09:00
HappyTanuki
1cd43f4527 저장 2023-11-09 22:51:12 +09:00
HappyTanuki
f085e924bb Merge branch 'ForShowcase' into HappyTanuki2 
# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/BaseArrow.uasset
#	Content/Character/Lb/EskillBuff.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
 2023-11-09 20:05:38 +09:00
HappyTanuki
56c68e85d0 쇼케이스용 중간 결과물 2023-10-30 01:08:42 +09:00
HappyTanuki
cf98a38684 Merge branch 'ssasin' into HappyTanuki 
# Conflicts:
#	Content/Maps/DevMap.umap
 2023-10-27 21:42:53 +09:00
HappyTanuki
053c56f37c 호-밍 공격 및 선택 시스템 구현 2023-10-25 02:40:51 +09:00
ssasin3801
8a08d4b487 맵 기초틀 변경 2023-10-24 00:11:56 +09:00
248 changed files with 864 additions and 384 deletions
Expand all files Collapse all files

7
Config/DefaultEngine.ini
View File

@@ -1,8 +1,9 @@
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Game/Maps/DevMap.DevMap GameDefaultMap=/Game/Maps/MiniMap.MiniMap
EditorStartupMap=/Game/Maps/DevMap.DevMap EditorStartupMap=/Game/Maps/MiniMap.MiniMap
GameInstanceClass=/Script/Promether.DefaultGameInstance GameInstanceClass=/Script/Promether.DefaultGameInstance
ServerDefaultMap=/Game/Maps/DevMap.DevMap ServerDefaultMap=/Game/Maps/MiniMap.MiniMap
TransitionMap=/Game/Maps/MiniMap.MiniMap
[/Script/WindowsTargetPlatform.WindowsTargetSettings] [/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 DefaultGraphicsRHI=DefaultGraphicsRHI_DX12

BIN
Content/Blueprints/BP_DefaultPlayerCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/BP_defaultplayerstate.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Bp_DeathMatch.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Bp_DefaultplayerController.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/DefaultClass.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/UI/NewWidgetBlueprint.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/리아나E.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/리아나Q.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/리아나R.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/리아나_P.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/리아나_W.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/메인_UI.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/불투명_ver_.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/스킬칸.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/알리움P.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/알리움R.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/체력+마나_배경_.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/체력바.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/파운드E.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/파운드Q.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/파운드R.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/파운드W.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_P_Buff1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_P_Buff2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_Q.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_Q_Debuff1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_Q_Debuff2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_R.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_R_Attack.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_R_Hit.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_W.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_w.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_w_debuff.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Aliun_E_Effect.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/ABP_Allium.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Attack1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Attack2_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Attack3_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill2_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill3_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill4_1_Anim.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill4_2_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/BP_Allium.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/AL_A_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/AL_A_2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/AL_Q.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/AL_Q_Hited.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/Al_Q_Boom.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/New/AL_A_1_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/New/AL_A_2_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/New/AL_E_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/New/AL_Q_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/New/AL_R_n.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/sound/New/AL_W_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/Animation/ABP_Lb.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/BP_Lb.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/BaseArrow.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Effect/MP_Toxic Goo.mp3 Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/EskillBuff.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/LB_Bolla_Throw.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/LB_Q_Arrow.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/LB_TNT_Fire.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Lb_EskillBuff.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Lb_Passive.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/Lb_QskillDebuff.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Lb_RskillBurst.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Lb_WskillDebuff.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/BaseArrow.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/Missile.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/Missile11.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/NewMaterial.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_A.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_A_reached.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_E.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_Q_Boom.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_Q_Burn.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_Q_shoot.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_R_Boom.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_R_Hold.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_R_Shoot.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_W_Shoot.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/sound/T_H_W_Tied.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Monster/Knight/BP_Knignt.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Monster/Knight/Skeleton/Monster_Knight_Skeleton.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/ABP_Riana.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Attack1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill2_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill3_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill4_1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill4_2_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill4_3_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/BP_Riana.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/ESkillAttack_2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Riana/EskillAttacker.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Riana/Liana_E.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Riana/Liana_Q.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More