games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
3,939 Commits 30 Branches 75 Tags
383280f72a392527087be2386c23d50a73c85d15
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DjWarmonger 383280f72a Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-27 18:26:43 +02:00
DjWarmonger ccb475b699 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-27 06:24:05 +02: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
DjWarmonger 79036484dd Trying to sort out project changes and compile issues. 2014-06-23 19:58:19 +02: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
DjWarmonger 637f4894bc Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG 2014-06-18 10:31:41 +02: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
DjWarmonger 60df94a3f5 Placing towns according to template. 2014-06-15 21:23:53 +02:00
DjWarmonger 91336b346a Placing towns according to template. 2014-06-15 21:23:32 +02:00
DjWarmonger 8e66b7168a Corrected paths & guard for large objects. 2014-06-15 19:56:58 +02:00
DjWarmonger e56f41b8be Fixed monster strength selection. 2014-06-15 12:00:34 +02:00
DjWarmonger 01355a77d8 Added "monster strength" info to templates. 2014-06-15 11:08:06 +02:00
DjWarmonger 5c431da0f9 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-15 10:01:18 +02:00
DjWarmonger 890f29fa7e Improved guard placement for large objects. 2014-06-15 09:39:30 +02:00
DjWarmonger aa54803c50 Refactoring, clearing logs. 2014-06-15 08:48:46 +02:00
DjWarmonger 79da7b92ce Templates now contain info about mines. 2014-06-14 20:05:19 +02:00
DjWarmonger 93b44de63c Handling "terrain type" and "match terrain to town" options. 2014-06-14 17:14:59 +02:00
DjWarmonger 6cbcfbf0a9 Sealed-off treasure piles will be discarded and filled with obstacles. 2014-06-13 12:04:17 +02:00
DjWarmonger edd46d87c1 Treasure pile entrance/guard will always be aimed at the center of the zone. 2014-06-13 08:00:26 +02:00
DjWarmonger 2c1001f8e0 Making sure that treasure piles and other objects will always be accessible from the center of zone. 2014-06-12 21:51:16 +02:00
DjWarmonger 236b3ec807 Zones will get random network of passable paths inside them. Treasures will try to fill all remaining fields. 2014-06-12 21:10:43 +02:00
DjWarmonger e468e8453b Merge pull request #17 from Haryaalcar/develop 
sorting by filename implemented for save and load screens
 2014-06-11 13:10:28 +02:00
DjWarmonger 110aebc5b1 Merge pull request #16 from Haryaalcar/develop 
crash in VCAI::completeGoal() fixed
 2014-06-09 15:43:49 +02:00
DjWarmonger 1a34297c33 Rearranged treasure pile info. 2014-06-08 14:35:41 +02:00
DjWarmonger c82bfd0f3e - Fixed guard generation 
- Added Jebus template for comparison
 2014-06-08 08:42:29 +02:00
DjWarmonger fed2821a94 Fixed behaviour with extreme treasure values. 2014-06-07 22:27:36 +02:00
DjWarmonger 81a64a8e67 Templates can now use multiple configurations of treasure piles. 2014-06-07 15:51:03 +02:00
DjWarmonger b3a39f4920 Misc improvements & tests. 2014-06-07 14:02:57 +02:00
DjWarmonger dd5c94fa1e Fixed overlaping of treasure piles. 2014-06-07 10:47:38 +02:00
DjWarmonger b68f16e89e Make sure that non-removable objects have their visitable tile accessible. 2014-06-07 10:13:59 +02:00
DjWarmonger 743d8dcf9f Treasure piles won't be placed at free tiles. 2014-06-07 09:09:50 +02:00
DjWarmonger e4ea6727b7 Treasure piles should always be accessible. 
Boosted treasure value for better overview.
 2014-06-05 21:37:39 +02:00
DjWarmonger 1746ab8c12 Added spell scrolls to the mix. 2014-06-05 20:19:42 +02:00
DjWarmonger e54c816c92 Treasure piles can now cover several tiles. 2014-06-05 17:19:11 +02:00
DjWarmonger c470b9606b Obstacles won't be generated around unguarded objects. 2014-06-04 20:59:01 +02:00
DjWarmonger 464ffc4afa Implemented (hopefully) original treasure randomization algorithm. 2014-06-04 19:08:04 +02:00
DjWarmonger fe05de9aff Fixed copying zone settings. 2014-06-04 15:41:32 +02:00
DjWarmonger fdb81f4d5c Reading treasure values from config. 2014-06-04 15:16:23 +02:00
DjWarmonger 62e9f13b08 - Implemented guard generation formula following this post http://forum.vcmi.eu/viewtopic.php?p=12426&sid=09f5fac8992dc880eb6a720615787ca0#12426 
- Some primitive way to randomize treasures
 2014-06-04 10:16:08 +02:00
DjWarmonger 6221f4ac2c - Corrected guard types 
- Corrected town positions
 2014-06-03 08:57:20 +02:00
DjWarmonger 9972d233a6 Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG 2014-06-02 15:39:20 +02:00
DjWarmonger 2aa53e9568 Corrected guard calculation to match OH3. 2014-06-02 15:38:42 +02:00
DjWarmonger 252e78acc2 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-01 21:55:07 +02:00
DjWarmonger 7a1e12e1df Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-01 21:54:35 +02:00
DjWarmonger 7db06e6bd0 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-01 21:53:00 +02:00
DjWarmonger 37463a3e45 Zone position will be moved to its center of mass. 2014-06-01 21:01:18 +02:00
DjWarmonger 7f31b7dddb - Zone guards will now match template settings. 
- Added guards for monoliths.
 2014-06-01 16:31:49 +02:00
DjWarmonger 51fc3fbf83 - Zone guards will now match template settings. 
- Added guards for monoliths.
 2014-06-01 16:31:15 +02:00
DjWarmonger 3c5a65af3d - Random monsters will have proper strength. 
- Fixed blocking of tiles under objects
 2014-06-01 14:10:44 +02:00
DjWarmonger 11454ef4b3 Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG 2014-06-01 12:03:39 +02:00
DjWarmonger aee748d8d6 - Added monoliths between remote zones 
- Fixed land connections between zones, now they're generated correctly.
 2014-06-01 12:02:43 +02:00
DjWarmonger e97933035c Randomized connections placement (?) 2014-06-01 10:15:03 +02:00
DjWarmonger 3c6a1fb715 Large objects will not spawn at blocked tiles. 2014-05-31 12:26:59 +02:00
DjWarmonger 425d29ac90 Large objects will not spawn at blocked tiles. 2014-05-31 12:26:37 +02:00
DjWarmonger 8e8b27087a Ground connections between adjacent zones. 2014-05-31 10:56:14 +02:00
DjWarmonger 8ab2a8df86 Zone borders. 2014-05-30 21:23:41 +02:00
DjWarmonger 8c24ea0bfb Introduced 3-value logic for free, blocked and possibly occupied tiles. Refactoring. 2014-05-30 16:50:06 +02:00
DjWarmonger 8ea175ce95 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-05-30 07:33:32 +02:00
DjWarmonger 690f4a650a Even better zone shapes. 2014-05-28 21:11:10 +02:00
DjWarmonger c627aa608a Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-05-28 19:34:12 +02:00
DjWarmonger 2304c33a38 Merge pull request #15 from karol57/develop 
Updated int3 class and fixed small error.
 2014-05-28 11:25:25 +02:00
DjWarmonger 8f033a7834 Golden ratio for smoother zone shapes. 2014-05-25 13:30:47 +02:00
DjWarmonger 69457dbd75 - Implemented some really nice gravity-based algorithm 
- Fixed zones placed outside the map (causing various bugs)
 2014-05-25 06:20:02 +02:00
DjWarmonger b9de3875d9 - Attempt to move zones away from map boundaries 
- Tweaking algorithm parameters
- Refactorings
 2014-05-24 18:39:58 +02:00
DjWarmonger 462514965c Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-05-24 14:45:34 +02:00
DjWarmonger 021c6b9af3 All zones will be painted with terrain. Removed unused code. 2014-05-24 14:33:22 +02:00
DjWarmonger d2fd71d087 Zone shapes & terrains work nicely. 2014-05-24 14:06:08 +02:00
DjWarmonger 27dcf70b1a Randomized center positions of zones. 2014-05-24 12:42:06 +02:00
DjWarmonger 3a6f748fb5 Paint native terrain in zones. 2014-05-23 21:43:33 +02:00
DjWarmonger 75cea9206d - Fixed uninitialized guarding creature positions 
- Fix for guard placement
 2014-05-23 19:45:17 +02:00
DjWarmonger b63e00c1bc Merge pull request #14 from vcmi/RMG 
Patch integration is now complete. Some simple map objects are placed around and in general it works without crashes.
 2014-05-23 19:15:50 +02:00
DjWarmonger 35d6215b7b jfhs patch integration is now complete: 
Lots of fixes for object placement.
Fixed blocked paths on generated maps.
 2014-05-23 19:14:33 +02:00
DjWarmonger 4ea9810831 First version that works: 
- Covered RMG with exceptions
- Fixes for object randomization & placement
 2014-05-23 17:12:31 +02:00
DjWarmonger 342aec0700 More rollback. 2014-05-23 13:23:03 +02:00
DjWarmonger 5b0b152aa3 Trying to restore recent type of mapGenOptions. 2014-05-23 11:56:51 +02:00
DjWarmonger eae7e5c51f Rolled back some incorrect values. 2014-05-23 09:22:22 +02:00
DjWarmonger 67793a2db4 Some more. 2014-05-22 21:40:34 +02:00
DjWarmonger 2d8cd1c5b5 Some more. 2014-05-22 21:06:26 +02:00
DjWarmonger aead8da54f Fixed some obvious bugs with random map options. 2014-05-22 20:50:24 +02:00
DjWarmonger 1e1dce20a8 Something that compiles, but crashes when launching RMG map. 2014-05-22 19:25:17 +02:00
DjWarmonger 88f962d6d5 Taken jfhs code as it is. 
http://forum.vcmi.eu/viewtopic.php?p=10040#10040
 2014-05-22 16:27:13 +02:00
DjWarmonger 6658e173f1 - Possible fix for #1769 
- Fixed all possible (even unexpected) crashes when AI looses active hero
 2014-05-18 13:13:31 +02:00
DjWarmonger e074c9b310 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-05-18 09:00:32 +02:00
DjWarmonger e2d44f6ac6 Fixed #868 - wrong battlefield in ship-to-ship combat 2014-05-18 08:52:03 +02:00
DjWarmonger 9f28e4e4ca Merge pull request #10 from Macron1Robot/works 
Bug 0001789 correction (incorrect battle field detection)
 2014-05-18 08:26:36 +02:00
DjWarmonger 00c31b4b85 Fixed #1790 2014-05-17 21:30:55 +02:00
DjWarmonger 573293d425 Merge pull request #9 from alexvins/issue/1763 
Try to fix #1763 and a small refactoring
 2014-05-17 10:35:28 +02:00
DjWarmonger 1ea6723a32 Merge pull request #8 from xyzz/android-rolling 
Android port.
 2014-05-17 05:17:54 +02:00
DjWarmonger 52f92a0190 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-05-16 19:33:09 +02:00
DjWarmonger 6ab0039053 Fixed #1600 - incorrect specialty of Saurug 2014-05-16 19:27:01 +02:00
DjWarmonger a9b3a03bdd Fixed #1670 - Mirth working on immune creatures 2014-05-16 12:47:09 +02:00
DjWarmonger eb337d7407 Fixed #1638 - spells banned in map settings appeared in town guild 2014-05-16 12:15:35 +02:00
DjWarmonger 1dbc0c7177 Compilation fix. This will be released as VCMI 0.95b. 2014-05-02 12:19:50 +02:00
DjWarmonger fb5152254d Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup 
Conflicts:
	client/CKingdomInterface.cpp
 2014-05-02 12:03:02 +02:00
DjWarmonger 9540f9e451 Merge branch 'develop' of https://github.com/vcmi/vcmi into WarmysBackup 2014-05-01 14:27:32 +02:00
DjWarmonger 4a71442c80 Missing changes. 2014-04-27 14:38:20 +02:00
DjWarmonger f418b468c4 Merge branch 'develop' of https://github.com/vcmi/vcmi into WarmysBackup 2014-04-27 12:49:29 +02:00