Code

0.0.1#59

Code

Merged

dongcheolpark merged 204 commits intomainGAMPOT-DEV/Project_Blind:mainfrom developGAMPOT-DEV/Project_Blind:developCopy head branch name to clipboardJul 26, 2022

+187,860-4,982

Commits

Commits on May 18, 2022

• 캐릭터 움직임 수정

  dongcheolpark

  committed
  7f93983

• Scene

  dongcheolpark

  committed
  16ac45d

• feature: 대쉬 추가

  kimmoonwoong

  committed
  5a56b11

• Merge pull request #26 from kimmoonwoong/develop

  Show description for 42960d5
  dongcheolpark

  authored
  42960d5

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  Show description for 8045987
  dongcheolpark

  committed
  8045987

• merge-fix : merge 에러 수정

  dongcheolpark

  committed
  51ae60c

• Merge pull request #25 from dongcheolpark/develop

  Show description for a27b9f4
  kimmoonwoong

  authored
  a27b9f4

• Commit

  kimmoonwoong

  committed
  b81a784

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 1d463c1
  kimmoonwoong

  committed
  1d463c1

• Bug: 대쉬 버그 고침

  kimmoonwoong

  committed
  9bb23aa

• Merge pull request #27 from kimmoonwoong/develop

  Show description for a3b2932
  dongcheolpark

  authored
  a3b2932

Commits on May 20, 2022

• 인코딩 수정

  kjhcocomi

  committed
  1cea229

• Merge pull request #32 from kjhcocomi/develop

  Show description for bf0a4c0
  dongcheolpark

  authored
  bf0a4c0

• commit

  kimmoonwoong

  committed
  4c454b0

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 4399361
  kimmoonwoong

  committed
  4399361

• feature : 파동 로직 구현

  dongcheolpark

  committed
  1657ec8

• feature : 프리팹으로 추가

  dongcheolpark

  committed
  00a1bc4

Commits on May 21, 2022

• fix : bug fix

  dongcheolpark

  committed
  80f6dff

• Merge pull request #34 from dongcheolpark/develop

  Show description for 01727cf
  dongcheolpark

  authored
  01727cf

• 오브젝트 가까이 가면 UI 띄우기

  Show description for 4b4f594
  kjhcocomi

  committed
  4b4f594

• ??

  kjhcocomi

  committed
  3bd8ed9

• Merge pull request #1 from GAMPOT-DEV/develop

  Show description for 10c677d
  kjhcocomi

  authored
  10c677d

• 오류수정

  kjhcocomi

  committed
  527f2e2

• feature : 파동 퍼지기 풀링 구현

  dongcheolpark

  committed
  1633ba4

• Merge pull request #37 from kjhcocomi/develop

  Show description for e1abda6
  dongcheolpark

  authored
  e1abda6

• Merge pull request #39 from dongcheolpark/develop

  Show description for 7cfb381
  dongcheolpark

  authored
  7cfb381

• commit

  kimmoonwoong

  committed
  a66739d

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 51060b4
  kimmoonwoong

  committed
  51060b4

Commits on May 22, 2022

• Create 맵 디자인 통합본.pdf

  

  kimtaehyeon55

  committed
  1c7e0c8

• Create 맵 디자인 통합본.pptx

  

  kimtaehyeon55

  committed
  096ce5f

• Delete 맵 디자인 통합본.pdf

  

  kimtaehyeon55

  committed
  ce49c0a

• Merge pull request #40 from kimtaehyeon55/main

  Show description for 1309922
  dongcheolpark

  authored
  1309922

• feature: 대쉬 1번만, 대쉬 쿨타임 1초 구현

  kimmoonwoong

  committed
  3a12301

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  kimmoonwoong

  committed
  b2ace45

Commits on May 23, 2022

• 김종현 씬에 ResourceManager, PoolManager, UIManager 설명, 테스트코드 추가

  Show description for ee87e0d
  kjhcocomi

  committed
  ee87e0d

• InteractionAble 클래스 추상 클래스로 변경

  Show description for 4fef96a
  kjhcocomi

  committed
  4fef96a

• Merge pull request #41 from kimmoonwoong/develop

  Show description for 0e99c13
  kjhcocomi

  authored
  0e99c13

• Merge branch 'GAMPOT-DEV:develop' into develop

  kjhcocomi

  authored
  483637b

• Merge pull request #42 from kjhcocomi/develop

  Show description for 3c3b39f
  dongcheolpark

  authored
  3c3b39f

Commits on May 24, 2022

• 대화 스크립트 모아놓는 클래스 생성 (ConversationScriptStorage)

  kjhcocomi

  committed
  ade7bd4

• feature : 유닛 체력 관리 코드 추가

  dongcheolpark

  committed
  3d1c094

• 말풍선 구현

  Show description for 919f5b9
  kjhcocomi

  committed
  919f5b9

Commits on May 25, 2022

• feature : test 코드 추가

  dongcheolpark

  committed
  f841caa

• fix : 디렉토리 변경

  dongcheolpark

  committed
  ef785a4

• Merge branch 'testcode' into develop

  dongcheolpark

  committed
  642224a

• feature : 유닛 체력 추가, 테스트 코드 작성

  dongcheolpark

  committed
  6139984

• fix : 회복을 최대 체력을 넘겨서 받지 못하게 수정

  dongcheolpark

  committed
  f0760ea

• 말풍선 조금 수정

  kjhcocomi

  committed
  d82e515

• 싱글톤 수정

  kjhcocomi

  committed
  255a079

• Merge pull request #45 from kjhcocomi/develop

  Show description for 82fa73c
  dongcheolpark

  authored
  82fa73c

• Merge pull request #46 from dongcheolpark/testcode

  dongcheolpark

  authored
  d0e84d5

• Merge pull request #47 from dongcheolpark/develop

  dongcheolpark

  authored
  e441a56

• feature : 파장 vfx 추가

  dongcheolpark

  committed
  3020b56

• feature : 씬 수정

  dongcheolpark

  committed
  a68a53c

• delete : 더 이상 쓰지 않는 프리팹들 삭제

  dongcheolpark

  committed
  180bab0

• Merge pull request #50 from dongcheolpark/develop

  Show description for ebe1c74
  kimmoonwoong

  authored
  ebe1c74

• feature: 플랫폼이펙트2D 이용하여 아래점프 구현

  kimmoonwoong

  committed
  35de80d

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 72dfcef
  kimmoonwoong

  committed
  72dfcef

• Feature : 빌드 Actions 추가

  dongcheolpark

  committed
  6a6fde0

• fix : 빌드 파일 수정

  dongcheolpark

  committed
  9f5a042

Commits on May 27, 2022

• Merge pull request #53 from dongcheolpark/develop

  Show description for 075e035
  dongcheolpark

  authored
  075e035

• 전장의 안개 구현

  kjhcocomi

  committed
  687f75f

• Merge branch 'GAMPOT-DEV:develop' into develop

  kjhcocomi

  authored
  97c2b32

Commits on May 28, 2022

• Merge pull request #56 from kjhcocomi/develop

  Show description for 4db83d5
  dongcheolpark

  authored
  4db83d5

• feature : 전장의 안개 기존 시스템과 통합

  dongcheolpark

  committed
  b56142e

• feature : build 세팅 추가

  dongcheolpark

  committed
  bbf8f22

• Merge pull request #57 from dongcheolpark/FogOfWar

  Show description for de34814
  dongcheolpark

  authored
  de34814

• Merge branch 'GAMPOT-DEV:develop' into develop

  kimmoonwoong

  authored
  d56103e

• commit

  kimmoonwoong

  committed
  3483f43

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 48b570f
  kimmoonwoong

  committed
  48b570f

• 황현택 씬 추가

  hhtboy

  committed
  7c52a85

• 선택할 씬 목록 추가

  Show description for e64f671
  hhtboy

  committed
  e64f671

• TransitionStart 프리팹 추가

  Show description for 2441560
  hhtboy

  committed
  2441560

• TransitionPoint.cs 추가

  Show description for 1c17710
  hhtboy

  committed
  1c17710

• 빌드세팅 씬 추가

  Show description for 80b93c5
  hhtboy

  committed
  80b93c5

• Create SceneControl.meta

  Show description for c4b4532
  hhtboy

  committed
  c4b4532

Commits on May 29, 2022

• Create main.yml

  Yeogiwon

  authored
  6b79f24

• Merge pull request #58 from GAMPOT-DEV/Yeogiwon-patch-1

  Show description for 4128cda
  Yeogiwon

  authored
  4128cda

• Update main.yml

  Yeogiwon

  authored
  2e418bd

• feature : 수정

  dongcheolpark

  committed
  a0e720e

• Merge pull request #60 from dongcheolpark/develop

  Show description for cfba74e
  Yeogiwon

  authored
  cfba74e

• 수정

  dongcheolpark

  committed
  1a84595

• Merge pull request #61 from dongcheolpark/develop

  Show description for 13ecfaf
  Yeogiwon

  authored
  13ecfaf

• 진짜 마지막

  dongcheolpark

  committed
  dbd2fff

• Merge pull request #62 from dongcheolpark/develop

  Show description for 7d79c8a
  Yeogiwon

  authored
  7d79c8a

• 씬 컨트롤러 인스턴스 사용

  hhtboy

  committed
  5e1014a

• UserSettings 추가

  hhtboy

  committed
  fb9c685

• SceneController 인스턴스사용

  hhtboy

  committed
  37e4a02

• Merge branch 'GAMPOT-DEV:develop' into develop

  hhtboy

  authored
  2cf9fef

Commits on May 30, 2022

• Merge pull request #64 from hhtboy/develop

  Show description for 47d12ee
  dongcheolpark

  authored
  47d12ee

Commits on Jun 2, 2022

• 컴퓨트 쉐이더 예제

  kjhcocomi

  committed
  b08cd52

• SoundManager 추가

  kjhcocomi

  committed
  706f510

• Json 파싱해주는 DataManager 추가, 다국어 지원하도록 수정

  kjhcocomi

  committed
  db1c1a3

• Merge pull request #68 from kjhcocomi/develop

  Show description for 0379eb5
  kjhcocomi

  authored
  0379eb5

Commits on Jun 25, 2022

• feature : 그래픽 파이프라인 3D로 변경

  dongcheolpark

  committed
  7475624

• Merge remote-tracking branch 'origin/develop' into develop

  dongcheolpark

  committed
  ff6a477

• feature : 렌더러 변경

  dongcheolpark

  committed
  49048b0

• Merge pull request #69 from dongcheolpark/develop

  Show description for ea0b2cd
  dongcheolpark

  authored
  ea0b2cd

• Merge branch 'GAMPOT-DEV:develop' into develop

  kimmoonwoong

  authored
  7103221

• commit

  kimmoonwoong

  committed
  f5a6969

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for a29a87e
  kimmoonwoong

  committed
  a29a87e

Commits on Jun 29, 2022

• .

  kjhcocomi

  committed
  0dcb4ca

• Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind into develop

  Show description for 90a6064
  kjhcocomi

  committed
  90a6064

• Main Scene 생성, 버튼 클릭했을때 로그 출력되도록 구현

  kjhcocomi

  committed
  3dd37d9

• UIManager 수정

  kjhcocomi

  committed
  c63a151

Commits on Jun 30, 2022

• transition destination 생성

  Show description for df6d897
  hhtboy

  committed
  df6d897

Commits on Jul 2, 2022

• 패링상태 구현 및 캐릭터 바닥인식 코드 변경, 키셋팅 자료에 맞게 수정

  kimmoonwoong

  committed
  1600a23

Commits on Jul 3, 2022

• feature: 싱글톤 상속으로 교체

  kimmoonwoong

  committed
  47847bc

• feature: Awake 수정

  kimmoonwoong

  committed
  3eb577a

• Merge pull request #51 from kimmoonwoong/develop

  Show description for 3b186fb
  kimmoonwoong

  authored
  3b186fb

Commits on Jul 4, 2022

• feature : 전장의 안개 연구

  dongcheolpark

  committed
  5748713

• feature : 일단 코드 가져와서 분석

  dongcheolpark

  committed
  1741492

• feature : 처음부터 다시

  dongcheolpark

  committed
  6e90a8b

• feature : 처음부터 다시

  dongcheolpark

  committed
  6730cf6

Commits on Jul 6, 2022

• Merge branch 'GAMPOT-DEV:develop' into develop

  hhtboy

  authored
  912e35a

• 허브맵 구현

  hhtboy

  committed
  55efa8e

• Merge pull request #72 from hhtboy/develop

  Show description for 80de6c2
  kimmoonwoong

  authored
  80de6c2

Commits on Jul 7, 2022

• Merge remote-tracking branch 'origin/develop' into develop

  Show description for b4de477
  kjhcocomi

  committed
  b4de477

• 설정 UI 만들기

  Show description for 3e106d5
  kjhcocomi

  committed
  3e106d5

Commits on Jul 8, 2022

• UI창 키보드로 조작할 수 있는 기능 추가

  kjhcocomi

  committed
  c981388

• Merge pull request #74 from kjhcocomi/develop

  Show description for 196f905
  kjhcocomi

  authored
  196f905

Commits on Jul 9, 2022

• feature : 먼가 되고있음

  dongcheolpark

  committed
  c253864

Commits on Jul 11, 2022

• 로딩씬 추가 및 리소스 업로드

  hhtboy

  committed
  ad3a1bd

Commits on Jul 13, 2022

• feture: 플레이어와 오브젝트 상호작용 구현

  kimmoonwoong

  committed
  87e49c8

• start 눌렀을때 씬 이동하는 기능 추가, 해상도 변경 기능 추가

  kjhcocomi

  committed
  6cf2373

• 황현택scene 수정, 로딩씬 스크립트 수정

  Show description for aa2363d
  hhtboy

  committed
  aa2363d

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for a84af17
  kimmoonwoong

  committed
  a84af17

• Merge pull request #76 from kimmoonwoong/develop

  Show description for 24857d5
  kjhcocomi

  authored
  24857d5

• Merge remote-tracking branch 'origin/develop' into develop

  Show description for 37f8be9
  kjhcocomi

  committed
  37f8be9

Commits on Jul 14, 2022

• feature : test

  dongcheolpark

  committed
  bd5998d

• feature : 시야 유닛 추가

  dongcheolpark

  committed
  c92ec7d

• Merge remote-tracking branch 'origin/develop' into develop

  Show description for ef1accb
  dongcheolpark

  committed
  ef1accb

• feature : 타일맵 구성 세팅

  dongcheolpark

  committed
  555917c

• feature : tilemap 추가, gizmos 설정

  dongcheolpark

  committed
  9686944

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  Show description for 0631585
  dongcheolpark

  committed
  0631585

• 게임화면, 메뉴 UI 생성

  kjhcocomi

  committed
  39d83e1

Commits on Jul 15, 2022

• Merge pull request #78 from dongcheolpark/develop

  dongcheolpark

  authored
  6997525

• 바닥을 충돌시킬 수 없는 문제가 발생

  dongcheolpark

  committed
  3084fae

Commits on Jul 16, 2022

• Merge branch 'develop' of https://github.com/dongcheolpark/Project_Blind into develop

  dongcheolpark

  committed
  8668c3b

• fix : SightController 가 자동 생성 되는 버그 해결

  dongcheolpark

  committed
  d3eb64d

• fix : SightController 가 자동 생성 되는 버그 해결

  dongcheolpark

  committed
  baf4508

• Merge pull request #79 from dongcheolpark/bugfix/singletonProblem

  Show description for 821d221
  dongcheolpark

  authored
  821d221

Commits on Jul 17, 2022

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  Show description for afa04ac
  dongcheolpark

  committed
  afa04ac

Commits on Jul 18, 2022

• GameData 클래스 만들어서 DataManager에서 호출하게 해서 데이터 로드, 저장기능 추가

  Show description for c63f817
  kjhcocomi

  committed
  c63f817

• Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind into develop

  Show description for dd4c7ac
  kjhcocomi

  committed
  dd4c7ac

• feature: 플레이어 콤보 구현

  kimmoonwoong

  committed
  8e27818

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 548b6ba
  kimmoonwoong

  committed
  548b6ba

• Merge pull request #81 from kimmoonwoong/develop

  Show description for afdee53
  kimmoonwoong

  authored
  afdee53

Commits on Jul 19, 2022

• .

  kjhcocomi

  committed
  1d5e273

• UserSettings gitignore에 추가

  kjhcocomi

  committed
  4fadb61

• .

  kjhcocomi

  committed
  dd9890f

• .

  kjhcocomi

  committed
  3528a8c

• .

  kjhcocomi

  committed
  ccee364

• Merge pull request #3 from GAMPOT-DEV/develop

  Show description for 27daa68
  kjhcocomi

  authored
  27daa68

• .

  kjhcocomi

  committed
  29101b5

• Merge pull request #80 from kjhcocomi/develop

  Show description for 2bbafce
  kjhcocomi

  authored
  2bbafce

Commits on Jul 20, 2022

• resource : 임시 아트 가져오기

  dongcheolpark

  committed
  ec5499e

• feature : 텍스쳐 자르기 성공

  dongcheolpark

  committed
  7357ddd

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  Show description for 2c70373
  dongcheolpark

  committed
  2c70373

Commits on Jul 21, 2022

• resource : 블러 처리 준비

  dongcheolpark

  committed
  f025858

• 충돌 해결

  hhtboy

  committed
  bde061f

• feture: 캐릭터 남모로 바꿈, 패링 클래스 따로 만들어서 구현, 패링,어택 히트박스 가시화

  kimmoonwoong

  committed
  10dea06

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  kimmoonwoong

  committed
  4701bde

• Merge pull request #83 from kimmoonwoong/develop

  Show description for d40fa21
  dongcheolpark

  authored
  d40fa21

• feature : 블러 성공

  dongcheolpark

  committed
  8c1c7f9

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  Show description for d877903
  dongcheolpark

  committed
  d877903

Commits on Jul 23, 2022

• 인벤토리 초기 프로토타입

  Show description for 0ab299f
  Pumandu

  committed
  0ab299f

• feature : 블러 여러번 성공

  dongcheolpark

  committed
  9002235

• Merge pull request #85 from Pumandu/develop

  Show description for 175dc60
  Pumandu

  authored
  175dc60

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  dongcheolpark

  committed
  6d2b37f

• feature : Enemy 프리팹

  ch-0012

  committed
  6e07c56

• 파동 여러번 나가는 버그 수정

  kjhcocomi

  committed
  29cf746

• Merge remote-tracking branch 'origin/develop' into develop

  Show description for a52b7d2
  kjhcocomi

  committed
  a52b7d2

• Assets : 전장의 안개 갔던지역 완료

  dongcheolpark

  committed
  0608017

• feature : 전장의 안개 갔던 지역 완료(소스 코드)

  dongcheolpark

  committed
  6b02739

• assets : renderer로 나눔

  dongcheolpark

  committed
  272d2db

• feature : renderer로 나눔

  dongcheolpark

  committed
  f4b0675

• Merge pull request #82 from dongcheolpark/develop

  dongcheolpark

  authored
  5c8e95a

• Merge branch 'GAMPOT-DEV:develop' into develop

  ch-0012

  authored
  fc27f41

Commits on Jul 24, 2022

• Merge pull request #88 from ch-0012/develop

  Show description for f2e0b47
  ch-0012

  authored
  f2e0b47

• feature: hp 구현

  kimmoonwoong

  committed
  a1dd424

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 1a688c8
  kimmoonwoong

  committed
  1a688c8

• Merge pull request #90 from kimmoonwoong/develop

  Show description for 04fc29e
  kjhcocomi

  authored
  04fc29e

• Merge remote-tracking branch 'origin/develop' into develop

  Show description for 7922058
  kjhcocomi

  committed
  7922058

• Merge remote-tracking branch 'upstream/develop' into develop

  hhtboy

  committed
  6cf8142

• 황현택 여기원맵 추가(숲1 동굴1)

  hhtboy

  committed
  e7956b3

Commits on Jul 25, 2022

• Merge pull request #91 from hhtboy/develop

  Show description for 84fdc73
  kjhcocomi

  authored
  84fdc73

• HP 연동

  kjhcocomi

  committed
  aa4eab6

• Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind into develop

  kjhcocomi

  committed
  b329108

• Merge pull request #92 from kjhcocomi/develop

  Show description for e60cd94
  kjhcocomi

  authored
  e60cd94

• commit

  kimmoonwoong

  committed
  2d900c4

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  kimmoonwoong

  committed
  7053453

Commits on Jul 26, 2022

• 동굴맵2 추가

  Show description for 0e8f76a
  hhtboy

  committed
  0e8f76a

• Merge pull request #93 from hhtboy/develop

  Show description for fd7d2e7
  dongcheolpark

  authored
  fd7d2e7

• feature: Hurt, Dead 애니메이션 작업

  kimmoonwoong

  committed
  0c90935

• Merge pull request #88 from ch-0012/develop

  Show description for 8a3e432
  

  ch-0012

  authored and

  dongcheolpark

  committed
  8a3e432

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  Show description for 7726e06
  dongcheolpark

  committed
  7726e06

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  kimmoonwoong

  committed
  c07dd63

• Merge pull request #94 from kimmoonwoong/develop

  Show description for c5dd816
  dongcheolpark

  authored
  c5dd816

• feature : 첫 씬 변경

  dongcheolpark

  committed
  37cced9

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  Show description for 22c31e4
  dongcheolpark

  committed
  22c31e4

• feature : 맵 통합

  dongcheolpark

  committed
  ee9ad9c

• feature : 적 통합

  dongcheolpark

  committed
  64c74bc

• Merge pull request #97 from dongcheolpark/develop

  Show description for 6c4cf2c
  dongcheolpark

  authored
  6c4cf2c