Vadim Markovtsev
8d7629bdab
Fix unused function warning in release mode
2016-02-02 11:12:28 +03:00
ArseniyShestakov
35c243c30a
Merge pull request #188 from vmarkovtsev/issue/1376
...
Fix 1376 turrets damage can decrease
2016-02-02 05:26:45 +03:00
ArseniyShestakov
eabdc0f861
Merge pull request #183 from vmarkovtsev/issue/1989
...
Fix 1989 cavaliers -> champions in stables
2016-02-02 03:56:11 +03:00
Vadim Markovtsev
97bae518fc
Fix 1376 turrets damage can decrease
2016-02-01 20:39:51 +03:00
Vadim Markovtsev
88bc21952b
Make stables message appear if hero has cavaliers but visited stables before
2016-02-01 09:41:15 +03:00
Vadim Markovtsev
c30a6f2ff3
Fix 1989 cavaliers -> champions in stables
2016-01-31 21:09:11 +03:00
ArseniyShestakov
7f68124b97
Merge pull request #136 from vcmi/issue/1372-2
...
issue/1372
2016-01-31 20:28:54 +03:00
ArseniyShestakov
ff1d56d4e7
Merge pull request #186 from vmarkovtsev/feature/rename_radious
...
Rename radious -> radius
2016-01-31 20:07:58 +03:00
Vadim Markovtsev
3926920103
Rename radious -> radius
...
There is no such English word, "radious"
Some files get new lines in the end - BSD sed bug + best practices
2016-01-31 18:01:58 +03:00
Zyx-2000
b0bb7f1f25
copyright stuff
2016-01-31 11:13:56 +01:00
DjWarmonger
4352f49a1d
Merge pull request #185 from vmarkovtsev/issue/2264
...
Fix 2264 learning stone & Learning skill
2016-01-31 09:17:11 +01:00
Vadim Markovtsev
e18b21b78e
Fix 2264 learning stone & Learning skill
2016-01-31 10:12:01 +03:00
Zyx-2000
33d0738859
support for music streaming
2016-01-30 22:34:46 +01:00
DjWarmonger
ab27464541
Merge pull request #182 from vmarkovtsev/issue/1916
...
Fix 1916 water wheel reward
2016-01-30 18:00:37 +01:00
Vadim Markovtsev
eb4331baf6
Fix 1916 water wheel reward
2016-01-30 19:11:22 +03:00
ArseniyShestakov
b0d9b8bf63
Merge pull request #178 from vmarkovtsev/issue/2406
...
Fix 2406 reset potentially available heroes
2016-01-30 14:51:54 +03:00
Vadim Markovtsev
918fbd8530
Refactor hero's mana regain
2016-01-30 13:51:07 +03:00
Vadim Markovtsev
22fc4fd3e9
Fix 2406 reset potentially available heroes
2016-01-30 10:02:33 +03:00
AlexVinS
16e0d18880
Added special slots for war machines and arrow towers
2016-01-30 00:53:53 +03:00
AlexVinS
ba017c443d
Start from diff of pull request #124 from vcmi/issue/1372
2016-01-29 21:05:17 +03:00
Arseniy Shestakov
a7059fe681
Remove Ore primaryResource from towns that must get both Wood and Ore
...
Currently default behaviour is to give both wood and ore for resource bonus when primaryResource not specified.
Though for some reason towns currently have ore specified so you only get 5-10 Ore.
2016-01-29 20:25:57 +03:00
DjWarmonger
ca4e13b2dc
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2016-01-29 18:21:56 +01:00
DjWarmonger
9ce6f874f0
Local fixes.
2016-01-29 18:21:19 +01:00
ArseniyShestakov
a534fe1cfe
Merge pull request #152 from vcmi/feature/moatHexesConfig
...
Configurable moat hexes positions
2016-01-29 20:07:22 +03:00
Arseniy Shestakov
75f278b913
moatHexes: use initializer list and update comment
2016-01-29 19:25:25 +03:00
Zyx-2000
7fbd5479e2
alignment & makefile fix
2016-01-29 16:08:44 +01:00
Zyx-2000
2b88de8e24
added new files
2016-01-29 15:39:44 +01:00
Zyx-2000
29faa9ce06
...and project updated
2016-01-29 15:33:07 +01:00
Zyx-2000
523bc22a30
removed old files
2016-01-29 15:32:37 +01:00
Zyx-2000
8aefdb0b7b
small project file fix
2016-01-29 15:30:22 +01:00
Zyx-2000
3a1a8e3d47
further refactoring-related changes
2016-01-29 15:16:14 +01:00
ArseniyShestakov
94fa25d56d
Merge pull request #179 from vmarkovtsev/issue/2405
...
Fix 2405 quest timeout mechanics
2016-01-29 12:19:31 +03:00
Vadim Markovtsev
30d64e3e3c
Fix 2405 quest timeout mechanics
2016-01-29 09:28:37 +03:00
AlexVinS
0011507e42
wipe constexpr on @DjWarmonger request
2016-01-29 00:34:54 +03:00
ArseniyShestakov
7429403d80
Merge pull request #177 from vmarkovtsev/issue/2331
...
Fix 2331 save menu keyboard event leak
2016-01-28 14:16:52 +03:00
Vadim Markovtsev
32ece9513d
Fix 2331 save menu keyboard event leak
...
The control flows the following way:
- we receive SDL_KEYDOWN with letter 's' in the adventure map interface
- save dialog opens
- text input receives focus
- text input enables receiving SDL_KeyboardEvent-s which go between DOWN and UP
- the button on keyboard becomes UP (the menu opens very fast)
- text input receives SDL_KeyboardEvent and inserts 's'
- text input receives SDL_KEYUP
So the apparent fix is to open the save dialog on SDL_KEYUP event
2016-01-28 10:26:40 +03:00
Arseniy Shestakov
8c39ecf538
moatHexes: add saves and mods compatability
2016-01-28 01:35:01 +03:00
Arseniy Shestakov
48aedaef47
Merge branch 'develop' into feature/moatHexesConfig
2016-01-28 01:15:08 +03:00
Arseniy Shestakov
b7fbbfdebe
CQuest: add missing completedOption initialization for CGQuestGuard
2016-01-27 23:24:17 +03:00
DjWarmonger
fdfe7b6b06
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2016-01-27 21:08:18 +01:00
DjWarmonger
327e95407e
- Compile fixes part 1
...
- Project settings for MSVS
2016-01-27 21:08:08 +01:00
Zyx-2000
c3e8c8bc1c
Merge branch 'develop' into FileInfo
2016-01-27 19:21:43 +01:00
ArseniyShestakov
4e8486da7b
Merge pull request #160 from vmarkovtsev/issue/2388
...
Fix 2388 obelisks puzzle revealing
2016-01-27 20:49:03 +03:00
ArseniyShestakov
ac0187d3ed
Merge pull request #162 from vmarkovtsev/issue/2377
...
Fix 2377 "Seer Empty Text"
2016-01-27 20:47:00 +03:00
Vadim Markovtsev
0ac833cca4
Fix 2377 "Seer Empty Text"
2016-01-27 19:52:45 +03:00
AlexVinS
048e22dbe6
Fix build.
2016-01-27 19:32:59 +03:00
AlexVinS
d7c0c3759a
Merge branch 'Zyx-develop' into develop
...
Conflicts:
lib/filesystem/AdapterLoaders.h
2016-01-27 18:53:41 +03:00
ArseniyShestakov
3c84400262
Merge pull request #175 from vmarkovtsev/feature/switch_retreat_no_troops
...
Feature/switch retreat no troops
2016-01-27 18:49:29 +03:00
Alexander Shishkin
1472ed970d
Merge pull request #176 from vmarkovtsev/issue/2160
...
Fix 2160 dismissing a VIP hero.
2016-01-27 18:28:57 +03:00
Vadim Markovtsev
9f3313524e
Fix 2160 dismissing a VIP hero
2016-01-27 17:10:19 +03:00
