Skip to content

Commit

Permalink
Merge pull request #13 from felixgren/core-features-3
Browse files Browse the repository at this point in the history
Core features 3
  • Loading branch information
felixgren committed Aug 18, 2021
2 parents 86af2a4 + 3da0f70 commit f0c7c95
Show file tree
Hide file tree
Showing 9 changed files with 2,426 additions and 2,260 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@

/src/entities
/src/temp
/assets/sounds/wip/
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Three Arena

An arena shooter created in three.js.
An arena shooter created in three.js. Shoot your friends in this simple socket.io multiplayer game.

<strong> Join now at: https://three-arena-c5rthrmn1-felixgren.vercel.app/ </strong>

Expand Down Expand Up @@ -54,6 +54,9 @@ npm run server
- [#8 - Refactored entire project](https://github.com/felixgren/level-up/pull/8/)
- [#9 - Code Review](https://github.com/felixgren/three-arena/pull/9)
- [#10 - Core Features 1 (Multiplayer, Chat, Explosions, etc)](https://github.com/felixgren/three-arena/pull/10/)
- [#11 - Environment 2 (New Map)](https://github.com/felixgren/three-arena/pull/11/)
- [#12 - Core Features 2 (Respawn, UI, Chat types)](https://github.com/felixgren/three-arena/pull/12/)
- [#13 - Core Features 3 (General improvements)](https://github.com/felixgren/three-arena/pull/13/)

# Code Review

Expand Down
Binary file modified assets/sounds/rocket-explode.ogg
Binary file not shown.
Binary file modified assets/sounds/rocket-flying.ogg
Binary file not shown.
4,154 changes: 2,153 additions & 2,001 deletions package-lock.json

Large diffs are not rendered by default.

116 changes: 58 additions & 58 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

1 comment on commit f0c7c95

@vercel
Copy link

@vercel vercel bot commented on f0c7c95 Aug 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.