Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

내가 상호작용할 오브젝트 하나만 아웃라인 표시되기 #8

Open
wants to merge 832 commits into
base: master
Choose a base branch
from
Open

내가 상호작용할 오브젝트 하나만 아웃라인 표시되기 #8

wants to merge 832 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 18, 2024

  1. locate배터리 스포너 완성

    @youjin-43
    youjin-43 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    ee63316 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into fix/SpawnerAddcomponent

    @Noewewwwew
    Noewewwwew committed May 18, 2024
    Configuration menu
    Copy the full SHA
    1a94cba View commit details
    Browse the repository at this point in the history

  3. 마스터만 맵 구성에 관여할 수 있도록

    @youjin-43
    youjin-43 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    992054d View commit details
    Browse the repository at this point in the history

  4. all -> allbufferd

    @youjin-43
    youjin-43 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    dd2f933 View commit details
    Browse the repository at this point in the history

  5. 게임 시작시 방 닫기 

    게임 시작할때 더이상 현재 룸에 다른 사람이 들어오지 못하도록 막음
    @dydwo0809
    dydwo0809 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    aa239b5 View commit details
    Browse the repository at this point in the history

  6. 로봇 오브젝트 삭제 

    로봇 오브젝트 삭제
    @shware10
    shware10 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    71a5d66 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #257 from kookmin-sw/MonsterSpawn 

    로봇 오브젝트 삭제
    @dydwo0809
    dydwo0809 authored May 18, 2024
    Configuration menu
    Copy the full SHA
    d6d17c6 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into fix/SpawnerAddcomponent

    @youjin-43
    youjin-43 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    68f3a85 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into feature/GameStart

    @dydwo0809
    dydwo0809 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    ecdc3e5 View commit details
    Browse the repository at this point in the history

  10. 공격중 오브젝트랑 콜라이더 안받아오는 현상 해결

    @Noewewwwew
    Noewewwwew committed May 18, 2024
    Configuration menu
    Copy the full SHA
    b2442e1 View commit details
    Browse the repository at this point in the history

  11. 잘 되는지 확인

    @youjin-43
    youjin-43 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    4b29eea View commit details
    Browse the repository at this point in the history

  12. 몬스터 스폰포인트 추가 

    몬스터 스폰포인트 추가
    @shware10
    shware10 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    85e23ef View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' into feature/MonsterSpawn

    @shware10
    shware10 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    0fdd3f6 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #258 from kookmin-sw/MonsterSpawn 

    몬스터 스폰 위치를 위한 포인트 오브젝트 추가
    @dydwo0809
    dydwo0809 authored May 18, 2024
    Configuration menu
    Copy the full SHA
    a1b05b9 View commit details
    Browse the repository at this point in the history

  15. 중간저장

    @youjin-43
    youjin-43 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    f1a6994 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'develop' into fix/SpawnerAddcomponent

    @youjin-43
    youjin-43 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    9ed46ce View commit details
    Browse the repository at this point in the history

  17. 스포너의 working 변수를 통해 스포너 관리

    @youjin-43
    youjin-43 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    f68bdd8 View commit details
    Browse the repository at this point in the history

  18. 포톤뷰 

    pv 스크립트로 넣으면 뷰 아이디가 동일하게 안들어간다.... 하나하나 넣어줘야 일치함...
    @youjin-43
    youjin-43 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    5af9569 View commit details
    Browse the repository at this point in the history

  19. 인원 제한 2명으로 수정

    @dydwo0809
    dydwo0809 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    8554e7b View commit details
    Browse the repository at this point in the history

  20. Merge pull request #259 from kookmin-sw/fix/SpawnerAddcomponent 

    배터리 스포너 랜덤 배정 및 동기화
    @dydwo0809
    dydwo0809 authored May 18, 2024
    Configuration menu
    Copy the full SHA
    acff0c6 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'develop' into feature/GameStart

    @dydwo0809
    dydwo0809 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    98ea51f View commit details
    Browse the repository at this point in the history

  22. 룸 생성 실험

    @dydwo0809
    dydwo0809 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    d6e35db View commit details
    Browse the repository at this point in the history

  23. 방 닫는 기능 구현 

    카운트다운 4명일때 시작
현재는 카운트다운 시작하면 다른 사람 못들어오게 막음
룸 만들때 사람 이름 추가해서 이름 겹치지 않게 수정함
맵에 임시로 만들어뒀던 빛 삭제
    @dydwo0809
    dydwo0809 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    97d174e View commit details
    Browse the repository at this point in the history

  24. Merge pull request #260 from kookmin-sw/feature/GameStart 

    게임 시작시 방 닫기 기능 구현
    @dydwo0809
    dydwo0809 authored May 18, 2024
    Configuration menu
    Copy the full SHA
    5cba685 View commit details
    Browse the repository at this point in the history

  25. 웨폰(아이템)스포너 설치

    @youjin-43
    youjin-43 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    bac2f3d View commit details
    Browse the repository at this point in the history

  26. Merge pull request #261 from kookmin-sw/fix/weaponSpawner 

    웨폰(아이템)스포너 설치
    @dydwo0809
    dydwo0809 authored May 18, 2024
    Configuration menu
    Copy the full SHA
    d256504 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2024

  1. 탈출구에도 암막 추가

    @dydwo0809
    dydwo0809 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    cf9ac06 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #262 from kookmin-sw/bugfix/exit 

    탈출구에도 암막 추가
    @dydwo0809
    dydwo0809 authored May 19, 2024
    Configuration menu
    Copy the full SHA
    0716547 View commit details
    Browse the repository at this point in the history

  3. 몬스터 스폰 및 플레이어 탐색 후 이동 기능 구현 

    몬스터 스폰 및 플레이어 탐색 후 이동 기능 구현
    @shware10
    shware10 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    921b40d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #263 from kookmin-sw/MonsterSpawn 

    몬스터 스폰 및 플레이어 탐색 후 이동 기능 구현
    @dydwo0809
    dydwo0809 authored May 19, 2024
    Configuration menu
    Copy the full SHA
    85ead2b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feature/공격-중-스왑-불가

    @Noewewwwew
    Noewewwwew committed May 19, 2024
    Configuration menu
    Copy the full SHA
    f7bfa49 View commit details
    Browse the repository at this point in the history

  6. 공격중일 때 공격 불가능하게 막음

    @Noewewwwew
    Noewewwwew committed May 19, 2024
    Configuration menu
    Copy the full SHA
    8263953 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #264 from kookmin-sw/feature/공격-중-스왑-불가 

    Feature/공격 중 스왑 불가
    @dydwo0809
    dydwo0809 authored May 19, 2024
    Configuration menu
    Copy the full SHA
    0974bb2 View commit details
    Browse the repository at this point in the history

  8. 탈출 함수 뼈대 구현

    @dydwo0809
    dydwo0809 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    22a3b1f View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into feature/escapeTrigger

    @dydwo0809
    dydwo0809 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    eb3bbc0 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #265 from kookmin-sw/feature/escapeTrigger 

    탈출 뼈대 구현
    @dydwo0809
    dydwo0809 authored May 19, 2024
    Configuration menu
    Copy the full SHA
    efda24e View commit details
    Browse the repository at this point in the history

  11. 불필요한 debugLog 제거

    @Noewewwwew
    Noewewwwew committed May 19, 2024
    Configuration menu
    Copy the full SHA
    4725b5c View commit details
    Browse the repository at this point in the history

  12. 스포너 추가 배치 및 맵 일부 수정 

    우선 기존 오브젝트 중 스포너로 쓸만한 것들 추가했고 맵 오류있던것들 수정했습니다.

아직 서랍 안에 아이템 있고 그런 기능은 이후 추가 예정입니다
    @youjin-43
    youjin-43 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    15da491 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #266 from kookmin-sw/DebugLog/debugLog제거 

    불필요한 debugLog 제거
    @dydwo0809
    dydwo0809 authored May 19, 2024
    Configuration menu
    Copy the full SHA
    449630b View commit details
    Browse the repository at this point in the history

  14. Merge pull request #267 from kookmin-sw/feature/LocateAdditionalSpawners 

    스포너 추가 배치 및 맵 일부 수정
    @dydwo0809
    dydwo0809 authored May 19, 2024
    Configuration menu
    Copy the full SHA
    0b77086 View commit details
    Browse the repository at this point in the history

  15. 호출 직전까지

    @bryanjang
    bryanjang committed May 19, 2024
    Configuration menu
    Copy the full SHA
    100d458 View commit details
    Browse the repository at this point in the history

  16. Revert "호출 직전까지" 

    This reverts commit 100d458.
    @bryanjang
    bryanjang committed May 19, 2024
    Configuration menu
    Copy the full SHA
    2652f7b View commit details
    Browse the repository at this point in the history

  17. Merge branch 'develop' into feature/sound2222

    @bryanjang
    bryanjang committed May 19, 2024
    Configuration menu
    Copy the full SHA
    516ef8d View commit details
    Browse the repository at this point in the history

  18. 호출 전까지

    @bryanjang
    bryanjang committed May 19, 2024
    Configuration menu
    Copy the full SHA
    4110ef8 View commit details
    Browse the repository at this point in the history

  19. Update AudioManager.cs 

    singleton
    @bryanjang
    bryanjang committed May 19, 2024
    Configuration menu
    Copy the full SHA
    a89de62 View commit details
    Browse the repository at this point in the history

  20. 상태 갇히는 버그 해결 

    1프레임 내에 여러 조건에 전부 들어가서 생기는 문제를 각 조건 내에 return을 넣어 한 조건이 끝나면 다른 조건에 들어가지 않도록 막음
    @Noewewwwew
    Noewewwwew committed May 19, 2024
    Configuration menu
    Copy the full SHA
    d61361c View commit details
    Browse the repository at this point in the history

  21. Merge pull request #268 from kookmin-sw/bugfix/상태-갇히는-버그 

    상태 갇히는 버그 해결
    @dydwo0809
    dydwo0809 authored May 19, 2024
    Configuration menu
    Copy the full SHA
    fe7fcf4 View commit details
    Browse the repository at this point in the history

  22. 탈출구 충돌 처리 중간 저장

    @dydwo0809
    dydwo0809 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    98af7ce View commit details
    Browse the repository at this point in the history

  23. Merge branch 'develop' into feature/escapeTrigger

    @dydwo0809
    dydwo0809 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    e710e8a View commit details
    Browse the repository at this point in the history

  24. 디버그 추가

    @dydwo0809
    dydwo0809 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    3c2ab0e View commit details
    Browse the repository at this point in the history

  25. escape에 포톤뷰 추가

    @dydwo0809
    dydwo0809 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    147db02 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #269 from kookmin-sw/feature/escapeTrigger 

    탈출구 뼈대 완성
    @dydwo0809
    dydwo0809 authored May 19, 2024
    Configuration menu
    Copy the full SHA
    1c1e4ae View commit details
    Browse the repository at this point in the history

  27. 임시저장

    @youjin-43
    youjin-43 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    6c6b04a View commit details
    Browse the repository at this point in the history

  28. 빌드용 커밋

    @dydwo0809
    dydwo0809 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    453bb50 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #270 from kookmin-sw/bugfix/addNamespace 

    빌드용 병합
    @dydwo0809
    dydwo0809 authored May 19, 2024
    Configuration menu
    Copy the full SHA
    e450bf9 View commit details
    Browse the repository at this point in the history

  30. 몬스터 수정 및 게임오버 조건 추가 

    몬스터 수정
이제 전체플레이어가 1명 초과일 때만 혼자 남았을 때 게임이 종료됩니다
    @shware10
    shware10 committed May 19, 2024
    Configuration menu
    Copy the full SHA
    5f5fa8a View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. 탈출 시 게임 오버 기능 구현 

    탈출 시 게임 오버 기능 구현
    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    c5ffd32 View commit details
    Browse the repository at this point in the history

  2. 탈출 시 이벤트 구현 

    탈출 시 이벤트 구현
    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    dee98f6 View commit details
    Browse the repository at this point in the history

  3. ui매니저 수정 

    ui매니저 수정
    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    6a56a32 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #271 from kookmin-sw/MonsterSpawn 

    몬스터 수정 및 게임오버 조건 추가
    @dydwo0809
    dydwo0809 authored May 20, 2024
    Configuration menu
    Copy the full SHA
    3a03ad5 View commit details
    Browse the repository at this point in the history

  5. 탈출 시스템 수정 

    탈출 시스템 수정
    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    0fc7110 View commit details
    Browse the repository at this point in the history

  6. 탈출 시 이벤트 수정 

    탈출 시 이벤트 수정
    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    d984f8c View commit details
    Browse the repository at this point in the history

  7. Update HpManager.cs

    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    8ee7574 View commit details
    Browse the repository at this point in the history

  8. 수정2차

    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    db0349d View commit details
    Browse the repository at this point in the history

  9. 수정 3차 

    수정 3차
    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    b9aac41 View commit details
    Browse the repository at this point in the history

  10. 수정4차

    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    7dc08b4 View commit details
    Browse the repository at this point in the history

  11. 수정 5차

    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    5fa0752 View commit details
    Browse the repository at this point in the history

  12. 수정 5차 

    수정 5차
    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    f53b59e View commit details
    Browse the repository at this point in the history

  13. 수정 6차

    @shware10
    shware10 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    5da970d View commit details
    Browse the repository at this point in the history

  14. 게임 시작 로직 변경 

    마스터 클라이언트 아닐 때도  GameStart 함수 호출함
Go2Map은 마스터 클라이언트에서만 호출함
    @dydwo0809
    dydwo0809 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    d0befc2 View commit details
    Browse the repository at this point in the history

  15. rpc 잘못 호출하고 있는거 수정 

    RPCEscapeWin 호출해야 하는 자리에 RpcDie 호출하고 있던거 수정
    @dydwo0809
    dydwo0809 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    dd37047 View commit details
    Browse the repository at this point in the history

  16. 함수 순서 변경 실험

    @dydwo0809
    dydwo0809 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    c095d30 View commit details
    Browse the repository at this point in the history

  17. 주석 추가 및 약간의 변경 

    주석 추가
escape 함수는 rpc 로 안보냄
    @dydwo0809
    dydwo0809 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    1c7ef3a View commit details
    Browse the repository at this point in the history

  18. 디버그 추가

    @dydwo0809
    dydwo0809 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    72bed03 View commit details
    Browse the repository at this point in the history

  19. 순서 변경 실험

    @dydwo0809
    dydwo0809 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    5325872 View commit details
    Browse the repository at this point in the history

  20. All Die 함수 수정 

    기존 함수가 우승한 사람만 죽여서 모든 사람 다 죽이도록 수정
    @dydwo0809
    dydwo0809 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    3eb4af0 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #272 from kookmin-sw/feature/EscapeGameOver 

    탈출 시 이벤트 기능 구현
    @dydwo0809
    dydwo0809 authored May 20, 2024
    Configuration menu
    Copy the full SHA
    b2b4ef1 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #273 from kookmin-sw/develop 

    (임시) 최종 버전
    @dydwo0809
    dydwo0809 authored May 20, 2024
    Configuration menu
    Copy the full SHA
    77b73be View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. 스태미너를 소진해도 계속 달리는 버그 해결 

    스태미너를 모두 소진하였을 때 walkstate로 진입하면 속도를 바꿔주는 로직으로 변경
    @Noewewwwew
    Noewewwwew committed May 21, 2024
    Configuration menu
    Copy the full SHA
    da6eb82 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #274 from kookmin-sw/bugfix/스태미너를-소진해도-달리는-버그 

    스태미너를 소진해도 계속 달리는 버그 해결
    @dydwo0809
    dydwo0809 authored May 21, 2024
    Configuration menu
    Copy the full SHA
    a91e4e0 View commit details
    Browse the repository at this point in the history

  3. 씬 로드 로직 수정 

    같은 룸에 있는 사람들 씬 동기화 해제하여 로비 버튼 눌렀을 때 본인만 이동하도록 수정
    @dydwo0809
    dydwo0809 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    f4eb3af View commit details
    Browse the repository at this point in the history

  4. temp

    @bryanjang
    bryanjang committed May 21, 2024
    Configuration menu
    Copy the full SHA
    81bc307 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #275 from kookmin-sw/bugfix/lobby 

    씬 로드 로직 수정
    @dydwo0809
    dydwo0809 authored May 21, 2024
    Configuration menu
    Copy the full SHA
    5da7f55 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into feature/LocateAdditionalSpawners

    @youjin-43
    youjin-43 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    38a02db View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Merge branch 'master' into feature/sound2222

    @bryanjang
    bryanjang committed May 22, 2024
    Configuration menu
    Copy the full SHA
    3208c88 View commit details
    Browse the repository at this point in the history

  2. jump sound test

    @bryanjang
    bryanjang committed May 22, 2024
    Configuration menu
    Copy the full SHA
    ac00cb4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/sound2222

    @bryanjang
    bryanjang committed May 22, 2024
    Configuration menu
    Copy the full SHA
    5012c1e View commit details
    Browse the repository at this point in the history

  4. sfx added2

    @bryanjang
    bryanjang committed May 22, 2024
    Configuration menu
    Copy the full SHA
    3d1521a View commit details
    Browse the repository at this point in the history

  5. hiddenItem 추가 및 기타 버그 수정

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    5fd20f0 View commit details
    Browse the repository at this point in the history

  6. 스포너들 더 추가

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    8545976 View commit details
    Browse the repository at this point in the history

  7. 네트워크 수정

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    b9fc435 View commit details
    Browse the repository at this point in the history

  8. 모두가 죽는 버그 해결

    @Noewewwwew
    Noewewwwew committed May 22, 2024
    Configuration menu
    Copy the full SHA
    ee002d6 View commit details
    Browse the repository at this point in the history

  9. 게임오버 갱신 추가 

    게임오버 갱신 추가
    @shware10
    shware10 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    5ce6ea7 View commit details
    Browse the repository at this point in the history

  10. hp 매니저 수정 

    hp 매니저 수정
    @shware10
    shware10 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    8663847 View commit details
    Browse the repository at this point in the history

  11. 수정중

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    1a449b1 View commit details
    Browse the repository at this point in the history

  12. hp매니저 수정

    @shware10
    shware10 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    cdbcaa9 View commit details
    Browse the repository at this point in the history

  13. 수정 2차

    @shware10
    shware10 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    98c48f1 View commit details
    Browse the repository at this point in the history

  14. 수정 3차

    @shware10
    shware10 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    dd0e5f1 View commit details
    Browse the repository at this point in the history

  15. 수정 4차

    @shware10
    shware10 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    957616c View commit details
    Browse the repository at this point in the history

  16. SFX update 111 

    run walk jump hit gethit
    @bryanjang
    bryanjang committed May 22, 2024
    Configuration menu
    Copy the full SHA
    2bbe570 View commit details
    Browse the repository at this point in the history

  17. 수정중

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    979bbed View commit details
    Browse the repository at this point in the history

  18. hit sfx update 

    111
    @bryanjang
    bryanjang committed May 22, 2024
    Configuration menu
    Copy the full SHA
    9ca18c5 View commit details
    Browse the repository at this point in the history

  19. 디버그 추가

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    b18a37f View commit details
    Browse the repository at this point in the history

  20. Merge pull request #276 from kookmin-sw/bugfix/너가죽으면나도죽어 

    Bugfix/너가죽으면나도죽어
    @dydwo0809
    dydwo0809 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    55e7759 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #277 from kookmin-sw/feature/LocateAdditionalSpawners 

    Feature/locate additional spawners
    @dydwo0809
    dydwo0809 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    fcd2034 View commit details
    Browse the repository at this point in the history

  22. 사운드 RPC달았어용

    @Noewewwwew
    Noewewwwew committed May 22, 2024
    Configuration menu
    Copy the full SHA
    d766452 View commit details
    Browse the repository at this point in the history

  23. Revert "Feature/locate additional spawners"

    @dydwo0809
    dydwo0809 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    e2b97d3 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #278 from kookmin-sw/revert-277-feature/LocateAddi… 

    …tionalSpawners

Revert "Feature/locate additional spawners"
    @dydwo0809
    dydwo0809 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    0dc581f View commit details
    Browse the repository at this point in the history

  25. ismine

    @Noewewwwew
    Noewewwwew committed May 22, 2024
    Configuration menu
    Copy the full SHA
    3158ebd View commit details
    Browse the repository at this point in the history

  26. 인게임씬 디벨롭에 적용해야함!!!!

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    b7e9400 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'develop' into feature/LocateAdditionalSpawners

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    90adc9b View commit details
    Browse the repository at this point in the history

  28. 조합 아이템 이펙트 적용 

    조합 아이템 이펙트 적용
    @shware10
    shware10 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    2cf9a44 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #279 from kookmin-sw/feature/LocateAdditionalSpawners 

    인게임씬 디벨롭에 적용해야함!!!!
    @dydwo0809
    dydwo0809 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    e6a4e2e View commit details
    Browse the repository at this point in the history

  30. 파라미터 변경

    @Noewewwwew
    Noewewwwew committed May 22, 2024
    Configuration menu
    Copy the full SHA
    931558c View commit details
    Browse the repository at this point in the history

  31. 1차수정

    @Noewewwwew
    Noewewwwew committed May 22, 2024
    Configuration menu
    Copy the full SHA
    aab35df View commit details
    Browse the repository at this point in the history

  32. 2차수정

    @Noewewwwew
    Noewewwwew committed May 22, 2024
    Configuration menu
    Copy the full SHA
    709b894 View commit details
    Browse the repository at this point in the history

  33. 3차수정

    @Noewewwwew
    Noewewwwew committed May 22, 2024
    Configuration menu
    Copy the full SHA
    437dc5d View commit details
    Browse the repository at this point in the history

  34. 상대방에게 파라미터를 보내지 않는 버그 해결 

    코루틴에서 켜고 꺼짐이 동시에 보내져서 생겼던 버그 해결
    @Noewewwwew
    Noewewwwew committed May 22, 2024
    Configuration menu
    Copy the full SHA
    09bf644 View commit details
    Browse the repository at this point in the history

  35. 스폰 시점 동기화 실험

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    e607c35 View commit details
    Browse the repository at this point in the history

  36. 스폰 함수 위치 변경해봄

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    8e3001d View commit details
    Browse the repository at this point in the history

  37. 조합무기 풀리퀘 

    조합무기 풀리퀘
    @shware10
    shware10 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    2a32075 View commit details
    Browse the repository at this point in the history

  38. Merge branch 'develop' into feature/CheckMapItemNetwork

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    f84abfc View commit details
    Browse the repository at this point in the history

  39. 코드 정리중

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    954977b View commit details
    Browse the repository at this point in the history

  40. Merge pull request #280 from kookmin-sw/feature/CheckMapItemNetwork 

    Feature/check map item network
    @youjin-43
    youjin-43 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    7f9f6bd View commit details
    Browse the repository at this point in the history

  41. 코드 정리 완료 및 로비에서는 템 안나오게

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    28903ce View commit details
    Browse the repository at this point in the history

  42. 인게임씬 변경

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    47ae114 View commit details
    Browse the repository at this point in the history

  43. 추가 수정

    @youjin-43
    youjin-43 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    df9e221 View commit details
    Browse the repository at this point in the history

  44. Merge pull request #281 from kookmin-sw/feature/CheckMapItemNetwork 

    Feature/check map item network
    @youjin-43
    youjin-43 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    cbf37ba View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge branch 'develop' into CraftEffect

    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ed879c3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #282 from kookmin-sw/CraftEffect 

    모든 무기 조합 시 이펙트 적용
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    fd80e4f View commit details
    Browse the repository at this point in the history

  3. 무기 이펙트 네트워크

    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    e5c4803 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #283 from kookmin-sw/CraftEffect 

    무기 이펙트 네트워크
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    abdbfd7 View commit details
    Browse the repository at this point in the history

  5. 무기 버리는 로직 수정 

    어택 매니저의 업데이트 문에 있던 무기 버리는 부분 따로 함수로 뺌
    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    18fc98a View commit details
    Browse the repository at this point in the history

  6. 아이템 버리기 네트워크 구현 

    아이템들 전부 포톤 인스턴트로 생성할 수 있게 수정
    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    c480f6c View commit details
    Browse the repository at this point in the history

  7. 아이템 버리기에 pv.isMine 추가

    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    c777cba View commit details
    Browse the repository at this point in the history

  8. 아이템 이름에 띄어쓰기 추가

    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    83cfc6d View commit details
    Browse the repository at this point in the history

  9. 도끼 이름 수정 

    도끼 이름 수정
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    1e6c1b9 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #284 from kookmin-sw/bugfix/abandonNetwork 

    아이템 버리기 네트워크 추가
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    66544c8 View commit details
    Browse the repository at this point in the history

  11. 데스캠 버튼 삭제/몬스터 스폰 위치 수정 

    데스캠 버튼 삭제/몬스터 스폰 위치 수정
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    f0b9f80 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #285 from kookmin-sw/CraftEffect 

    데스캠 버튼 삭제/몬스터 스폰 위치 수정
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    08a058f View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' into bugfix/공격-파라미터를-상대방한테-보내지-않는-버그

    @Noewewwwew
    Noewewwwew committed May 23, 2024
    Configuration menu
    Copy the full SHA
    75089a2 View commit details
    Browse the repository at this point in the history

  14. 기존 어택파라미터 제거

    @Noewewwwew
    Noewewwwew committed May 23, 2024
    Configuration menu
    Copy the full SHA
    40e097b View commit details
    Browse the repository at this point in the history

  15. Merge pull request #286 from kookmin-sw/bugfix/공격-파라미터를-상대방한테-보내지-않는-버그 

    Bugfix/공격 파라미터를 상대방한테 보내지 않는 버그
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    19642cb View commit details
    Browse the repository at this point in the history

  16. 배터리 및 진통제에 pv 추가 

    배터리, 진통제에 pv 추가
스폰 위치의 y값 += 1
    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    483c2ef View commit details
    Browse the repository at this point in the history

  17. 자동으로 생기는거 커밋

    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    54052ba View commit details
    Browse the repository at this point in the history

  18. Merge pull request #287 from kookmin-sw/bugfix/abandonNetwork 

    진통제, 배터리에 pv 추가
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    07fa639 View commit details
    Browse the repository at this point in the history

  19. 1차 수정

    @Noewewwwew
    Noewewwwew committed May 23, 2024
    Configuration menu
    Copy the full SHA
    26798ab View commit details
    Browse the repository at this point in the history

  20. 2차수정

    @Noewewwwew
    Noewewwwew committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a3ac1b4 View commit details
    Browse the repository at this point in the history

  21. 3차수정

    @Noewewwwew
    Noewewwwew committed May 23, 2024
    Configuration menu
    Copy the full SHA
    717e6c4 View commit details
    Browse the repository at this point in the history

  22. 4차수정

    @Noewewwwew
    Noewewwwew committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a27e2db View commit details
    Browse the repository at this point in the history

  23. 맵 매니저 painkiller 스폰안되는 버그 수정 외 기타 

    - 맵 매니저 painkiller 스폰안되는 버그 수정
- cupboard에서도 아이템 스폰되도록 수정
- painkiller 프리팹 크기 좀 줄임
    @youjin-43
    youjin-43 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    3bc8543 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #288 from kookmin-sw/bugfix/때린만큼-반응해줘 

    Bugfix/때린만큼 반응해줘
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    752d39e View commit details
    Browse the repository at this point in the history

  25. Merge branch 'develop' into fix/MapDoor

    @youjin-43
    youjin-43 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ad5aa6e View commit details
    Browse the repository at this point in the history

  26. Merge pull request #290 from kookmin-sw/fix/MapDoor 

    Fix/map door
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    9d645da View commit details
    Browse the repository at this point in the history

  27. 최대 인원 2인 -> 4인 변경

    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    c0d8764 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #291 from kookmin-sw/fix/ChangeNumOfPeople 

    최대 인원 2인 -> 4인 변경
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    5f001ab View commit details
    Browse the repository at this point in the history

  29. 조합 무기 데미지 증가 적용 

    조합 무기 데미지 증가 적용
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    4b4f2c0 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #292 from kookmin-sw/feature/craftWeaponDamage 

    조합 무기 데미지 증가 적용
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    98ebef2 View commit details
    Browse the repository at this point in the history

  31. Merge branch 'develop' into feature/sound2222

    @Noewewwwew
    Noewewwwew committed May 23, 2024
    Configuration menu
    Copy the full SHA
    7120092 View commit details
    Browse the repository at this point in the history

  32. 무기 버릴 때 스폰 위치 변경 

    무기 버릴 때 스폰 위치 변경
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    526d75b View commit details
    Browse the repository at this point in the history

  33. 무기데미지 수정 

    무기데미지 수정
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    85b0265 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #293 from kookmin-sw/feature/craftWeaponDamage 

    슬롯 변경 시 무기 데미지 증가 버그 수정
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    114740f View commit details
    Browse the repository at this point in the history

  35. itemdata 포톤 없을때만 넣도록 수정

    @youjin-43
    youjin-43 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    25c4b15 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #294 from kookmin-sw/hotfix 

    itemdata 포톤 없을때만 넣도록 수정
    @youjin-43
    youjin-43 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    1b00c32 View commit details
    Browse the repository at this point in the history

  37. 다른 상태로 넘어갈 때 소리 없애는 기능 추가

    @Noewewwwew
    Noewewwwew committed May 23, 2024
    Configuration menu
    Copy the full SHA
    50b05b6 View commit details
    Browse the repository at this point in the history

  38. Merge branch 'develop' into feature/sound2222

    @Noewewwwew
    Noewewwwew committed May 23, 2024
    Configuration menu
    Copy the full SHA
    c6a8b11 View commit details
    Browse the repository at this point in the history

  39. Merge pull request #296 from kookmin-sw/feature/sound2222 

    Feature/sound2222
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    e29424d View commit details
    Browse the repository at this point in the history

  40. 아이템 스폰 로직 수정 

    기존
스폰 함수 + rpc

변경
PhotonNetwork.Instantiate

추가로 아이템이 생성될때 pv 할당해주는 로직 변경
    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    443aeea View commit details
    Browse the repository at this point in the history

  41. Merge pull request #297 from kookmin-sw/bugfix/spawn 

    아이템 스폰 로직 수정
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    0332a8c View commit details
    Browse the repository at this point in the history

  42. 몬스터 버그 픽스 완료 

    y값 프리즈 해제
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    f467366 View commit details
    Browse the repository at this point in the history

  43. Merge pull request #298 from kookmin-sw/bugfix/MonsterBug 

    몬스터 버그 픽스 완료
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    761a2e1 View commit details
    Browse the repository at this point in the history

  44. 처음 생성되는 로직 변경 

    인스턴스로 생성 + rpc
-> 포톤 네트워크 인스턴스로 생성
    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    28dfeaf View commit details
    Browse the repository at this point in the history

  45. Merge pull request #299 from kookmin-sw/bugfix/allocatePV 

    처음 생성되는 로직 변경
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    d3ada3d View commit details
    Browse the repository at this point in the history

  46. 사망 시 아이템 드롭 기능 

    사망 시 아이템 드롭 기능
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    2613020 View commit details
    Browse the repository at this point in the history

  47. 카운트 다운 UI 추가 

    카운트 다운 UI 추가
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    f8fab93 View commit details
    Browse the repository at this point in the history

  48. 카운트 다운 RPC 추가 

    카운트 다운 RPC 추가
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    09dd560 View commit details
    Browse the repository at this point in the history

  49. 수정 1차 

    수정 1차
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    28e419f View commit details
    Browse the repository at this point in the history

  50. 수정 2차

    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a93628c View commit details
    Browse the repository at this point in the history

  51. 수정 3차 

    수정 3차
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    1df786f View commit details
    Browse the repository at this point in the history

  52. 몬스터 스폰 숫자 수정/몬스터 떠나니는 버그 수정 

    몬스터 스폰 숫자 수정/몬스터 떠나니는 버그 수정
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ff5ca24 View commit details
    Browse the repository at this point in the history

  53. 수정 5차 

    수정 5차
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    baf9627 View commit details
    Browse the repository at this point in the history

  54. 아이템 뿜기 

    아이템 뿜기
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    cf29f0e View commit details
    Browse the repository at this point in the history

  55. 최대 인원수 4명으로 변경

    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    dbcf9eb View commit details
    Browse the repository at this point in the history

  56. Merge pull request #300 from kookmin-sw/bugfix/allocatePV 

    최대 인원수 4명으로 변경
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    e21ae6f View commit details
    Browse the repository at this point in the history

  57. 수정 6차

    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    841b311 View commit details
    Browse the repository at this point in the history

  58. Merge branch 'develop' into feature/CountDown

    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    57bf889 View commit details
    Browse the repository at this point in the history

  59. Merge pull request #301 from kookmin-sw/feature/CountDown 

    몬스터 움직임 버그 및 몬스터 스폰 아이템 네트워크 적용/ 카운트 다운 UI 추가
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    2170683 View commit details
    Browse the repository at this point in the history

  60. 사용하지 않는 함수 삭제

    @dydwo0809
    dydwo0809 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    3ddb7b8 View commit details
    Browse the repository at this point in the history

  61. Merge pull request #302 from kookmin-sw/bugfix/allocatePV 

    사용하지 않는 함수 삭제
    @dydwo0809
    dydwo0809 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    b5a7f13 View commit details
    Browse the repository at this point in the history

  62. 탈출시 스왑 발동 

    탈출시 스왑 발동
    @shware10
    shware10 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    4adf92b View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. index.md 수정

    @bryanjang
    bryanjang committed May 24, 2024
    Configuration menu
    Copy the full SHA
    f37215d View commit details
    Browse the repository at this point in the history

  2. Update index.md

    @bryanjang
    bryanjang committed May 24, 2024
    Configuration menu
    Copy the full SHA
    33500eb View commit details
    Browse the repository at this point in the history

  3. Revert "Update index.md" 

    This reverts commit 33500eb.
    @bryanjang
    bryanjang committed May 24, 2024
    Configuration menu
    Copy the full SHA
    1812aae View commit details
    Browse the repository at this point in the history

  4. index.md 수정 2

    @bryanjang
    bryanjang committed May 24, 2024
    Configuration menu
    Copy the full SHA
    429a0e9 View commit details
    Browse the repository at this point in the history

  5. index.md update 

    hyperlink update
    @bryanjang
    bryanjang committed May 24, 2024
    Configuration menu
    Copy the full SHA
    e26dfca View commit details
    Browse the repository at this point in the history

  6. Update README.md

    @bryanjang
    bryanjang committed May 24, 2024
    Configuration menu
    Copy the full SHA
    f6838da View commit details
    Browse the repository at this point in the history

  7. Update README.md

    @bryanjang
    bryanjang committed May 24, 2024
    Configuration menu
    Copy the full SHA
    b9fd87c View commit details
    Browse the repository at this point in the history

  8. Merge pull request #303 from kookmin-sw/feature/pages 

    Feature/pages 업데이트
    @bryanjang
    bryanjang authored May 24, 2024
    Configuration menu
    Copy the full SHA
    c9bbbcd View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. 사망시 아이템 버리기 기능 구현 

    사망시 아이템 버리기 기능 구현
    @shware10
    shware10 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    0f4a1fc View commit details
    Browse the repository at this point in the history

  2. 필요 없는 부분 삭제 

    화면에 보이지 않는 부분 삭제
빛 종류별로 추가
    @dydwo0809
    dydwo0809 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    f73e9ec View commit details
    Browse the repository at this point in the history

  3. 슬롯오브젝트 할당 

    슬롯오브젝트 할당
    @shware10
    shware10 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    ba4038b View commit details
    Browse the repository at this point in the history

  4. 디버그 로그 추가 

    디버그 로그 추가
    @shware10
    shware10 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    7086b80 View commit details
    Browse the repository at this point in the history

  5. 사망시 아이템 드롭 위치 수정 

    사망시 아이템 드롭 위치 수정
    @shware10
    shware10 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    57fe359 View commit details
    Browse the repository at this point in the history

  6. 로비 라이트 설정 

    로비 라이트 설정
    @shware10
    shware10 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    6853735 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #304 from kookmin-sw/fix/lobbyScene 

    맵 로비씬 사용 부분 외 삭제/로비 라이트 추가 및 설정
    @dydwo0809
    dydwo0809 authored May 28, 2024
    Configuration menu
    Copy the full SHA
    c436000 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into feature/DieItemsDrop

    @shware10
    shware10 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    f3e8ef0 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #305 from kookmin-sw/feature/DieItemsDrop 

    사망시 아이템 버리기 기능 구현
    @dydwo0809
    dydwo0809 authored May 28, 2024
    Configuration menu
    Copy the full SHA
    a1c6d7a View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. 스폰 위치 변경

    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a95b07e View commit details
    Browse the repository at this point in the history

  2. 몬스터테스트 씬 삭제/ 몬스터 콜라이더 위치 변경/ 몬스터 스폰 시간 3분으로 변경 

    몬스터테스트 씬 삭제/ 몬스터 콜라이더 위치 변경/ 몬스터 스폰 시간 3분으로 변경
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    5cc8477 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #306 from kookmin-sw/fix/spawnPoint 

    스폰 위치 변경
    @dydwo0809
    dydwo0809 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    554e596 View commit details
    Browse the repository at this point in the history

  4. Revert "스폰 위치 변경"

    @dydwo0809
    dydwo0809 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    accd621 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #308 from kookmin-sw/revert-306-fix/spawnPoint 

    스폰 위치 변경
    @dydwo0809
    dydwo0809 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    4d443a1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into MonsterSpawnTime

    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    e10b21f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #309 from kookmin-sw/MonsterSpawnTime 

    몬스터테스트 씬 삭제/ 몬스터 콜라이더 위치 변경/ 몬스터 스폰 시간 3분으로 변경
    @dydwo0809
    dydwo0809 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    08aa4f5 View commit details
    Browse the repository at this point in the history

  8. 배터리 스포너 방 안에 하나만 있도록 수정

    @youjin-43
    youjin-43 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    6efb047 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #310 from kookmin-sw/fix/removeBatterySpawner 

    배터리 스포너 방 안에 하나만 있도록 수정
    @dydwo0809
    dydwo0809 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    ce1748e View commit details
    Browse the repository at this point in the history

  10. 무기 데미지 밸런스 조절 

    무기 데미지 밸런스 조절
    @Noewewwwew
    Noewewwwew committed May 30, 2024
    Configuration menu
    Copy the full SHA
    0769d1d View commit details
    Browse the repository at this point in the history

  11. Merge pull request #311 from kookmin-sw/feature/Weapon-Damage-Balance 

    무기 데미지 밸런스 조절
    @dydwo0809
    dydwo0809 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    0044d95 View commit details
    Browse the repository at this point in the history

  12. 탈출구 배터리 넣을 때 사이 간격 추가 

    이전 배터리 넣은 다음 60초 지나야 다음 배터리 넣을 수 있게 수정
    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    d229554 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' into feature/betExitTime

    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a893b40 View commit details
    Browse the repository at this point in the history

  14. 키보드 헬퍼 

    키보드 헬퍼
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    033b4a0 View commit details
    Browse the repository at this point in the history

  15. 키보드 헬퍼 

    키보드 헬퍼
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    16ef0b0 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #312 from kookmin-sw/MonsterSpawnTime 

    키보드 헬퍼
    @dydwo0809
    dydwo0809 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    37c5943 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'develop' into feature/betExitTime

    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    aedecab View commit details
    Browse the repository at this point in the history

  18. 배터리 사용 불가 ui 추가 

    배터리 사용 불가 ui 추가
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    f79ecf8 View commit details
    Browse the repository at this point in the history

  19. 바닥 컨백스 체크 

    바닥 컨백스 체크
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    0288e16 View commit details
    Browse the repository at this point in the history

  20. 자잘한 수정 

    인터렉트 스크립트의 시작 시간 게임 시작 시간으로 변경
t 버튼 삭제
    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    53f5371 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #313 from kookmin-sw/feature/betExitTime 

    탈출할 때 연속으로 배터리 못넣게 텀 추가
    @dydwo0809
    dydwo0809 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    f4d3aa1 View commit details
    Browse the repository at this point in the history

  22. 컨벡스 제거 

    컨벡스 제거
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    4919dd5 View commit details
    Browse the repository at this point in the history

  23. 타이머 스타트 

    타이머 스타트
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    83aade2 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #314 from kookmin-sw/rigidConvex 

    컨벡스 제거
    @dydwo0809
    dydwo0809 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    68a2b36 View commit details
    Browse the repository at this point in the history

  25. 처음에 아이템 스폰하는 로직 수정 

    마스터 클라이언트만 하도록 수정
    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    3b05f7e View commit details
    Browse the repository at this point in the history

  26. Merge branch 'develop' into bugfix/itemSpawn

    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    facc8e6 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #315 from kookmin-sw/bugfix/itemSpawn 

    아이템 스폰 로직 변경
    @dydwo0809
    dydwo0809 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    2249cbe View commit details
    Browse the repository at this point in the history

  28. hotfix 

    All to Small
    @youjin-43
    youjin-43 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    2275320 View commit details
    Browse the repository at this point in the history

  29. 탈출 간격 로직 수정 

    게이지 다 차면 시간 변경되도록 수정
    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    f7f8461 View commit details
    Browse the repository at this point in the history

  30. 배터리 알람 

    배터리 알람
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    4456c01 View commit details
    Browse the repository at this point in the history

  31. 배터리 안들고 있을떄 예외처리

    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    e61c39f View commit details
    Browse the repository at this point in the history

  32. 스포너 수정

    @youjin-43
    youjin-43 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a3ae89f View commit details
    Browse the repository at this point in the history

  33. 난이도 조절

    @youjin-43
    youjin-43 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ef22018 View commit details
    Browse the repository at this point in the history

  34. fix

    @youjin-43
    youjin-43 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    73c9727 View commit details
    Browse the repository at this point in the history

  35. 사망시 아이템 드롭 

    사망시 아이템 드롭
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    5328e4d View commit details
    Browse the repository at this point in the history

  36. Merge branch 'develop' of https://github.com/kookmin-sw/capstone-2024-21 

     into develop
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    aeec136 View commit details
    Browse the repository at this point in the history

  37. Revert "Merge branch 'develop' of https://github.com/kookmin-sw/capst… 

    …one-2024-21 into develop"

This reverts commit aeec136, reversing
changes made to 5328e4d.
    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    6da8997 View commit details
    Browse the repository at this point in the history

  38. fix

    @youjin-43
    youjin-43 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    5d9b65f View commit details
    Browse the repository at this point in the history

  39. 스포너

    @youjin-43
    youjin-43 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    93c9265 View commit details
    Browse the repository at this point in the history

  40. 캔버스 

    캔버스
    @shware10
    shware10 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    db6a4e8 View commit details
    Browse the repository at this point in the history

  41. 디버그 조건 변경

    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a2e6afa View commit details
    Browse the repository at this point in the history

  42. 시간 갱신 pv로 변경

    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    bb71268 View commit details
    Browse the repository at this point in the history

  43. 자동 생성

    @dydwo0809
    dydwo0809 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    6feeb18 View commit details
    Browse the repository at this point in the history