Skip to content

Feat/modulize cannon#37

Merged
nuagenic merged 1 commit intofeat/waffle-roomfrom
feat/modulize-cannon
Jul 22, 2024
Merged

Feat/modulize cannon#37
nuagenic merged 1 commit intofeat/waffle-roomfrom
feat/modulize-cannon

Conversation

@nuagenic
Copy link
Collaborator

CannonManager 채워넣었습니다

@nuagenic nuagenic changed the base branch from main to feat/waffle-room July 22, 2024 14:07
@nuagenic nuagenic merged commit 6861075 into feat/waffle-room Jul 22, 2024
designDefined pushed a commit that referenced this pull request Jul 24, 2024
designDefined pushed a commit that referenced this pull request Aug 2, 2024
nuagenic added a commit that referenced this pull request Aug 3, 2024
* feat: Migrate project

* feat: Apply resource loader

* Feat/fox boundary (#26)

* feat: Add cannon-es and cannon body for collision

* feat: Add Cannon.ts and wrap method

* feat: Allow Cannon Body wrapper to apply preset position

* feat: Add dependencies

* feat: Add model

* Feat/dialogue and anim (#30)

* feat: Add dialogue

* feat: Apply keymap & walk

---------

Co-authored-by: designDefined <designdefined.by@gmail.com>

* Feat/cannon collide (#31)

* feat: Delete unnecessary comments

* feat: Connect mesh movement to cannon body

* refact: Delete unnecessary comments

* Feat/cannon collide2 (#33)

* feat: Delete unnecessary comments

* feat: Connect mesh movement to cannon body

* refact: Delete unnecessary comments

* refact: Delete unnecessary comments

* feat: Add flag 'isMovable' to Cannon.wrap()

* feat: Apply boxCenter to adjust the position of animated character

* fix: Delete Cannon.updateBodies()

* feat: Add meshList for memo

* feat: Add collisionFilter for objects

* feat: Make Character stop when collided

* refact: Delete codes related to temp/walk

* fix: Delete duplicate funcs

* refact: Delete debug codes

* feat: Add comments - mesh name description

* feat: Add iceice.glb

* feat: Comment contactMaterial

* feat: Add wasd

* feat: Apply iceice model

* Feat/control hitbox (#34)

* feat: Add 'createInteractiveHitbox()'

* feat: Add sampleFunction for interactiveHitbox

* feat: Add sample interactivHitbox

* feat: Add bodyData.json

* refact: Change bodies to gameObjectMap

* feat: Change character speed

* refact: Delete codes related to material

* refact: Delete unnecessary comments

* refact: Delete debug codes

* Feat/waffle room scenario (#36)

* feat: Add scenario manager

* fix: ScenarioManager

* feat: Create CannonManager (#37)

* Fix/scenario manager (#38)

* fix: Change scenario manager interface

* fix: Change import

* Feat/test scenario manager (#40)

* feat: Test character & dialogue

* fix: yarn.lock

* fix: yarn.lock 2

* yarn test

* feat: Add cannon-es-debugger

* feat: Add collision in index2 (temp)

* feat: Export type IndividualObject

* feat: Initialize Wardrobe class

* feat: Make wardrobe interactive

* feat: Create Packages

* feat: Add gsap

* feat: Write onAnimate() in Wardrobe

* feat: Change camera position & add LookAt

* refact: Overwrite index with index2

* refact: Delete index2

---------

Co-authored-by: designDefined <designdefined.by@gmail.com>

* Feat/scene manager (#41)

* feat: Add scene manager

* refact: Scenario manager

* feat: Scenario & Scene management test

* feat: Delete unsued code

* temp: Delete cannon-es-debugger

* fix: Update yarn.lock

* feat: Re-Add cannon-es-debugger

* Feat/spin box (#42)

* feat: Add static/ to model path

* feat: Add camera animation

* refact: Delete comments

* fix: Modify createInteractiveHitbox() parameter

* fix: Change hitbox in Packages to hitboxes

* feat: Add 'info' property in Player.ts

* revert

* refact: Delete comments

* refact: Make Box Spin

* feat: Set scenario for packages

* feat: Add orthographic camera

* refact: Modify lookAt point

* feat: Apply gsap animation to box spin

* Feat/spin tiles (#45)

* feat: Initialize spinTile stage

* feat: Make tiles spin with letters

* feat: Get playerDirection

* refact: Delete unnecessary comments

* feat: Complete tile spinning logic

* WIP

* refact: spinbox wip

* feat: Add models in public

* feat: Apply models to scene

* feat: Add model final

* refact: Modify model route

* wip

* feat: Make two walls invisible

* delete static models

* Feat/drag box (#48)

* add depthTest

* feat: complete box spin logic

* feat: 플레이어 캐릭터 걸을 때 time 파라미터 받기

* Feat/wardrobe UI (#49)

* wip

* feat: commit 1

* feat: commit 2

* feat: Resolve player for test

* Feat/animate player (#50)

* feat: Add animation models & player movement

* feat: Character animation

* feat: 인터랙티브 화이팅

* feat: 박스 스핀 끝

* feat: 경계들 생성

* feat: 막판

* feat: 수정

* Feat/waffle room 22 (#53)

* please...

* feat: done

* font

* asdf

* fix: font

* feat: Add waffleRoom to main.ts

---------

Co-authored-by: designDefined <designdefined.by@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant