nitta-lab-2018/CactusServer

Fork: 0

nitta-lab-2018 / CactusServer

2018-10-24	5cb02c0 Browse files » Merge pull request #147 from nitta-lab-2018/obj ... 確認しました. ryo isitani committed on 24 Oct 2018
	75aaf14 Browse files » Merge pull request #146 from nitta-lab-2018/obj ... 確認しました. ryo isitani committed on 24 Oct 2018
	735debe Browse files » Merge pull request #145 from nitta-lab-2018/collisionBulletsFix ... 確認しました Yoichiro Ota committed on 24 Oct 2018
	434823e Browse files » Merge pull request #144 from nitta-lab-2018/collisionBullets2 ... 確認しました Yoichiro Ota committed on 24 Oct 2018
2018-10-23	33b9dc6 Browse files » Merge pull request #143 from nitta-lab-2018/obj ... 確認しました. ryo isitani committed on 23 Oct 2018
	7f1100b Browse files » playerも修正 y-ota committed on 23 Oct 2018
	7525fe6 Browse files » nullpo修正 y-ota committed on 23 Oct 2018
	a27697c Browse files » 指摘箇所を修正 y-ota committed on 23 Oct 2018
	f5d6b6e Browse files » Merge branch 'master' into obj ... Conflicts: src/main/java/cactusServer/models/CollisionManager.java y-ota committed on 23 Oct 2018
	5e6398c Browse files » format y-ota committed on 23 Oct 2018
	0fa47b3 Browse files » Merge branch 'master' into obj ... Conflicts: src/main/java/cactusServer/models/CollisionManager.java y-ota committed on 23 Oct 2018
	4814371 Browse files » CollisionManager#collisionBulletAndObjectsのメソッドで ... 弾を消す処理をコメントアウトした際にreturn文までコメントアウトしていたので return文だけはコメントアウトを解除した. r-isitani committed on 23 Oct 2018
	ab2f2c3 Browse files » サーバでの弾の当たり判定関連の処理を追加. ... ただし, 弾を消す処理はコメントアウトしている. r-isitani committed on 23 Oct 2018
	6cfc2cd Browse files » format y-ota committed on 23 Oct 2018
	797aa3c Browse files » 仕様書に合わせて変更 y-ota committed on 23 Oct 2018
	ebb51ef Browse files » ObjectをMovableObjectにリネーム y-ota committed on 23 Oct 2018
2018-10-19	ce04953 Browse files » Merge pull request #142 from nitta-lab-2018/collisionBullets ... 確認しました Yoichiro Ota committed on 19 Oct 2018
	bf17041 Browse files » Merge pull request #141 from nitta-lab-2018/collisionBullets ... 確認しました Yoichiro Ota committed on 19 Oct 2018
	b2dd7f3 Browse files » Merge pull request #140 from nitta-lab-2018/obj ... マージします. ryo isitani committed on 19 Oct 2018
2018-10-18	97f4108 Browse files » Mapの中のMapの要素をループ中で削除す部分に試行錯誤中. ... 今実装中の部分は呼び出さなようにしている. r-isitani committed on 18 Oct 2018
	bdea509 Browse files » コンフリクト解消用. r-isitani committed on 18 Oct 2018
	ab94b04 Browse files » POST時の弾IDのフォームパラメータ名をbulletIdからBulletIDに変更. r-isitani committed on 18 Oct 2018
	ec63a4b Browse files » メソッド分割 y-ota committed on 18 Oct 2018
2018-10-17	00cca95 Browse files » Merge pull request #139 from nitta-lab-2018/obj ... 確認しました fujimotonanako committed on 17 Oct 2018
2018-10-17	2a7243e Browse files » Merge pull request #138 from nitta-lab-2018/Player ... 確認しました Yoichiro Ota committed on 17 Oct 2018
2018-10-16	725dc5a Browse files » Merge pull request #137 from nitta-lab-2018/PlayersRest ... 確認しました Yoichiro Ota committed on 16 Oct 2018
	be0caa7 Browse files » Merge pull request #136 from nitta-lab-2018/fix ... 確認しました Yoichiro Ota committed on 16 Oct 2018
	d7b89d3 Browse files » Merge pull request #135 from nitta-lab-2018/Bullet ... 確認しました Yoichiro Ota committed on 16 Oct 2018
	b722770 Browse files » Merge pull request #134 from nitta-lab-2018/obj ... マージします. ryo isitani committed on 16 Oct 2018
	3a547ef Browse files » 単語間違い修正 y-ota committed on 16 Oct 2018