Ivan Savenko
b2e8c92383
Cleanup:
...
- removed commented-out #includ'es
- renamed some files to match name of class
2014-06-05 20:26:50 +03:00
Ivan Savenko
76bf5351c6
Line endings are now unix-style
2014-06-05 19:57:43 +03:00
Ivan Savenko
652ceb2bde
Finally shattered CObjectHandler.cpp into tiny bits
...
- This file is now split into multiple smaller files in mapObjects
directory
- CObjectHandler itself now contains only core classes (Handler itself,
CGObject and interfaces)
- Cleaned up excessive #include's through whole project
2014-06-05 19:52:14 +03:00
DjWarmonger
e54c816c92
Treasure piles can now cover several tiles.
2014-06-05 17:19:11 +02:00
Ivan Savenko
0afdfa529c
Moved all object-related files to lib/mapObjects directory.
...
Renamed some classes to more readable names
2014-06-05 14:19:47 +03:00
Ivan Savenko
1d5d4e3248
Fixed broken in some cases behavior of "base" entries.
...
Maps with new objects seems to be working correctly now, objects are
correctly initialized with base values even with null input
2014-06-04 22:59:28 +03:00
DjWarmonger
c470b9606b
Obstacles won't be generated around unguarded objects.
2014-06-04 20:59:01 +02:00
stopiccot
a091398027
different iso files have different data1.cab location
2014-06-04 21:40:33 +03:00
Ivan Savenko
971a93b4f1
Fixed missing serialization of new types
2014-06-04 20:43:54 +03: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
stopiccot
e425c319c3
remove useless __MACOSX folder after downloading dependencies on OS X
2014-06-04 16:36:00 +03:00
DjWarmonger
fdb81f4d5c
Reading treasure values from config.
2014-06-04 15:16:23 +02:00
Ivan Savenko
e9b41cd3c6
Minor fixes, no more missing objects & templates
2014-06-04 14:15:58 +03:00
Ivan Savenko
7e057b6df8
Bugfixing, game can finally load to main menu without crash
2014-06-04 11:25:13 +03: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
Ivan Savenko
32b6568b65
Merged changes from upstream and fixed compilation caused by API changes
2014-06-03 22:45:18 +03:00
Ivan Savenko
dc7f820161
Implemented object schema. Commiting current progress before sync with
...
upstream.
2014-06-03 21:43:33 +03:00
DjWarmonger
6221f4ac2c
- Corrected guard types
...
- Corrected town positions
2014-06-03 08:57:20 +02:00
beegee1
a94b7e0986
- updated changelog
2014-06-02 20:34:09 +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
beegee1
a87363c0f1
- fixed mantis #783 - play sound when entering message in chat box
2014-06-01 18:48:40 +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
AlexVinS
f212c8221d
[RMG]Fix gcc build, remove some unused variables
2014-05-31 16:11:20 +04: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
beegee1
72b2e1b8fe
- fixed bug when generating random map and adding player info data
2014-05-29 17:34:46 +02:00
beegee1
40ab89e179
- copy of campaign heroes can be done later (at the point where it's clear if they will be replaced)
2014-05-29 17:07:21 +02:00
Ivan Savenko
1d17d60449
gcc update:
...
- removed support for 4.6
- compilation fixes for 4.7
2014-05-29 13:42:05 +03: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
karol57
6a65802f22
Removed hardcoded value
2014-05-26 11:52:27 +02:00
karol57
5907735676
All inline functions are now part of definition.
2014-05-26 10:37:04 +02:00
karol57
c676c5da82
Fixed small error in nearest town finding algorithm.
2014-05-25 21:53:25 +02:00
karol57
dd33fd51a8
int3 dist2d microoptimization
2014-05-25 20:42:25 +02:00