Ivan Savenko
10fc1892a8
Large refactoring of button classes:
...
- renamed CAdventureMapButton to more expectable CButton
- merged CButtonBase into CButton
- created more generic class for clickable elements
- created more generic class for selectable elements
- renamed CHighlightableButton to CToggleButton
- renamed CHighlightableButtonsGrous to CToggleGroup
- minimized differences between API of all these classes
- removed all but one contructors in buttons, with same parameters across all classes
2014-08-03 14:16:19 +03:00
AlexVinS
ca05087c3b
Merge branch 'develop' into FFMpeg
2014-07-31 19:26:32 +04:00
Ivan Savenko
42b349a594
Merge pull request #33 from rhn/develop
...
Fixed wrong message when building a structure, Rewarding objects won't loose their state on reload
2014-07-30 21:18:09 +03:00
DjWarmonger
2bc762fca8
Increased treasure density a bit.
2014-07-30 15:15:21 +02:00
DjWarmonger
e1936b4b0d
Corrected treasure value rounding.
2014-07-30 15:00:44 +02:00
DjWarmonger
e5f3a60c9e
Treasure distance now scales depending on zone size. Should be close to OH3 formula.
2014-07-30 13:52:21 +02:00
DjWarmonger
f9245e67e8
Quantize treasure values to let objects at upper bound spawn.
2014-07-30 10:58:45 +02:00
DjWarmonger
5814a057c8
Remove trash treasures from large piles.
2014-07-30 10:21:53 +02:00
DjWarmonger
f8359b4eb5
Randomized shapes for treasure piles.
2014-07-29 19:19:15 +02:00
DjWarmonger
2220786d0c
Finally placing objects sparsely.
2014-07-29 19:05:35 +02:00
DjWarmonger
930fa21d38
Tweaked treasure density.
2014-07-29 18:12:27 +02:00
DjWarmonger
3712b9a48b
- Fixed treasure zones touching each other, which sometimes resulted in unguarded paths.
...
- Fixed some object amounts which seemed wrong.
2014-07-29 16:58:08 +02:00
DjWarmonger
dc03a251f6
- Fixed treasure generating formula It should be now identical to OH3.
...
- Refactorings, tweaks.
2014-07-29 15:58:54 +02:00
rhn
aba3421e0a
Fixed: 0001854: Rewarding objects loose their state after game is reloaded (breaks savegames)
2014-07-29 15:28:58 +02:00
rhn
e7fa17af38
Fixed message when a structure can't be built due to requirements, but a different building has been built already
2014-07-29 09:49:50 +02:00
DjWarmonger
fe292dfa1d
Fixed desync due to uninitialized objects. Added some logging. RMG maps don't work yet, though.
2014-07-27 19:30:17 +02:00
DjWarmonger
3acbda75ef
Restored old function signature for sanity.
2014-07-27 13:59:53 +02:00
DjWarmonger
713912574a
Fixed duplicated Redwood Observatory on snow and possibly other objects.
2014-07-27 07:37:56 +02:00
DjWarmonger
c6d8a0a01e
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-07-26 14:21:39 +02:00
DjWarmonger
b97e4b1ab5
Fixed crash when setting players number to 1.
2014-07-26 14:20:33 +02:00
AlexVinS
c431d9fe52
Merge branch 'develop' into FFMpeg
2014-07-26 13:07:45 +04:00
Ivan Savenko
c23261ac0a
Removed references to WoG files from CMake
2014-07-26 11:51:44 +03:00
DjWarmonger
16aa230dd1
Enchanters, sharpshooters and dragons are not "special" and should normally spawn on the map.
2014-07-26 10:42:12 +02:00
DjWarmonger
b99d6f862d
Improved gravity algorithm. Now zones will start as small and inflate until they fill the map.
2014-07-26 10:02:33 +02:00
AlexVinS
b654ea831b
[RMG] Fix mingw build, fix some warnings
2014-07-26 10:12:45 +04:00
AlexVinS
76c3228afa
Merge branch 'develop' into FFMpeg
...
Conflicts:
client/CVideoHandler.cpp
2014-07-26 07:54:43 +04:00
DjWarmonger
8f946e4add
Denser and bigger obstacles.
2014-07-25 18:52:24 +02:00
DjWarmonger
a9ddeb665b
Place large obstacles first.
2014-07-25 17:55:48 +02:00
DjWarmonger
67d8a24f0b
Experiments with object distance.
2014-07-25 17:10:16 +02:00
DjWarmonger
1dd88d394f
All required objects will now constitute main paths of zone (again), which should improve their shape.
2014-07-25 16:26:50 +02:00
DjWarmonger
e65b85873c
Added prisons. hero experience is set to zero due to problem with leveling http://bugs.vcmi.eu/view.php?id=1804
2014-07-25 10:44:17 +02:00
DjWarmonger
c119ddf5ee
Reduced usage of TerrainViewPattern constructor for faster map generation.
2014-07-24 20:36:52 +02:00
DjWarmonger
156e19cdf6
Various optimizations based on RMG profiling.
2014-07-24 19:16:49 +02:00
DjWarmonger
21386081bf
Fixed formula for dwellings value.
2014-07-24 12:26:10 +02:00
DjWarmonger
4b28afcaa4
Fixed counting of faction-aligned zones.
2014-07-23 19:17:07 +02:00
DjWarmonger
9644314c8a
Removed map limit cap for objects that probably don't need them and came from H3 engine limitations.
2014-07-23 18:18:06 +02:00
DjWarmonger
1cabc8f7f4
- Implemented map object limit which should also distribute the objects evenly
...
- Fixed Magic Well limit of 1 per zone
2014-07-23 18:02:17 +02:00
DjWarmonger
8471d32334
Fixed not free tiles in front of required objects.
2014-07-23 11:42:05 +02:00
DjWarmonger
a842068d54
Merge pull request #30 from vcmi/RMG
...
Since there are no objections, I finally merge this branch.
2014-07-23 08:06:51 +01:00
Ilya Zhuravlev
6812ec6b7e
Updated .gitignore
2014-07-20 14:26:26 +04:00
DjWarmonger
eb0ea86ccb
Fix for Travis.
2014-07-18 07:40:27 +02:00
Ivan Savenko
4fca583062
Merge pull request #29 from Mixaill/nsis
...
CMake: add NSIS generator settings
2014-07-18 00:56:46 +03:00
Michael Pavlyshko
a6e590f220
cpack/nsis: do not strip files
2014-07-17 23:11:09 +03:00
Ivan Savenko
6073a08d1c
Merge pull request #31 from NikolayIT/develop
...
Added optimization flag (-O1) for the GCC compiler on Windows platform to prevent "CGameState.cpp.obj: too many sections" compile error
2014-07-16 13:57:33 +03:00
NikolayIT
3d3713ae7f
Added optimization flag (-O1) for the GCC compiler on Windows platform to prevent "CGameState.cpp.obj: too many sections" compile error
2014-07-16 11:37:57 +03:00
DjWarmonger
0763b9a758
- Implemented object per zone limit
...
- Various tweaks for Travis & repo
2014-07-15 22:33:51 +02:00
DjWarmonger
090abf41e8
Fixed sealing off parts of zones.
2014-07-15 19:52:58 +02:00
DjWarmonger
128b63a285
Fixed tiles around unguarded objects -> denser zones, less misplaced guards.
2014-07-15 19:10:03 +02:00
DjWarmonger
e8580229dc
RMG will now actually use all the settings from pregame. Till now it did not.
2014-07-15 16:44:07 +02:00
DjWarmonger
ca7fe822eb
Removed treacherous randomized constructor.
2014-07-15 15:41:53 +02:00