1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

3698 Commits

Author SHA1 Message Date
Macron1Robot
4a7a952590 Update faction.json
Added videoFile format to tavernVideo property
2014-04-29 21:55:35 +04:00
Macron1Robot
9494c6d335 Update JsonDetail.cpp
Added video file existence check
2014-04-29 21:53:50 +04:00
Macron1Robot
fd1640f931 Update GUIClasses.cpp
Removed excessive check for tavernVideo string
2014-04-29 13:06:55 +04:00
Macron1Robot
cd7ec5716f Update CObjectHandler.cpp
Changed type of "for" variable to auto in dailyIncome
2014-04-28 23:23:24 +04:00
Macron1Robot
558b155c0e Update CTownHandler.h
Removed definition of unnecessary type
2014-04-28 23:18:56 +04:00
Macron1Robot
324bb3c98d Update CModHandler.h
Returned type of loadConfigFromFile back to void
2014-04-28 23:17:24 +04:00
Macron1Robot
13ea6e39f0 Update CModHandler.cpp
Removed checking of defaultMods.json values
2014-04-28 23:15:36 +04:00
Macron1Robot
a3aa7314fe Update CObjectHandler.cpp
Corrected daily resource income calculation for town buildings
2014-04-28 18:22:21 +04:00
Macron1Robot
2355f3abe1 Update CModHandler.cpp
Corrected errors
2014-04-28 11:07:44 +04:00
Macron1Robot
13cd400d27 Update CModHandler.cpp
Corrected error handling in CModHandler::loadConfigFromFile
2014-04-28 11:03:54 +04:00
Macron1Robot
7c1d3d17fc Update CTownHandler.cpp
Corrected hadling of null "produce" section for legacy mod to make it more readable
2014-04-28 10:48:00 +04:00
Macron1Robot
1982ca861b Update CObjectHandler.cpp
Deleted commented text and excessive assignment
2014-04-28 10:37:18 +04:00
Macron1Robot
21c2efbc64 Update VCAI.cpp
Deleted commented text and optimized estimateIncome
2014-04-28 10:33:42 +04:00
Macron1Robot
ede9818b38 Update VCAI.cpp
corrected typo
2014-04-28 08:26:21 +04:00
Macron1Robot
2d425666d7 Update Global.h
Removed commented row
2014-04-27 13:48:22 +04:00
Macron1Robot
31f2af6243 Removed commented part for daily income 2014-04-27 13:44:56 +04:00
Macron1Robot
5adafe02a2 added commit changes to changelog 2014-04-27 13:41:31 +04:00
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
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
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