Last login: Mon Feb  1 11:20:42 on console
baz@wonder ~ $ cd ~/workspace/clasher_flash/
baz@wonder [5456_fb] ~/workspace/clasher_flash $ s
On branch 5456_fb
nothing to commit, working directory clean
baz@wonder [5456_fb] ~/workspace/clasher_flash $ git checkout release_1_0_51
Switched to branch 'release_1_0_51'
Your branch is up-to-date with 'origin/release_1_0_51'.
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ git pull origin release_1_0_51
remote: Counting objects: 38, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 38 (delta 25), reused 23 (delta 23), pack-reused 8
Unpacking objects: 100% (38/38), done.
From github.com:wonder-will/clasher_flash
 * branch            release_1_0_51 -> FETCH_HEAD
   56156f0..6bc6e11  release_1_0_51 -> origin/release_1_0_51
Updating 56156f0..6bc6e11
Fast-forward
 src/Game.as                                               |  3 +++
 src/ui/dialogs/DialogManager.as                           | 49 +++++++++++++++++++++++++++++++++++--------------
 src/ui/dialogs/DlgList.as                                 |  1 +
 src/ui/dialogs/mediators/loading/LoadingDialogMediator.as | 26 ++++++++++++++++++++++++++
 src/ui/dialogs/mediators/main/MainGuiController.as        |  2 ++
 src/ui/dialogs/mediators/main/MainGuiMediator.as          |  5 ++++-
 src/ui/dialogs/mediators/npcdialog/NpcDialogMediator.as   |  2 +-
 src/ui/dialogs/mediators/shop/ShopChestElementMediator.as |  4 +++-
 src/ui/dialogs/mediators/shop/ShopDialogMediator.as       | 19 +++++++++++++++----
 9 files changed, 90 insertions(+), 21 deletions(-)
 create mode 100644 src/ui/dialogs/mediators/loading/LoadingDialogMediator.as
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ git checkout -b release_1_0_7
Switched to a new branch 'release_1_0_7'
baz@wonder [release_1_0_7] ~/workspace/clasher_flash $ git push origin release_1_0_7
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:wonder-will/clasher_flash.git
 * [new branch]      release_1_0_7 -> release_1_0_7
baz@wonder [release_1_0_7] ~/workspace/clasher_flash $ git checkout 5456_fb
Switched to branch '5456_fb'
baz@wonder [5456_fb] ~/workspace/clasher_flash $ l
* commit 7771cb3889d1045c0747196f04687985344a946b
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Thu Jan 28 17:01:08 2016 +0600
|
|     wip
|
* commit d25ae9b0592031f5b613e5f6e6131d6d5e4faa28
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Tue Jan 26 15:07:57 2016 +0600
|
|     wip
|
* commit d28ec45a5106477dc3040903a13f8ad19fefb977
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Thu Jan 21 17:49:38 2016 +0600
|
|     wip
|
* commit 4173e84860091223f7cc014c3ff1fd44104b9ae2
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Tue Jan 19 16:52:11 2016 +0600
|
|     wip
|
* commit 0e9d0c11d479e8c0f06da28d3f201c7229e438c8
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Tue Jan 19 13:39:08 2016 +0600
|
|     refs #5534 не дергаем setAvatar если его нет
|
* commit 1bd8817d3679905b61c685849ae056302c3aa72e
| Author: mayakwd <loremipsum.inside@gmail.com>
| Date:   Tue Jan 19 13:21:38 2016 +0600
|
|     refs #5490 иконка тактической сигналки теперь отображается корректно на отряде
|
* commit d605769753c44ad7ff28add469418124a785db63
| Author: Aleksei Malorossiianov <funnycrabs@gmail.com>
| Date:   Tue Jan 19 12:57:29 2016 +0600
|
|     refs #NA фикс перехода из мести домой
|
* commit 9a406660eff4e20aedecc3397db386390268ac8d
| Author: Aleksei Malorossiianov <funnycrabs@gmail.com>
| Date:   Mon Jan 18 23:33:45 2016 +0600
|
|     refs #5522 рефакторинг окончания сражений
|
* commit 0ce49e54c026194f5ef0d337fa6037aaa115598f
| Author: mayakwd <loremipsum.inside@gmail.com>
| Date:   Mon Jan 18 17:39:22 2016 +0600
|
|     refs #4723 фикс лут-процессора
|
* commit 753d8c7c6885d3c6d0a06b02f225d2085b13edb8
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Mon Jan 18 16:41:49 2016 +0600
|
|     refs #5503 #5505 фикс отображения юнитов на гоблинских локациях
|     - фикс чтения path definitions
|     - хук на получение free rect
|
baz@wonder [5456_fb] ~/workspace/clasher_flash $
baz@wonder [5456_fb] ~/workspace/clasher_flash $
baz@wonder [5456_fb] ~/workspace/clasher_flash $
baz@wonder [5456_fb] ~/workspace/clasher_flash $
baz@wonder [5456_fb] ~/workspace/clasher_flash $
baz@wonder [5456_fb] ~/workspace/clasher_flash $ s
On branch 5456_fb
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   src/stuff/sn/SocialNetworkManager.as

no changes added to commit (use "git add" and/or "git commit -a")
baz@wonder [5456_fb] ~/workspace/clasher_flash $ c -am "wip"
[5456_fb defe3b4] wip
 1 file changed, 13 insertions(+), 5 deletions(-)
baz@wonder [5456_fb] ~/workspace/clasher_flash $ git push origin 5456_fb
Counting objects: 6, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 757 bytes | 0 bytes/s, done.
Total 6 (delta 5), reused 0 (delta 0)
To git@github.com:wonder-will/clasher_flash.git
   7771cb3..defe3b4  5456_fb -> 5456_fb
baz@wonder [5456_fb] ~/workspace/clasher_flash $ git checkout release_1_0_51
Switched to branch 'release_1_0_51'
Your branch is up-to-date with 'origin/release_1_0_51'.
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ s
On branch release_1_0_51
Your branch is up-to-date with 'origin/release_1_0_51'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   src/core/api/RewardAchievementCommand.as

no changes added to commit (use "git add" and/or "git commit -a")
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ c -am "refs #5022 помещаем в почту награды от ачивок"
[release_1_0_51 8455cfa] refs #5022 помещаем в почту награды от ачивок
 1 file changed, 1 insertion(+), 1 deletion(-)
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ git pull --rebase origin release_1_0_51
From github.com:wonder-will/clasher_flash
 * branch            release_1_0_51 -> FETCH_HEAD
Current branch release_1_0_51 is up to date.
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ l -3
* commit 8455cfa9f4d974258ab59323374725c5c83a3714
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Mon Feb 1 17:52:20 2016 +0600
|
|     refs #5022 помещаем в почту награды от ачивок
|
* commit 6bc6e1121800daf0a02702cfff0480412ecbc336
| Author: mayakwd <loremipsum.inside@gmail.com>
| Date:   Fri Jan 29 18:07:13 2016 +0600
|
|     refs #5206 добавлена иконка бесплатного подарка на кнопку магазина
|
* commit f899489e69fa8c071f93bbc409b284aa177df8b5
| Author: mayakwd <loremipsum.inside@gmail.com>
| Date:   Fri Jan 29 14:50:50 2016 +0600
|
|     refs #NA fixed bug with tutorial npcdialog
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ cherry_pick release_1_0_7 8455cfa9f4d974258ab59323374725c5c83a3714
Switched to branch 'release_1_0_7'
remote: Counting objects: 15, done.
remote: Compressing objects: 100% (15/15), done.
remote: Total 15 (delta 3), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (15/15), done.
From github.com:wonder-will/clasher_flash
 * branch            release_1_0_7 -> FETCH_HEAD
   6bc6e11..8fb64e9  release_1_0_7 -> origin/release_1_0_7
First, rewinding head to replay your work on top of it...
Fast-forwarded release_1_0_7 to 8fb64e935cd140ea7fb2b167967b43931bcc52ac.
[release_1_0_7 9954ce0] refs #5022 помещаем в почту награды от ачивок
 Date: Mon Feb 1 17:52:20 2016 +0600
 1 file changed, 1 insertion(+), 1 deletion(-)
Counting objects: 5, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 505 bytes | 0 bytes/s, done.
Total 5 (delta 4), reused 0 (delta 0)
To git@github.com:wonder-will/clasher_flash.git
   8fb64e9..9954ce0  release_1_0_7 -> release_1_0_7
Switched to branch 'release_1_0_51'
Your branch is ahead of 'origin/release_1_0_51' by 1 commit.
  (use "git push" to publish your local commits)
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ cherry_pick master 8455cfa9f4d974258ab59323374725c5c83a3714
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
remote: Counting objects: 122, done.
remote: Compressing objects: 100% (38/38), done.
remote: Total 122 (delta 67), reused 49 (delta 49), pack-reused 35
Receiving objects: 100% (122/122), 42.83 KiB | 0 bytes/s, done.
Resolving deltas: 100% (76/76), completed with 32 local objects.
From github.com:wonder-will/clasher_flash
 * branch            master     -> FETCH_HEAD
   51dda9d..4a81f09  master     -> origin/master
First, rewinding head to replay your work on top of it...
Fast-forwarded master to 4a81f09eaca84c025e941050647a8a745c5fa374.
[master 201228f] refs #5022 помещаем в почту награды от ачивок
 Date: Mon Feb 1 17:52:20 2016 +0600
 1 file changed, 1 insertion(+), 1 deletion(-)
Counting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 444 bytes | 0 bytes/s, done.
Total 4 (delta 3), reused 0 (delta 0)
To git@github.com:wonder-will/clasher_flash.git
   4a81f09..201228f  master -> master
Switched to branch 'release_1_0_51'
Your branch is ahead of 'origin/release_1_0_51' by 1 commit.
  (use "git push" to publish your local commits)
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ s
On branch release_1_0_51
Your branch is ahead of 'origin/release_1_0_51' by 1 commit.
  (use "git push" to publish your local commits)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   src/stuff/sn/SocialNetworkManager.as
	modified:   src/stuff/sn/VKdata.as
	modified:   src/ui/dialogs/mediators/battle/BattleResultDialogMediator.as

no changes added to commit (use "git add" and/or "git commit -a")
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ git stash
Saved working directory and index state WIP on release_1_0_51: 8455cfa refs #5022 помещаем в почту награды от ачивок
HEAD is now at 8455cfa refs #5022 помещаем в почту награды от ачивок
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ git checkout release_1_0_7
Switched to branch 'release_1_0_7'
baz@wonder [release_1_0_7] ~/workspace/clasher_flash $ git stash apply
On branch release_1_0_7
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   src/stuff/sn/SocialNetworkManager.as
	modified:   src/stuff/sn/VKdata.as
	modified:   src/ui/dialogs/mediators/battle/BattleResultDialogMediator.as

no changes added to commit (use "git add" and/or "git commit -a")
baz@wonder [release_1_0_7] ~/workspace/clasher_flash $ git add .
baz@wonder [release_1_0_7] ~/workspace/clasher_flash $ git pull --rebase origin release_1_0_7 && git push origin release_1_0_7 && l -3
Cannot pull with rebase: Your index contains uncommitted changes.
Please commit or stash them.
baz@wonder [release_1_0_7] ~/workspace/clasher_flash $ c -am "refs #5595 goblin win postings"
[release_1_0_7 827127d] refs #5595 goblin win postings
 3 files changed, 15 insertions(+), 2 deletions(-)
baz@wonder [release_1_0_7] ~/workspace/clasher_flash $ git pull --rebase origin release_1_0_7 && git push origin release_1_0_7 && l -3
From github.com:wonder-will/clasher_flash
 * branch            release_1_0_7 -> FETCH_HEAD
Current branch release_1_0_7 is up to date.
Counting objects: 12, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 1010 bytes | 0 bytes/s, done.
Total 12 (delta 11), reused 0 (delta 0)
To git@github.com:wonder-will/clasher_flash.git
   9954ce0..827127d  release_1_0_7 -> release_1_0_7
* commit 827127d61d60d697b829d022172c3f5a2e312060
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Mon Feb 1 18:29:18 2016 +0600
|
|     refs #5595 goblin win postings
|
* commit 9954ce00095e425ef355907f88e043ca651d6419
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Mon Feb 1 17:52:20 2016 +0600
|
|     refs #5022 помещаем в почту награды от ачивок
|
* commit 8fb64e935cd140ea7fb2b167967b43931bcc52ac
| Author: Aleksei Malorossiianov <funnycrabs@gmail.com>
| Date:   Wed Jan 20 14:19:34 2016 +0600
|
|     refs #5683 центрирование экрана на захваченой деревне
baz@wonder [release_1_0_7] ~/workspace/clasher_flash $ cherry_pick master 827127d61d60d697b829d022172c3f5a2e312060
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
From github.com:wonder-will/clasher_flash
 * branch            master     -> FETCH_HEAD
Current branch master is up to date.
[master dfe5b07] refs #5595 goblin win postings
 Date: Mon Feb 1 18:29:18 2016 +0600
 3 files changed, 15 insertions(+), 2 deletions(-)
Counting objects: 8, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 677 bytes | 0 bytes/s, done.
Total 8 (delta 7), reused 0 (delta 0)
To git@github.com:wonder-will/clasher_flash.git
   201228f..dfe5b07  master -> master
Switched to branch 'release_1_0_7'
baz@wonder [release_1_0_7] ~/workspace/clasher_flash $ s
On branch release_1_0_7
nothing to commit, working directory clean
baz@wonder [release_1_0_7] ~/workspace/clasher_flash $ git checkout release_1_0_51
Switched to branch 'release_1_0_51'
Your branch is ahead of 'origin/release_1_0_51' by 1 commit.
  (use "git push" to publish your local commits)
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ l
* commit 8455cfa9f4d974258ab59323374725c5c83a3714
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Mon Feb 1 17:52:20 2016 +0600
|
|     refs #5022 помещаем в почту награды от ачивок
|
* commit 6bc6e1121800daf0a02702cfff0480412ecbc336
| Author: mayakwd <loremipsum.inside@gmail.com>
| Date:   Fri Jan 29 18:07:13 2016 +0600
|
|     refs #5206 добавлена иконка бесплатного подарка на кнопку магазина
|
* commit f899489e69fa8c071f93bbc409b284aa177df8b5
| Author: mayakwd <loremipsum.inside@gmail.com>
| Date:   Fri Jan 29 14:50:50 2016 +0600
|
|     refs #NA fixed bug with tutorial npcdialog
|
* commit b1338ac704cfbfd00679808760b662c1cc630fd3
| Author: mayakwd <loremipsum.inside@gmail.com>
| Date:   Thu Jan 28 16:32:43 2016 +0600
|
|     refs #4693 добавлено ожидание ответа от сервера при смене противника
|
* commit 68541648e3d23cd479fa823a4302f35e2486b5ac
| Author: mayakwd <loremipsum.inside@gmail.com>
| Date:   Thu Jan 28 16:06:44 2016 +0600
|
|     refs #5611 добавлено ожидание ответа от сервера при запросе на покупку сундука.
|
* commit 56156f06e9013260035647b7d956551e97780306
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Wed Jan 27 18:47:43 2016 +0600
|
|     refs #NA vk default posting image
|
* commit 1fcebc7d38ae6dd22a0711cc3d0d5490309e3308
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Tue Jan 26 16:52:09 2016 +0600
|
|     refs #NA группировка сообщений креш дампов
|
* commit 44c17a092fe775d1c79b936d9cf541e8608bf164
| Author: mayakwd <loremipsum.inside@gmail.com>
| Date:   Mon Jan 25 17:40:41 2016 +0600
|
|     refs #5611 добавлено ожидание отправки команды, после закрытия диалога с наградами из сундука
|
* commit 16a55f786cf7f4750081421dc38999c955411bdf
| Author: mayakwd <loremipsum.inside@gmail.com>
| Date:   Fri Jan 22 12:48:59 2016 +0600
|
|     refs #5600 исправлено добавление почтовых сообщений в резерв
|
* commit 6876cc407ecde94270c137d03cee85becb9b97db
| Author: Kirill Anufriev <k.anufriev@gmail.com>
| Date:   Thu Jan 21 17:53:42 2016 +0600
|
|     refs #5592 formula fix
|
* commit f5e72faaf9ca7d5d1a69a2e7b3cab37b2b5c22c4
| Author: Aleksei Malorossiianov <funnycrabs@gmail.com>
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ git push origin release
release            release_1_0_4      release_1_0_47     release_1_0_48     release_1_0_48_1   release_1_0_50     release_1_0_51     release_1_0_7
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $ git push origin release_1_0_51
Counting objects: 3, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 372 bytes | 0 bytes/s, done.
Total 3 (delta 2), reused 0 (delta 0)
To git@github.com:wonder-will/clasher_flash.git
   6bc6e11..8455cfa  release_1_0_51 -> release_1_0_51
baz@wonder [release_1_0_51] ~/workspace/clasher_flash $