Skip to content

Base/survival shooter #20

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

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

Base/survival shooter #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
5d43d27
アセットをインポート
Kazuya-Pum Nov 7, 2018
99274cc
環境設定
Kazuya-Pum Nov 7, 2018
20b8ccf
Generating Lightmap UVsを有効に
Kazuya-Pum Nov 7, 2018
48c01c3
敵の配置
fukuchiyuki1225 Nov 7, 2018
ff42895
プロジェクト導入
Asada1129 Nov 7, 2018
8900818
ひとまずカメラを途中まで調整
NottyAce Nov 7, 2018
921e69a
大森途中まで
OmoriItsuki Nov 7, 2018
7317fb2
チュートリアル4途中まで
yamaso Nov 7, 2018
85a88ef
プレイヤーを配置しました。
fukuchiyuki1225 Nov 7, 2018
7312bc9
ソースツリーテスト
OmoriItsuki Nov 7, 2018
aa1155c
Revert "ひとまずカメラを途中まで調整"
Kazuya-Pum Nov 7, 2018
aca17ab
大森更新２
OmoriItsuki Nov 8, 2018
4ef87df
敵を倒した時のスコア表示
Asada1129 Nov 9, 2018
3f5469e
プレイヤーの設置
fujitaiori416 Nov 10, 2018
3747eba
プレイヤーに体力とダメージイメージを追加
fujitaiori416 Nov 12, 2018
e89e6ad
敵の攻撃
fujitaiori416 Nov 13, 2018
7ef2560
Line Rrenderer、Light、Auidio sourceの追加
fukuchiyuki1225 Nov 13, 2018
c8e88eb
ひとまず完成（PlayerのみPrehabを仮置き，順次置き換え予定）
NottyAce Nov 13, 2018
22efa31
大森完成
OmoriItsuki Nov 13, 2018
cbbdc85
Update ProgrammerTeam20181024/Assets/Scenes/Level 01.unity
yamaso Nov 14, 2018
07dce28
Enemy 4 終わり
yamaso Nov 14, 2018
55d5eb8
HP関連
kita23 Nov 14, 2018
349289a
10番終了
Nov 14, 2018
64f8a7d
Merge pull request #4 from CreaGameProject/yamaso/4_Creating_Enemy
yamaso Nov 14, 2018
c99db88
Merge branch 'base/survival_shooter' into kita/5_Health_HUD
OmoriItsuki Nov 14, 2018
3d8bf2f
Merge pull request #3 from CreaGameProject/kita/5_Health_HUD
kita23 Nov 14, 2018
ea017a6
Merge branch 'base/survival_shooter' into origin/noto/5_Camera_setup
NottyAce Nov 14, 2018
ed719f2
新しくシーンを追加
OmoriItsuki Nov 14, 2018
ef2b897
Revert "Merge branch 'base/survival_shooter' into origin/noto/5_Camer…
NottyAce Nov 14, 2018
20aa5db
Revert "Revert "Merge branch 'base/survival_shooter' into origin/noto…
NottyAce Nov 14, 2018
c8e02b5
Revert "Merge branch 'base/survival_shooter' into origin/noto/5_Camer…
NottyAce Nov 14, 2018
85d86fb
Revert "Merge pull request #3 from CreaGameProject/kita/5_Health_HUD"
NottyAce Nov 14, 2018
821ea3d
Merge pull request #9 from CreaGameProject/origin/noto/5_Camera_setup
NottyAce Nov 14, 2018
26d9c69
シーン追加
fujitaiori416 Nov 14, 2018
bb90d78
カメラ、ライトばいばい
fujitaiori416 Nov 14, 2018
ef66a3b
Yamasoシーンへ敵を避難
yamaso Nov 14, 2018
97f87c7
Merge branch 'base/survival_shooter' into omori/9_Spawning_Enemies
OmoriItsuki Nov 14, 2018
b3e2170
Merge pull request #2 from CreaGameProject/omori/9_Spawning_Enemies
OmoriItsuki Nov 14, 2018
476f789
Merge branch 'base/survival_shooter' into fujita/6_Player_Health
fujitaiori416 Nov 14, 2018
42f408b
Merge pull request #7 from CreaGameProject/fujita/6_Player_Health
fujitaiori416 Nov 14, 2018
cff3879
Merge pull request #11 from CreaGameProject/yamaso/4_Creating_Enemy
yamaso Nov 14, 2018
2dcaf53
シーン追加
fujitaiori416 Nov 14, 2018
6792c3d
Merge branch 'base/survival_shooter' into fukuchi/7_Harming_Enemies
fujitaiori416 Nov 14, 2018
8f3d8fe
Merge pull request #6 from CreaGameProject/fukuchi/7_Harming_Enemies
fujitaiori416 Nov 14, 2018
480ff96
10_Game_Over
Nov 14, 2018
90997ae
Merge branch 'base/survival_shooter' of https://github.com/CreaGamePr…
Nov 14, 2018
00c5a1e
Yamasoシーン修正
yamaso Nov 14, 2018
3a12630
Merge pull request #12 from CreaGameProject/yamaso/4_Creating_Enemy
yamaso Nov 14, 2018
b76abd3
朝田君のシーンを作成
OmoriItsuki Nov 14, 2018
dd7bfac
EnemyACをプッシュ
Kazuya-Pum Nov 14, 2018
9a4199d
Merge branch 'base/survival_shooter' into yamaso/4_Creating_Enemy
Kazuya-Pum Nov 14, 2018
d1166b1
Merge pull request #13 from CreaGameProject/yamaso/4_Creating_Enemy
Kazuya-Pum Nov 14, 2018
40ffcaf
統合２
OmoriItsuki Nov 14, 2018
183863c
統合3
OmoriItsuki Nov 14, 2018
66da478
Update ProgrammerTeam20181024/Assets/Animation.meta
OmoriItsuki Nov 14, 2018
729cf56
Merge branch 'base/survival_shooter' into shimizu/10_Game_Over
OmoriItsuki Nov 14, 2018
39e55ae
Merge branch 'base/survival_shooter' into shimizu/10_Game_Over
OmoriItsuki Nov 14, 2018
87421cc
Merge pull request #15 from CreaGameProject/shimizu/10_Game_Over
OmoriItsuki Nov 14, 2018
9ee8328
Update ProgrammerTeam20181024/Assets/Scenes/Level 01.unity
OmoriItsuki Nov 14, 2018
4c4ceac
Merge branch 'base/survival_shooter' of https://github.com/CreaGamePr…
OmoriItsuki Nov 14, 2018
effd6e5
Revert "Update ProgrammerTeam20181024/Assets/Animation.meta"
OmoriItsuki Nov 14, 2018
c2dda27
Revert "Merge branch 'base/survival_shooter' of https://github.com/Cr…
OmoriItsuki Nov 14, 2018
35c985c
Update ProgrammerTeam20181024/Assets/Animation.meta
OmoriItsuki Nov 14, 2018
70f9a02
統合４
OmoriItsuki Nov 14, 2018
7e79652
統合完了
OmoriItsuki Nov 14, 2018
d30a387
本来触らない部分を元に戻す
Kazuya-Pum Nov 21, 2018
3d1eee0
パレハブの参照が完成済みのほうになっていたのを修正
Kazuya-Pum Nov 21, 2018
2915653
Merge pull request #18 from CreaGameProject/saiki/fix_null
Kazuya-Pum Nov 21, 2018
4f70669
シーンをコピー
Kazuya-Pum Nov 21, 2018
cbfe8fe
Merge branch 'base/survival_shooter' into asada/8_Scoring_points
Kazuya-Pum Nov 21, 2018
6b9dd06
Merge branch 'base/survival_shooter' into asada/8_Scoring_points
Kazuya-Pum Nov 21, 2018
84be26e
Merge pull request #16 from CreaGameProject/asada/8_Scoring_points
Kazuya-Pum Nov 21, 2018
812529a
test
OmoriItsuki Nov 22, 2018
31fe4cd
Merge branch 'base/survival_shooter' of https://github.com/CreaGamePr…
OmoriItsuki Nov 22, 2018
f0edf70
Revert "test"
OmoriItsuki Nov 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions ProgrammerTeam20181024/Assets/Animation.meta
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio.meta
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Effects.meta
View file
Open in desktop

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

Binary file added ProgrammerTeam20181024/Assets/Audio/Effects/Hellephant Death.wav
View file
Open in desktop
Binary file not shown.
18 changes: 18 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Effects/Hellephant Death.wav.meta
View file
Open in desktop

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

Binary file added ProgrammerTeam20181024/Assets/Audio/Effects/Hellephant Hurt.wav
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Effects/Hellephant Hurt.wav.meta
View file
Open in desktop

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

Binary file added ProgrammerTeam20181024/Assets/Audio/Effects/Player Death.wav
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Effects/Player Death.wav.meta
View file
Open in desktop

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

Binary file added ProgrammerTeam20181024/Assets/Audio/Effects/Player GunShot.wav
View file
Open in desktop
Binary file not shown.
18 changes: 18 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Effects/Player GunShot.wav.meta
View file
Open in desktop

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

Binary file added ProgrammerTeam20181024/Assets/Audio/Effects/Player Hurt.wav
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Effects/Player Hurt.wav.meta
View file
Open in desktop

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

Binary file added ProgrammerTeam20181024/Assets/Audio/Effects/ZomBear Death.wav
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Effects/ZomBear Death.wav.meta
View file
Open in desktop

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

Binary file added ProgrammerTeam20181024/Assets/Audio/Effects/ZomBear Hurt.wav
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Effects/ZomBear Hurt.wav.meta
View file
Open in desktop

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

Binary file added ProgrammerTeam20181024/Assets/Audio/Effects/ZomBunny Death.wav
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Effects/ZomBunny Death.wav.meta
View file
Open in desktop

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

Binary file added ProgrammerTeam20181024/Assets/Audio/Effects/ZomBunny Hurt.wav
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Effects/ZomBunny Hurt.wav.meta
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions ProgrammerTeam20181024/Assets/Audio/Mixers.meta
View file
Open in desktop

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

Loading