1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-06-28 06:11:47 +02:00

Completed proper merge of mobs mod

- Merged api :
	- little tweaks on yaw computing system and position handling when blasting
	- Centralisation of the explosion function used by both dungeon masters and
	  creepers : checks are made differently but still present in the function
- Merged dungeon masters
- Changed type of creepers from kamikaze to explode
- Tweaked a bit rebase script
This commit is contained in:
LeMagnesium
2015-04-21 11:54:43 +02:00
parent deeaa98c16
commit 8b8fdfa131
6 changed files with 207 additions and 246 deletions

View File

@ -7,6 +7,7 @@ for branch in $( git branch ); do
if [ branch != "master" ];
then
git checkout $branch
git pull origin $branch
git rebase master
git push -f origin $branch
fi