nitta-lab-2018/CactusServer

Fork: 0

nitta-lab-2018 / CactusServer

2018-11-13	03ca48e Browse files » 自由落下修正 y-ota committed on 13 Nov 2018
	5613256 Browse files » testaaaaaaaa y-ota committed on 13 Nov 2018
	dad264a Browse files » テストしやすいように y-ota committed on 13 Nov 2018
2018-11-07	eaaafec Browse files » Merge pull request #160 from nitta-lab-2018/obj ... 確認しました. ryo isitani committed on 7 Nov 2018
2018-11-07	ac339ea Browse files » Merge pull request #159 from nitta-lab-2018/Rename ... 確認しました Yoichiro Ota committed on 7 Nov 2018
2018-11-06	e233975 Browse files » Merge pull request #158 from nitta-lab-2018/obj ... 確認しました. ryo isitani committed on 6 Nov 2018
	cba9d7c Browse files » Merge pull request #157 from nitta-lab-2018/obj ... 確認しました. ryo isitani committed on 6 Nov 2018
	f97b70d Browse files » PositionとAngle以外をignore y-ota committed on 6 Nov 2018
	d27bff2 Browse files » 一部変数名の変更. r-isitani committed on 6 Nov 2018
	8b06865 Browse files » AttributeとModelをignore y-ota committed on 6 Nov 2018
	91f1b49 Browse files » binaryしか読み込まないので変更 y-ota committed on 6 Nov 2018
	6f7660d Browse files » 正方形のモデルを追加、ObjectModelManagerにて読み込むように修正 y-ota committed on 6 Nov 2018
2018-11-05	9fa8069 Browse files » c y-ota committed on 5 Nov 2018
2018-11-02	3c6af63 Browse files » Merge pull request #156 from nitta-lab-2018/obj ... 確認しました Takashi Kazehaya committed on 2 Nov 2018
	ee923f0 Browse files » Merge pull request #155 from nitta-lab-2018/Fix ... 確認しました Yoichiro Ota committed on 2 Nov 2018
	a56e990 Browse files » Merge pull request #154 from nitta-lab-2018/obj ... 確認しました. ryo isitani committed on 2 Nov 2018
	e575c82 Browse files » Merge pull request #152 from nitta-lab-2018/Fix ... 確認しました Yoichiro Ota committed on 2 Nov 2018
	6ba7df8 Browse files » Merge pull request #153 from nitta-lab-2018/obj ... 確認しました. ryo isitani committed on 2 Nov 2018
2018-11-01	7f3db74 Browse files » インデントを修正 y-ota committed on 1 Nov 2018
	2e96133 Browse files » 修正 y-ota committed on 1 Nov 2018
	24aeea7 Browse files » 指摘箇所を修正 y-ota committed on 1 Nov 2018
	a7ae52f Browse files » 該当部分のif文の評価が反対だったので修正. r-isitani committed on 1 Nov 2018
	2f6859b Browse files » 修正 y-ota committed on 1 Nov 2018
	9993ed3 Browse files » プレイヤーの更新時に前のキャラIDを取得するタイミングを修正. r-isitani committed on 1 Nov 2018
	5a7cdc1 Browse files » formatを整え、CollisionRunに処理を追加 y-ota committed on 1 Nov 2018
	8e0838c Browse files » プレイヤー同士の当たり判定を追加 y-ota committed on 1 Nov 2018
2018-10-31	80c7891 Browse files » Merge pull request #151 from nitta-lab-2018/collisionBullets ... 確認しました Yoichiro Ota committed on 31 Oct 2018
2018-10-30	af91c5b Browse files » Merge pull request #150 from nitta-lab-2018/obj ... 確認しました. ryo isitani committed on 30 Oct 2018
	d9e9baf Browse files » Merge remote-tracking branch 'origin/collisionCorrection' into ... collisionBullets Conflicts: src/main/java/cactusServer/models/CollisionManager.java src/main/java/cactusServer/utils/App.java 当たり判定関連の修正を反映した. r-isitani committed on 30 Oct 2018
	830e48d Browse files » Playerをmasterに合わせた. r-isitani committed on 30 Oct 2018