1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00
Commit Graph

3835 Commits

Author SHA1 Message Date
Macron1Robot
237d2b4090 Added myself 2014-04-27 13:40:30 +04:00
Macron1Robot
8ec7a9b919 Moved "max heroes on map per player", "max heroes available for player" to "defaultMods.json" 2014-04-27 10:43:46 +04:00
Macron1Robot
907caedb13 Added "produce" section in "building" structure. Changed dailyIncome. 2014-04-26 18:23:35 +04:00
DjWarmonger
18f2eafde5 Merge pull request #5 from janisozaur/develop
fixed possible nullptr dereference
2014-04-25 16:37:02 +02:00
Michał Janiszewski
bece1e5b1f fixed possible nullptr dereference
* Fixed a switch() statement in InfoBoxHeroData::getValueText that
  could result in nullptr dereference. If 'type' was HERO_MANA and
  'hero' was nullptr, a fallthrough would occur to HERO_EXPERIENCE,
  where 'hero' would we be dereferenced.
* Fixed line endings.
2014-04-25 14:31:11 +02:00
Macron1Robot
9123c7a787 Fix for map tavern (video set to standard) 2014-04-25 01:06:14 +04:00
Macron1Robot
b7b890acff Added "tavernVideo","guildBackground" to "faction" JSON config and schema. If "primaryResource" is set to "gold", silo will generate 500 gold per day 2014-04-24 23:36:18 +04:00
DjWarmonger
92a62368b5 One more fix for MVS compilation 2014-04-24 21:09:27 +02:00
DjWarmonger
9e7013de77 Backup for my own MVS project configuration 2014-04-24 21:07:43 +02:00
DjWarmonger
fe4704157c Merge pull request #3 from o01eg/my-diff
Fix for linking in MS VS and CodeBlocks.
2014-04-24 18:35:48 +02:00
O01eg
8110b65647 Fix for linking in MS VS and CodeBlocks. 2014-04-24 19:54:05 +04:00
Ivan Savenko
aa30b31c96 Merge pull request #2 from o01eg/my-diff
Split and clean up for IGameCallback.
2014-04-23 15:18:43 +03:00
O01eg
334bd28bd4 It compiles with -gdwarf-3 2014-04-20 14:10:46 +04:00
O01eg
c6238588bd Rename new files. 2014-04-20 12:58:58 +04:00
O01eg
ad84ae64b0 Clean up. 2014-04-20 12:40:15 +04:00
O01eg
463073ebfa Move CPrivilagedInfoCallback, IGameEventCallback and CNonConstInfoCallback to IGameCallback.h 2014-04-20 11:13:37 +04:00
O01eg
927eb33c11 Split IGameCallback to reduce memory required to debug compilation. 2014-04-19 21:44:21 +04:00
beegee1
e2bcac4d27 - fixed include random generator header 2014-04-18 18:45:47 +02:00
beegee1
1d57b75bc5 - random number generation refactoring
- fixed mantis #1743
2014-04-10 19:22:32 +02:00
Ivan Savenko
d234f8627b Added Qt Creator temporary files to gitignore 2014-04-08 13:59:07 +03:00
Ivan Savenko
1404aabeff Merge remote-tracking branch 'upstream/develop' into postMigration 2014-04-08 13:52:07 +03:00
Ivan Savenko
c70bb25146 Hopefully - more useful readme file 2014-04-08 13:49:18 +03:00
Ivan Savenko
dc9fdf691a Debian update, removed empty files from trunk 2014-04-08 13:30:53 +03:00
AlexVinS
4a4584f53c [c::b] +working Test project file 2014-04-07 10:06:03 +04:00
AlexVinS
246e146eca More .gitignore configuration 2014-04-07 10:05:25 +04:00
AlexVinS
8c4506144c create initial .gitignore 2014-04-07 08:58:51 +04:00
AlexVinS
0682c2fa60 add Test project to workspace 2014-04-07 08:58:21 +04:00
DjWarmonger
2da3d7d7c3 Removed AI bottleneck on water-based maps. 2014-04-03 09:57:44 +00:00
alexvins
13f72e581e [c::b] +tests project 2014-04-02 04:39:15 +00:00
alexvins
67450dfed6 config\creatures\neutral.json syntax fix 2014-04-02 04:24:55 +00:00
beegee1
48e7b7d805 - Some performance improvements for logging 2014-04-01 19:46:47 +00:00
DjWarmonger
30b79588db - Moved gameState::guardingCreaturePosition() to CMap so it doesn't need to be recalculated many times for every player.
- Some optimizations with local cb pinter in VCAI.
2014-04-01 11:53:28 +00:00
DjWarmonger
ec54381b12 Some more optimization. 2014-03-31 15:26:47 +00:00
DjWarmonger
a64df5718f Some nontrivial optimizations based on profiling results:
- Movement bonuses will be calculated ONCE per pathfinder loop
- Goals will be sorted by hero to reduce number of calculatePaths calls
2014-03-31 14:26:09 +00:00
DjWarmonger
8683c8c0eb - Added and improved some propagators, including Crystal Dragons ability (#1232)
- Minor refactoring in AI
2014-03-29 21:39:19 +00:00
Ivan Savenko
791099ab33 - added *_moc suffix to imageviewer files 2014-03-29 12:46:41 +00:00
Ivan Savenko
1cec8d4cfc Some bits towards replacements of objects.txt, first step towards
configurable objects support:
- fixes for object template loader
- schema for current object template format
2014-03-23 20:26:18 +00:00
Ivan Savenko
771c1ce255 - some effords to get rid of bottlenecks in AI code
- fixes, probably partially #1577
- enabled code for reading map object templates from json, still not
used
- disabled PCH for launcher due to speed issues.
2014-03-23 16:36:16 +00:00
DjWarmonger
441e4b2cb2 Improvements for AI speed (#1760)
AI heroes will be excluded from exploration if:
- There is no clear way to next exploration point or
- There is no possible exploration point at all
AI heroes will be erased from the list above if:
- FoW changes
- New object is added
- To prevent lock, primary hero will be erased at the start of each turn
2014-03-23 16:00:43 +00:00
Ivan Savenko
9c0df68cb8 Fixing spelling mistakes. Patch from josch, fixes #1759 2014-03-23 12:59:03 +00:00
Ivan Savenko
9dda194ed3 Support for new fields in mod format including:
- screenshots, repository-only field, will be used by launcher to d/l
screeenshots
- screenshots will be viewed as thumbnails with switch to full view on
click
- changelog that is now visible in launcher
- somewhat better handling of submods by launcher
2014-03-23 12:08:01 +00:00
Ivan Savenko
760ae7d44a Changes related to Debian packaging, based on josch patch
- AUTHORS file is now in UTF-8
- tags for desktop files
- fixed some typos
- better reaction on --help and --version commands
- vcmibuilder should work with both avconf and ffmpeg
2014-03-20 18:17:40 +00:00
Ivan Savenko
333a51a48a Launcher now supports submods. See forum thread for details. 2014-03-20 17:06:25 +00:00
beegee1
fe1b16a7ec Some preparation towards mantis #1743:
- refactored CRandomGenerator (added util methods, improved method names)
- usages of std::minstd_ran are replaced by CRandomGenerator (not in entire code base, C rand() usages are still not replaced)
- refactored getArtSync method of CArtHandler -> now named pickRandomArtifact
- fixed some compiler warnings
- updated source code URL in VCMI spec
2014-03-17 19:51:07 +00:00
alexvins
1aff899f5b Hotfix 2
* fix loading range attribute
* fix config for massive spells
2014-03-17 14:39:28 +00:00
alexvins
8cc586ab7f hotfix 2014-03-17 14:06:32 +00:00
alexvins
9cac0af7be [Spells] More spell related refactoring
+ smart target modifier
- CREATURE_EXPERT_MASSIVE target type
* save format changed

spell format changes already documented in http://wiki.vcmi.eu/index.php?title=Spell_Format
2014-03-17 13:11:10 +00:00
Ivan Savenko
7f6f125b4c First part of submods support.
- VCMI will load mods from Mods directory recursively. Submods must be
placed into additional Mods directory, e.g.
<data dir>/Mods/<mod name>/Mods/<submod name>

- submods will be loaded only if their parent mod was enabled
- submods namespace for objects will be "<parent mod ID>.<submod ID>"

- TODO: Launcher is not aware of submods yet (seems to be working but
may behave incorrectly)
2014-03-15 10:57:34 +00:00
alexvins
065b8366fb [Spells] Added basic support for icons and sounds
* few changes in spell format
* save format changed
2014-03-10 16:00:58 +00:00
alexvins
9f01a92f4c fix crash in jsonschema in case of invalid typename 2014-03-10 15:58:13 +00:00