Karol
8eb1721050
VCMIDirs update #2
...
Changet to tree model based on classes
2014-08-09 19:54:12 +02:00
Karol
ebc8c9d077
VCMIDirs update #1
...
- Class VCMIDirs is now deprecated.
- VCMIDirs now is an namespace, not an singletone.
- VCMIDirs uses now boost::filesystem::path, not a std::string.
2014-08-09 17:22:37 +02:00
Ivan Savenko
b1285bc506
Merged GUI refactoring into develop, fixed conflicts
2014-08-09 15:01:55 +03:00
Ivan Savenko
c0e4591bc7
Added workaround for random objects on water, fixes 1828
2014-08-09 13:48:38 +03:00
Ivan Savenko
05d8fad314
Miscellaneous fixes to banks:
...
- fixed evaluation of bank thread by AI (1850)
- fixed crash on evaluating bank threat after loading from save (1830)
- fixed typo in bank config. TODO: schema?
2014-08-09 12:31:43 +03:00
Ivan Savenko
f55d335e1c
Fixed visitable objects resetting on day 7 (1847)
2014-08-08 15:53:04 +03:00
Ivan Savenko
d1dd7eef48
Proper fix for #1712 - Building requirement tests are now fixed
...
- added minimize() method in logical expressions that will remove excessive elements
- replaced forEach() with morph() that allows replacing types in variant
2014-08-07 19:53:07 +03:00
Ivan Savenko
16eb4b3267
First part of fix for 1712
...
- implemented recursive search for missing dependencies
- todo - update GUI. As of now Gui may provide incorrect information
2014-08-07 19:53:07 +03:00
rhn
a6151a5296
added FLAC support
2014-08-06 17:19:53 +02:00
rhn
a491c11305
Fixed sound effect when hero disappears
2014-08-06 17:19:53 +02:00
rhn
e9534603c2
Fixed sound on object pickup with dialog
2014-08-06 17:19:53 +02:00
beegee1
d918621d66
- fixed casting sacrifice spell (was broken and now fixed partially)
2014-08-05 19:12:56 +02:00
beegee1
c1ac95b288
- fixed Clang compiler warnings
2014-08-04 20:36:00 +02:00
beegee1
5139378319
- migrated boost::function/ref/bind to std:: variants
2014-08-04 20:33:59 +02:00
Ivan Savenko
33acdc51bb
Fixes 1852 - fixed typo in tower config and added check to detect such cases
2014-08-04 14:47:42 +03:00
Ivan Savenko
0882201b17
Miscellaneous fixes to toggle buttons
2014-08-03 16:19:16 +03: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
b97e4b1ab5
Fixed crash when setting players number to 1.
2014-07-26 14:20:33 +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
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
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
eb0ea86ccb
Fix for Travis.
2014-07-18 07:40:27 +02: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
DjWarmonger
be8c9c8378
Correct strength of zone guards. Logs for guard strength.
2014-07-15 14:38:05 +02:00
DjWarmonger
173111955e
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-07-15 12:27:59 +02:00
DjWarmonger
3a19bf964a
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-07-15 11:50:50 +02:00
Ivan Savenko
92d22bae63
Merge branch 'feature/creatureWindow' into refactoring/guiClasses
2014-07-14 17:23:24 +03:00
Michael Pavlyshko
f7d8faa540
install only .dll (without .dll.a)
2014-07-11 17:27:50 +03:00
Michael Pavlyshko
bad7050096
spaces -> tabulation
2014-07-11 11:01:03 +03:00
Michael Pavlyshko
c25ccc2acb
Rename: vcmi.dll -> VCMI_lib.dll, vcmilauncher.exe -> VCMI_launcher.exe
2014-07-11 01:09:00 +03:00
Michael Pavlyshko
c935193558
disable WIN32 flag for executables, fix previous commit
2014-07-10 00:47:22 +03:00
DjWarmonger
966873181f
Do not let monsters or treasures spawn near already placed monsters.
2014-07-09 22:09:06 +02:00
DjWarmonger
6c0a396094
Corrected y-axis orientation, now object placement is correct.
2014-07-09 16:39:17 +02:00
DjWarmonger
492b866806
- Fixed crash caused by randomShuffle
...
- Banned Magic Spring as it has 2 visitable positions
2014-07-09 14:27:12 +02:00
DjWarmonger
8d58ce08aa
Correct position of blocked tiles.
2014-07-09 12:05:14 +02:00
DjWarmonger
927e16d9f5
Almost correct placement of all objects.
2014-07-09 11:38:16 +02:00
DjWarmonger
2a8ae6310e
Better object placement and accessibility.
2014-07-09 09:22:50 +02:00
Michael Pavlyshko
3443ba5bb3
fix libvcmi linking
2014-07-09 01:43:13 +03:00
DjWarmonger
22d26db694
Correct placement of non-overlapping objects.
2014-07-08 20:13:51 +02:00
DjWarmonger
8a8cda950d
Fix for previous commit.
2014-07-08 13:17:47 +02:00
DjWarmonger
b9a01fbffe
Make sure main town is accessible.
2014-07-08 12:28:50 +02:00
DjWarmonger
d3f97829a1
Prevent RoE elemental dwellings from spawning.
2014-07-08 11:57:02 +02:00
DjWarmonger
82ccf240f0
Fixed fractalize algorithm - better treasure density.
2014-07-08 11:28:55 +02:00
DjWarmonger
3fb498713a
Fixed placement of large obstacles.
2014-07-08 08:59:13 +02:00
Michael Pavlyshko
820eceb8ad
Add VCMI_DLL flag for libvcmi
2014-07-08 01:50:44 +03:00
DjWarmonger
866cd6f540
Allow underground zones to connect more easily. Regression: Obstacles spawn at zone boundaries.
2014-07-07 18:01:15 +02:00
DjWarmonger
ced3d32f3f
Scale dwelling / pandora with creatures value according to number of native zones.
2014-07-07 16:20:48 +02:00
DjWarmonger
4cea0a2973
Zone dwellings will now match first town.
2014-07-07 11:29:16 +02:00
Ivan Savenko
aaf314baf4
Source ID from bonusing objects is not object index but object type. Fixes at least partially #1822
2014-07-07 08:29:07 +03:00
DjWarmonger
f65239b51f
- Added faction-specific dwellings
...
- Fixed generation of terrain-specific objects
2014-07-06 22:14:37 +02:00
DjWarmonger
f3ccdc8a21
Even distribution for surface / underground zones.
2014-07-06 10:43:30 +02:00
DjWarmonger
cbd2d74292
Generate random Pandora boxes.
2014-07-06 07:15:52 +02:00
DjWarmonger
0782557814
- Place all standard visitable objects
...
- Fixed some constructors
2014-07-05 19:36:12 +02:00
DjWarmonger
9cfbbb2048
Merge underground maps with develop. There is a serious issue with rendering rock tiles, which may cause crash.
2014-07-05 15:22:53 +02:00
DjWarmonger
d942858ef9
Throw exception when there are not enough two-way monoliths available.
2014-07-04 14:46:02 +02:00
DjWarmonger
05c2a4e716
Better gravity-based algorithm.
2014-07-04 11:51:28 +02:00
Ivan Savenko
20f7071d11
Implemented stack experience/commander experience display for window
2014-07-04 12:48:09 +03:00
DjWarmonger
5fb07ded38
Correct underground terrains. More improvements for connection placement.
2014-07-04 10:45:00 +02:00
DjWarmonger
d4d3f1a568
More tweaks.
2014-07-04 09:54:55 +02:00
DjWarmonger
ab748ae221
Somewhat better gate placement, attempt to add rocky tiles to underground zones.
2014-07-03 23:11:24 +02:00
DjWarmonger
d118fbffe8
Correct placement of subterranean gates.
2014-07-03 17:24:28 +02:00
DjWarmonger
60a5c764b8
Correct zone placement & sizing for underground maps.
2014-07-03 12:28:51 +02:00
DjWarmonger
cc8d484775
Refacoring, tweaks.
2014-07-03 09:39:26 +02:00
AlexVinS
9797372dbe
Implement Unicode support for ingame console
2014-07-02 19:16:05 +04:00
AlexVinS
195eae48ca
Merge branch 'develop' into SDL2
...
Conflicts:
client/CPlayerInterface.cpp
2014-07-02 17:15:12 +04:00
DjWarmonger
abd6fe73dd
Version 0.96 release.
2014-07-01 19:32:31 +02:00
DjWarmonger
cc294b3ae7
Version 0.96 release.
2014-07-01 19:30:31 +02:00
Ivan Savenko
cc349fa64f
Fixed Faerie Ring bonus, removed unused code
2014-07-01 18:19:51 +03:00
Ivan Savenko
c956b3f02a
Fixed #1820 , better detection of object below cursor that uses same logic as renderer
2014-07-01 17:19:08 +03:00
DjWarmonger
bae9f2083f
Workaround for hero & town issue. Game still crashes elsewhere, though.
2014-07-01 12:07:53 +02:00
DjWarmonger
54390ea81c
Merge branch 'develop' into RMG
2014-07-01 08:25:53 +02:00
DjWarmonger
bda71bed83
Uploading misc tweaks.
2014-07-01 07:07:40 +02:00
Ivan Savenko
db221829aa
Modding-related bugfixes:
...
- hero classes will be loaded correctly
- objects without index will have correctly assigned ID's
2014-06-30 17:13:01 +03:00
AlexVinS
50dfe05cd1
[C::B] Small projects fix
2014-06-30 11:19:55 +04:00
DjWarmonger
a556ef64e9
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-30 06:45:35 +02:00
Ivan Savenko
a1fff864e6
Fixed missing names for dwellings and creature banks
2014-06-30 00:16:45 +03:00
Ivan Savenko
f01ab0d48f
Fixed rest of reported on forums bugs in rewardables
2014-06-29 20:13:25 +03:00
Ivan Savenko
1157111fcf
More bugfixing:
...
- Fixed compile in VCAI (precompiled headers should not include VCMI headers)
- Fixed crash on visiting observatories, including shroud of darkness
2014-06-29 17:23:06 +03:00
DjWarmonger
7dbe2f5c40
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-28 16:31:06 +02:00
Ivan Savenko
917b1ffca8
Bugfixing:
...
- Added missing types for serialization
- Fixed possible crash in removable objects (campfire)
- Fixed typo in bank config
2014-06-28 17:21:38 +03:00
DjWarmonger
920f56969b
Create random obstacles that match terrain.
2014-06-28 09:46:32 +02:00
DjWarmonger
7aa8213cd5
Tweaked templates to allow all map sizes.
...
To be released as 0.95c.
2014-06-27 21:48:17 +02:00
DjWarmonger
90b72a7856
Workaround with Obelisks. Kill me later.
2014-06-27 20:28:21 +02:00
DjWarmonger
383280f72a
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-27 18:26:43 +02:00
Ivan Savenko
f01e30a3b1
Added random objects to configs. For now as separate "random handlers", should be merged into main handlers later
2014-06-27 19:15:47 +03:00
DjWarmonger
ccb475b699
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-27 06:24:05 +02:00
Ivan Savenko
bac83d8bd0
Compatiblity for last version of Cove (and likely any other town mods)
2014-06-27 00:07:09 +03:00
DjWarmonger
57fa905a2b
Something that compiles.
2014-06-26 22:05:27 +02:00
DjWarmonger
e51e2190fd
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-26 20:12:37 +02:00
AlexVinS
aea5a7ba75
add comment. no code changes.
2014-06-26 20:49:18 +04:00
AlexVinS
c28b5f6633
fix mingw build
2014-06-26 20:41:27 +04:00
Ivan Savenko
00b6232ff6
Replaced usage of DLL_LINKAGE with ELF_VISIBILITY in netpacks. Please make sure that compilation now works on all platforms
2014-06-26 18:34:54 +03:00
Haryaalcar
ce6940e272
build fix for mac os:
...
1) type_info visibility for CatapultAttack
2) using IObjectInfo::CArmyStructure in min_element : operator< should be const
2014-06-26 01:24:48 +03:00
Ivan Savenko
955552488e
- H3M parser will create objects that don't have data in map file via
...
object handler.
- Added large number of missing objects to config
2014-06-25 20:26:47 +03:00
Ivan Savenko
32240da34e
Reduced number of #include's in headers. May break compilation on Win
...
since some net packs now need DLL_LINKAGE
2014-06-25 17:11:07 +03:00
Ivan Savenko
3b0ecee678
Ugly workaround for DLL_LINKAGE issue. Should be removed once I figure
...
out what's triggering it.
2014-06-25 00:37:33 +03:00
Ivan Savenko
a0689fa377
Refactoring of hoverText from objects:
...
- removed hoverText field
- split getHoverText() method into 3:
- - getObjectName() for generic name
- - getHoverText(Player) for player-specific text
- - getHoverText(Hero) for hero-specific strings
2014-06-24 20:39:47 +03:00
Ivan Savenko
ad632d1e8a
Moved FoW management from CGObjectInstance to callback
2014-06-24 20:39:47 +03:00
Ivan Savenko
5ebc0e8614
First part of object instance API cleanup
...
- removed passability() method in favour of passableFor(PlayerColor)
- moved operator < code to map handler
- updated class documentation
2014-06-24 20:39:47 +03:00
AlexVinS
4e4ba6654c
fix Eye of magi, also fix #1608
...
Conflicts:
lib/CObjectHandler.cpp
2014-06-24 18:20:28 +04:00
AlexVinS
c7772aa5a4
Merge branch 'develop' into SDL2
...
Conflicts:
lib/NetPacks.h
lib/NetPacksLib.cpp
2014-06-24 18:19:57 +04:00
AlexVinS
c7dc4c05b8
fix mingw build
...
(?) does this brake *nix build?
2014-06-24 18:17:25 +04:00
AlexVinS
b371c7ef74
fix build
2014-06-24 15:23:37 +04:00
AlexVinS
3b8d0e44d4
Merge branch 'develop' into SDL2
2014-06-24 14:09:44 +04:00
Ivan Savenko
13bc4cb24f
Added -fvisibility=hidden parameter for gcc.
...
Should help a bit with endless missing DLL_LINKAGE attributes and
(according to gcc docs) help a bit with library loading times.
2014-06-24 00:05:53 +03:00
DjWarmonger
79036484dd
Trying to sort out project changes and compile issues.
2014-06-23 19:58:19 +02:00
Ivan Savenko
db49798b4d
Fixed random artifact selection
2014-06-23 20:47:09 +03:00
Ivan Savenko
7c52db923a
Removed mods compatibility code from 0.95
2014-06-23 20:47:09 +03:00
Ivan Savenko
06d17f709d
fixed compatibility code for resource-granting buildings
2014-06-23 20:47:09 +03:00
AlexVinS
46d92f11cb
Project update, fix build
...
(!) register types as usual too huge
2014-06-23 10:24:49 +04:00
Ivan Savenko
c605e2d10c
Gcc compile & warning fixes
2014-06-22 17:26:08 +03:00
DjWarmonger
901188e2e1
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-22 14:53:51 +02:00
DjWarmonger
3ac306f501
Merge pull request #19 from vcmi/feature/mapObjects
...
Feature/map objects
2014-06-22 14:49:42 +02:00
Ivan Savenko
ab475195ac
Banks now use new scheme as well
...
- Implemented Bank Constructor object.
- Merged Pyramid object into common Bank class. Banks can now grant
spells as part of their reward.
- Move bank config code to config/objects/creatureBanks.json. Note: WoG
banks are not updated yet, should be moved to WoG mod.
- Updated AI code so it can correctly evaluate bank danger (should be
generic enough for use with other objects)
- New files JsonRandom.* that contain routines for loading random
objects from Json (still WiP but should be stable)
2014-06-22 13:39:40 +03:00
DjWarmonger
d3134a1290
Add free tiles around unguarded objects.
2014-06-18 10:31:08 +02:00
DjWarmonger
f84e25fa78
Somewhat better algorithm for paths, helps balance object distribution.
2014-06-18 09:57:36 +02:00
Ivan Savenko
0a71e89f58
Created large number of missing objects in configs
...
Minor bugfixes in code
2014-06-17 14:57:47 +03:00
Ivan Savenko
09d595e385
- Implemented "mapObject" entry for hero classes
...
- Updated schemas
- Some bugfixing
2014-06-16 19:27:26 +03:00
Ivan Savenko
89b89ff85d
Bugfixing. Game seems to be working without major bugs.
2014-06-15 23:25:10 +03:00
DjWarmonger
60df94a3f5
Placing towns according to template.
2014-06-15 21:23:53 +02:00
DjWarmonger
8e66b7168a
Corrected paths & guard for large objects.
2014-06-15 19:56:58 +02:00