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
Ivan Savenko
d805376ab8
Mostly final interface for object type handler
...
Partial implementation of object with reward constructor
2014-04-27 20:37:53 +03:00
DjWarmonger
4a71442c80
Missing changes.
2014-04-27 14:38:20 +02:00
Ivan Savenko
153dd1f5f9
- Added new files that should have been in last commit
2014-04-27 15:19:23 +03:00
DjWarmonger
f418b468c4
Merge branch 'develop' of https://github.com/vcmi/vcmi into WarmysBackup
2014-04-27 12:49:29 +02: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
Ivan Savenko
7725232253
backup of current progress, started design of "Object configurer" that
...
will be responsible for configuring of ObjectWithReward's from json
config.
2014-04-25 17:59:05 +03: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
Ivan Savenko
a6c0886d03
It is possible to remove object as part of "reward"
2014-04-12 16:47:48 +03:00
Ivan Savenko
2c8af871fc
Added possibility to add custom components to reward description.
...
Used to properly display morale/luck rewards since bonuses don't provide
components associated with them.
2014-04-12 16:16:23 +03:00
Ivan Savenko
cb5b5a05c1
Player can refuse single reward (e.g. Tree of Knowledge)
2014-04-12 14:47:20 +03:00
Ivan Savenko
a4e7987835
Fixed some missing elements, mostly messages
2014-04-12 14:35:48 +03:00
Ivan Savenko
ba5092d669
Some bugfixing, basic functionality of map objects seems to be working
2014-04-11 22:49:25 +03:00
Ivan Savenko
d14a16249d
Core functionality for new objects in now in place, not yet tested
...
- added selection of rewards
- moved "on grant" message to reward struct
- multiple minor fixes
2014-04-11 20:38:27 +03: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
Ivan Savenko
dab9fd7148
Heroes will be properly marked as visited on visiting
2014-04-07 20:32:15 +03:00
Ivan Savenko
8beea4ec6a
More work on configurable objects:
...
- maps can be started
- visiting will be registered properly
2014-04-07 14:56:59 +03:00
Ivan Savenko
ae056a0471
Merge remote-tracking branch 'upstream/develop' into mapObjects
2014-04-07 13:41:51 +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
