AlexVinS
|
5f7a90237c
|
More smooth fps counter
|
2015-06-23 01:08:25 +03:00 |
|
AlexVinS
|
958d596d54
|
Do not raise on non critical error
|
2015-06-23 01:07:35 +03:00 |
|
AlexVinS
|
32c15a8266
|
Extract fps counter drawing
|
2015-06-22 23:57:34 +03:00 |
|
AlexVinS
|
f58148cd94
|
Capture SDL log
* just a stub for now
|
2015-06-22 22:19:32 +03:00 |
|
AlexVinS
|
cc669b0ae7
|
Move gui locking to GUIHandler
|
2015-06-22 21:53:47 +03:00 |
|
AlexVinS
|
a8c45df732
|
Merge branch 'SDL1Wipe' into develop
|
2015-06-22 14:24:00 +03:00 |
|
AlexVinS
|
e27516a0b5
|
fix mantiss #2210
|
2015-06-21 21:27:58 +03:00 |
|
AlexVinS
|
f81116e04d
|
Fix mantiss #2208
|
2015-06-21 20:30:19 +03:00 |
|
AlexVinS
|
39db232f1b
|
remove sdl1 from cmake files
|
2015-06-21 01:59:34 +03:00 |
|
AlexVinS
|
53b85d16be
|
Cleanup C::B projects
|
2015-06-21 01:59:33 +03:00 |
|
AlexVinS
|
ed281a3cc6
|
SDL1 wipe, part 4. Codebase cleanup finished. Untested.
|
2015-06-21 01:59:32 +03:00 |
|
AlexVinS
|
8c236e30bb
|
SDL1 wipe, part 3. Untested.
|
2015-06-21 01:59:32 +03:00 |
|
AlexVinS
|
b6a2323e01
|
SDL1 wipe, part 2. Untested.
|
2015-06-21 01:59:31 +03:00 |
|
AlexVinS
|
dca1e28bc1
|
SDL1 wipe, part 1. Untested.
|
2015-06-21 01:59:30 +03:00 |
|
AlexVinS
|
56a1805339
|
Merge branch 'issue/2185' into develop
|
2015-06-20 19:16:41 +03:00 |
|
AlexVinS
|
728dac3b47
|
Merge branch 'issue/2033' into develop
|
2015-06-20 17:41:05 +03:00 |
|
AlexVinS
|
4e72978abd
|
Add some missing object subtypes, (found on test map VCMI_Tests_2011b.h3m)
|
2015-06-10 23:59:13 +03:00 |
|
AlexVinS
|
478a1b8dfd
|
Explicitly define garrison subtypes
(!) named subtypes are required for future map format.
|
2015-06-10 19:58:03 +03:00 |
|
AlexVinS
|
5f8ecc22d5
|
Introduce configuration option for editor animation of map object and setup it for hero classes.
|
2015-06-10 14:21:33 +03:00 |
|
DjWarmonger
|
9e7b459882
|
Partial solution to #2206
TODO: add serialized field that contains custom guard config
|
2015-06-05 11:28:14 +02:00 |
|
DjWarmonger
|
3f1bc7e21c
|
One more case for Subterranean Gates
|
2015-06-04 09:42:39 +02:00 |
|
DjWarmonger
|
927dfa5565
|
Added correct connections for Subterranean Gates
|
2015-06-04 09:02:56 +02:00 |
|
DjWarmonger
|
63d6cf168f
|
- Solved problems with sealed-off objects for once and all.
- Refactoring
|
2015-06-03 21:57:22 +02:00 |
|
DjWarmonger
|
923437bf76
|
Corrected offset check for required objects.
|
2015-06-03 19:38:53 +02:00 |
|
DjWarmonger
|
55c1a7eade
|
Clear unused tiles to make more space for roads.
|
2015-06-03 15:16:11 +02:00 |
|
DjWarmonger
|
48efa2450a
|
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
|
2015-06-03 07:00:46 +02:00 |
|
DjWarmonger
|
2dd813c35d
|
Merge pull request #107 from vcmi/rmgTemplatesAsMods
Rmg templates as mods
|
2015-06-03 07:00:08 +02:00 |
|
DjWarmonger
|
6874b01912
|
Merge pull request #107 from vcmi/rmgTemplatesAsMods
Rmg templates as mods
|
2015-06-02 20:33:01 +02:00 |
|
DjWarmonger
|
a96b80be50
|
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
|
2015-06-02 20:31:55 +02:00 |
|
DjWarmonger
|
84beb6cdac
|
Merge pull request #106 from vcmi/rmgTemplatesAsMods
Okay, looks stable for now.
|
2015-06-02 20:31:30 +02:00 |
|
DjWarmonger
|
e21b2d9cbd
|
Attempt to use A* algorithm for required objects.
|
2015-06-02 20:29:37 +02:00 |
|
DjWarmonger
|
d0e68cf430
|
Merge remote-tracking branch 'remotes/origin/develop' into rmgTemplatesAsMods
|
2015-06-02 20:28:05 +02:00 |
|
DjWarmonger
|
5d067416a1
|
Merge pull request #106 from vcmi/rmgTemplatesAsMods
Okay, looks stable for now.
|
2015-06-02 17:45:20 +02:00 |
|
DjWarmonger
|
a68b58d969
|
- Use straight paths for some connections
- More fixes for template schema
|
2015-06-02 16:40:32 +02:00 |
|
DjWarmonger
|
d6225f50e1
|
Fixes for template schema.
|
2015-06-02 15:26:33 +02:00 |
|
DjWarmonger
|
8b1641d498
|
Generate main towns for zones with no player present.
|
2015-06-02 09:30:56 +02:00 |
|
DjWarmonger
|
1389ae0ea3
|
Fix Travis build
|
2015-06-02 07:01:38 +02:00 |
|
AlexVinS
|
f5c2e6d5e1
|
Style tweaks
|
2015-06-02 07:12:45 +03:00 |
|
AlexVinS
|
9eaa136c58
|
fix releasing obstacle pointer
|
2015-06-02 07:12:44 +03:00 |
|
AlexVinS
|
5226081f33
|
rewrite stack movement processing
|
2015-06-02 07:12:43 +03:00 |
|
AlexVinS
|
2cb6cb7baa
|
Remove useless durationType selector
* duration is a mask, equality comparison is not enough
|
2015-06-02 07:12:02 +03:00 |
|
AlexVinS
|
b1837d0311
|
Fix removing STACK_GETS_TURN bonuses
* this should fix some crashes with FRENZY spell
|
2015-06-02 07:12:01 +03:00 |
|
AlexVinS
|
45a3ad94ae
|
fix autoremoving UNTIL_ATTACK & UNITL_BEING_ATTACKED bonuses
* this should fix crashes with paralyze, stonegaze & blind
|
2015-06-02 07:12:01 +03:00 |
|
AlexVinS
|
a2901cb8f0
|
Fix RemoveBonus::applyGs
* use CBonusSystemNode::removeBonus instead of direct modification of _cashe_
|
2015-06-02 07:12:00 +03:00 |
|
AlexVinS
|
3a50afe1a3
|
invalidate bonus cashe on effect actualization
|
2015-06-02 07:11:59 +03:00 |
|
DjWarmonger
|
c6f714db9c
|
Fixed generation of CPU teams.
|
2015-06-01 21:57:43 +02:00 |
|
DjWarmonger
|
34a59a2788
|
- Fixed issues with number of players selection
- Added new template for testing multiple players
|
2015-05-27 18:58:14 +02:00 |
|
DjWarmonger
|
6890ae9f02
|
- Fixed improper use of playersCount. Now RMG can generate maps up to 8 players, with CPU players only as well.
- Fixes for template scheme
|
2015-05-27 11:30:46 +02:00 |
|
DjWarmonger
|
4388566342
|
Now each map template is separate submod
|
2015-05-26 19:04:15 +02:00 |
|
DjWarmonger
|
2e70d8a084
|
- VCMI will now read templates from mods
- Added partial schema for RMG template
|
2015-05-26 18:19:41 +02:00 |
|