games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Code Issues Releases Activity
2,954 Commits 19 Branches 63 Tags 113 MiB
264ce77ec9
Commit Graph

1295 Commits

Author SHA1 Message Date
DjWarmonger
c5d9110176 Compile fix for last commit. 2012-12-01 07:17:55 +00:00
Ivan Savenko
2643762f08 Mac OS patch from stopiccot 2012-12-01 06:30:52 +00:00
DjWarmonger
7be00e97a0 Fixed #1124. Probably also other bugs related to two-hex creatures (or they were already resolved). 2012-11-30 14:06:22 +00:00
DjWarmonger
52242692f1 Fixed #1130. 
Moved isToReverse() function to battleCallback so that creature rotation will be handled by core mechanics and not only GUI.
 2012-11-29 15:02:55 +00:00
Ivan Savenko
89196c577e autotools compile fix 2012-11-28 09:16:59 +00:00
DjWarmonger
9d68b9d58d Compile fix. Keep StdInc consistent. 2012-11-21 09:13:33 +00:00
beegee1
53169abea7 - Foundation for starting a random map is done - Moved StdInc.h to header file in some /Map and /RMG compilation units(better syntax highlighting, should have no negative impact) 2012-11-20 17:53:45 +00:00
DjWarmonger
c54b983663 Some improvements for AI logging. 2012-11-15 10:40:40 +00:00
mateuszb
100dad889a * much better callback function declaration (previous version inspired me to write a new coding guideline) 2012-11-14 21:19:32 +00:00
DjWarmonger
13a5a820d0 - Fixed #1032 
- Fixed upgrades not working after recent changes. Now all upgrades will be handled by creature names.
 2012-11-14 15:26:33 +00:00
DjWarmonger
a7cea94247 - Hopefully fixed #1103 
- Fixed #1137
 2012-11-14 14:27:18 +00:00
beegee1
e08db9790b * Map size can be any integer value * Changed new_*; to new_*(); for zero-parameter c-tors (=code convention; stack allocated objects without parantheses as ever to avoid c++ most vexing parse) 2012-11-13 18:01:31 +00:00
DjWarmonger
f5ddc44827 - Compile fix - unique_ptr can't be serialized 
- Linking fix - now MapGenOptions have DLL-interface (but probably shouldn't be called directly from client anyway)
 2012-11-13 12:55:47 +00:00
Ivan Savenko
f7915d9e61 - removed creature-related code from ModHandler 
- new towns can be loaded as mods
 - removed separate DefInfos for towns\capitals
 - a bit simpler handling of adventure map def's
 2012-11-13 11:52:23 +00:00
beegee1
c336abcf4a * Added RMG tab to pregame(disabled by default, activate with: enableRMG=true in settings.json) * Fixed tab intendation * Renamed colors to more comprehensible names 2012-11-11 12:23:31 +00:00
Ivan Savenko
0d863c83d7 - removed autogenerated by autotools files 
- fixes for #386 using patches from Ixtreon
 2012-11-10 21:56:19 +00:00
DjWarmonger
d5aed7c0c7 Compile fix - why would lib headers be dependent on IDE? 2012-11-07 20:14:31 +00:00
beegee1
105083dd70 * Code convention updates * Default values for CMap types * Updated BinaryReader c-tor * Converted "bool" int types to bool in CMap classes * Removed map event operators in favor of member methods 2012-11-06 16:39:29 +00:00
Ivan Savenko
fc85e08a64 - clang and gcc 4.5 compatibility 
- autotools update
- debian build system fixes
 2012-11-03 19:31:16 +00:00
Michał W. Urbańczyk
9707e73eda MSVC compile fixes: 
* in projct file some headers were marked as compile objects
* pow(int,int) is ambiguous
* some missing includes
 2012-11-03 14:29:54 +00:00
beegee1
a878f5f79a * Separated map loading from the map object * Moved map classes to lib/Map * Renamed map.h/cpp to CMap.h/cpp * Profiling of map loading is now optional * Updated CMemoryStream 2012-11-03 13:30:47 +00:00
Ivan Savenko
2cd774fe42 - gcc 4.5 compatibility 2012-11-02 20:08:37 +00:00
beegee1
720deba838 * Added comments to map.h * Refactoring(renamed attributes, some steps towards coding guidelines, ..) 2012-10-26 17:51:05 +00:00
Ivan Savenko
8604234f8d - fixes for autotools build 2012-10-26 12:57:18 +00:00
beegee1
2a50d8d464 * Fixed battle crash (if they're double wide creatures) 2012-10-19 13:16:14 +00:00
Ivan Savenko
fcc66b7bb9 - fixed RPATH in cmake 
- minor fixes
 2012-10-08 15:21:59 +00:00
Ivan Savenko
db10f512d5 - game won't crash on missing dwellings (instead random one will generated) 
- added disabled code that can be used to fix buildings blit order
- minor fixes
 2012-10-07 14:58:48 +00:00
Ivan Savenko
da7a6234b1 - some tweaks towards new towns 
- it is possible for faction to have 0 available heroes
 2012-10-06 08:47:13 +00:00
Ivan Savenko
9f0441a0be - adventure map defs are now part of town config. Should be the last part 
- possibly fixed #1136
 2012-10-05 19:57:28 +00:00
Ivan Savenko
c071a03a8a - fix for #1135 
- merged wall_pos.json into town config
- removed tower_shooter field from creatures.json
 2012-10-05 18:03:49 +00:00
Ivan Savenko
306d64b0c4 - it is possible to read json file with vector 
- town configuration:
- - all town-related texts are now in TownHandler
- - alignments are now part of faction
- - removed CTown::bonus field
 2012-10-05 13:11:26 +00:00
Ivan Savenko
f113f9573d - CPack support. Works on my side, needs tweaks for Win 2012-10-05 12:38:17 +00:00
mateuszb
a8524a2f95 * missing change from previous commit 2012-10-03 18:13:07 +00:00
mateuszb
652ea4036e * artifact bonuses are read from config file now 
* removed two commented-out methods
 2012-10-03 18:11:19 +00:00
DjWarmonger
4bacd97497 Quests now handled by pointers again, this time without bugs. 
Fixed some issues with quests and AI.
 2012-10-03 14:49:29 +00:00
DjWarmonger
1cf99f7be1 - Improved exploration algorithm. AI will avoid dead-end barriers and thus explore much faster. 
- Fixed crash when there are no heroes available to recruit in the map. TODO: make AI handle it
- Fixed crash when Chain Lightning has not enough targets
- Fixed crash at Hill Fort (?)
- AI will buy Spellbook for its heroes
- AI will try to use Cartographer and Observatory when exploring
- AI will not visit Prison when heroes are at max
- Experiment: AI will try to capture Mines and Dwellings when there are no enemies around (part of CONQUER goal)
 2012-10-01 18:25:43 +00:00
Michał W. Urbańczyk
3e82b92fce Version set to 0.9, updated changelog. 2012-09-30 21:51:23 +00:00
Michał W. Urbańczyk
49c5f70551 Fixed #1112/#1114. 2012-09-30 11:33:19 +00:00
Ivan Savenko
07f9cb16c5 - spellbook fix (#1110) 
- possible fix for kingdom overview (#1109)
- tweaks for recruit window (part of #1113)
 2012-09-30 10:35:17 +00:00
Michał W. Urbańczyk
6934ec13e2 Post-release version bump. 
Minor correction for emptyAI VS project file.
 2012-09-29 21:10:39 +00:00
Michał W. Urbańczyk
dec3f9afd9 #1083 should be fixed. 
To be released as dev build 0.89d.
 2012-09-29 20:25:54 +00:00
mateuszb
657ed41088 * fixed bug in campaigns 
* turned off artifacts.json creation
* minor changes
 2012-09-29 17:36:48 +00:00
Ivan Savenko
2001aeac92 - typo fix 2012-09-29 17:16:07 +00:00
Ivan Savenko
b1557bc6c4 - fixes #1105 
- minor improvement to resolution selection dialog
- removed (hopefully) all cases where neutral faction uses id -1
 2012-09-29 15:10:56 +00:00
Michał W. Urbańczyk
f30ee8ff04 * fixed possible corruption of pack sent by server when player request is rejected 
* BattleAI will restore callback to its previous state, fixes freeze after battle #1104
* BattleAI won't lose turn when unable to correctly evaluate a spell
* VCAI will correctly recognize hero standing on town entrance
* War machines of defender will have correctly set side
* Faction 9 as neutral causes crashes, changing to -1 as used elsewhere in the code
 2012-09-29 14:44:06 +00:00
DjWarmonger
b6a20b6e99 Fixed teleporting animation (#818). Flying ability with subtype "1" will cause movement animation to skip (teleport). 2012-09-29 12:40:12 +00:00
Ivan Savenko
a602d7e9da - build system update 
- compile\warning fixes
 2012-09-29 12:02:46 +00:00
Michał W. Urbańczyk
f8a27a9fdb * Moved CConfigHandler from client to lib, CMake/Makefile need updating. I believe other projects besides client also need access to settings. (surprisingly there was a "server" category used only by client... and now VCAI.) 
* It is possible to set the battle ai that'll be used by neutrals by typing in VCMI console:
setBattleAI <AIName>
VCAI also respects that setting and uses given AI as its battle back-end.
 2012-09-29 10:59:43 +00:00
Ivan Savenko
74cd2e77fe - fixed (at least partially) #1100 2012-09-29 09:39:05 +00:00
Michał W. Urbańczyk
2ba0427432 * Fixed #1096 
* serializing icon index, otherwise creature portraits are gone after loading a game
* VCAI: fixed crash on attempting revisiting a boat (that is no longer present because it was boarded)
* Fixed strange crash with "neutral hero" (there should be no such thing... but somehow it appears, needs further investigation)
 2012-09-28 20:49:23 +00:00
Michał W. Urbańczyk
0750d46285 Fix #1095. 2012-09-28 19:11:09 +00:00
Michał W. Urbańczyk
8bb4abb75a * VCAI: fixed possible endless loop of realizing GATHERRESOURCE goal 
* an assertion failing when quest object cannot find its targeted monster ("crash early" policy), related to #1076
 2012-09-28 16:20:18 +00:00
DjWarmonger
0435d5a4f1 - Removed pointer usage for CQuest. may look rough, but works and fixes #1051. 
- Better autoSkip mode, now info windows are not displayed.
 2012-09-28 15:46:09 +00:00
Michał W. Urbańczyk
1fce4770fb Fixed crash when starting a game with new creatures on map using „Creature N” placeholders in armies. 2012-09-28 10:17:07 +00:00
DjWarmonger
ecda63683e Fixed Bonus parser crashing at unspecified value. Assigning empty objects is also not good solution. 2012-09-27 17:58:14 +00:00
mateuszb
af133ae758 * experimental support for bonus limiter/propagator loading from json (not turned on yet) 2012-09-27 16:48:46 +00:00
Ivan Savenko
1fdacc4085 - fixes #1086 
- removed outdated code from filesystem. Filesystem.json from 0.89b will no longer work.
 2012-09-27 13:23:33 +00:00
DjWarmonger
572cfa50e7 Bumping release version. 2012-09-27 05:45:38 +00:00
DjWarmonger
906fa04a60 Tweaks for creature bonuses. 2012-09-26 19:02:44 +00:00
mateuszb
8dca88c3c8 * start map in campaign button is properly disabled/enabled (I hope) 
* exported json for artifact bonuses; no limiters/propagators yet, so it's not used
* minor changes
 2012-09-26 18:10:29 +00:00
Ivan Savenko
15a7f43e11 - fixed #1075, #1080, #1081 
- fixed some warnings from cppcheck
 2012-09-26 13:13:39 +00:00
DjWarmonger
7759ed017e -Fixed abilities for new creatures not being displayed in creature window 
-Fixed crash with rank-range limiter used with stack experience disabled
 2012-09-26 05:13:47 +00:00
Michał W. Urbańczyk
ecd8947d8e Crashes on starting next campaign mission should be fixed. 2012-09-25 18:00:55 +00:00
mateuszb
f3f4a7633d * fixed 1085 
* fixed starting hero is granted in normal scenarios
* introduced TArtifactInstanceID
 2012-09-25 14:40:39 +00:00
DjWarmonger
8e78c86fe9 Parsing for stack experience and all other properties specified by creature format. Functionality untested due to other bugs in engine :( 2012-09-25 12:41:48 +00:00
mateuszb
f16a3a4527 * fixed bug 1084 2012-09-25 08:07:32 +00:00
mateuszb
7fe2692bf8 * support for campaign scenarios with no bonuses 2012-09-24 19:23:11 +00:00
mateuszb
59fcc15254 * last revision reverted, mysterious bug 2012-09-24 18:52:30 +00:00
mateuszb
55f1c47c16 * more TPlayerColor/TResource 2012-09-24 17:00:18 +00:00
mateuszb
18bd898cb1 * fixed bug when starting certain maps in campaigns 
* introduced TPlayerColor typedef
 2012-09-24 16:14:53 +00:00
Michał W. Urbańczyk
95b866c131 * Further work on Battle AI. Now it is able to cast a number of offensive spells. Battle callback exposes more spell-casting info. 
* Took down the one Boost.Assign usage offending VC11. I'm getting impatient I guess...
 2012-09-23 23:10:56 +00:00
mateuszb
6a81c8b1af * campaign against magic numbers 
* ArtifactID was misleading and wrongly used in one place -- renamed and fixed
* minor changes
 2012-09-23 18:01:04 +00:00
Ivan Savenko
3fcba4fb5c - fixed crash on start of some campaigns 
- allowed on map factions is now set instead of bit field
 2012-09-23 14:32:49 +00:00
mateuszb
9acfa0d136 * more or less working HERO campaign bonus 
* minor improvements
 2012-09-22 17:23:28 +00:00
mateuszb
82e21f8b6e * minor campaign related improvements 2012-09-22 15:16:45 +00:00
Ivan Savenko
8f936cd34d - added battleAI to CMake, compile fixes 
- icons config for towns and creatures
 2012-09-22 15:10:15 +00:00
DjWarmonger
e2bfd53c98 - Fixed some issues and crashes 
- Simplified projectile handling. New creatures can now shoot.
 2012-09-21 19:49:35 +00:00
mateuszb
8e3de98059 * restoring campaign features 
* minor improvements
 2012-09-21 17:59:54 +00:00
DjWarmonger
f38244bb5a Fixed adventure map defs for new creatures. 2012-09-21 08:08:18 +00:00
DjWarmonger
16adfa3aa7 - Fixed crash on creature window drawn for neutral faction 
- Fixed sound parsing. Check forum for updated mod.

It is now possible to attack & fight new creatures without crash.
 2012-09-21 07:22:23 +00:00
Ivan Savenko
99dcb73a72 - filesystem.json files for wog and vcmi data 
- merged puzzle map into town configuration (todo: sieges, adventure map, icons)
 2012-09-20 21:28:18 +00:00
DjWarmonger
656cf5ab6a - New creatures now work in game (more or less) 
- Parsing of def info for new creatures
- Fixed crash caused by neutral faction vs native terrain check
 2012-09-20 18:41:16 +00:00
Michał W. Urbańczyk
62e63d45b1 Work in progress on BattleAI. Related changes: 
* battle AIs receive ptr to CBattleCallback (not sure why it was CPlayerBattleCallback, likely mistake)
* reworked some battle callback methods to be more generic and able to handle some hypothetic scenarios
* for testing purposes in duel mode the first AI will be taken fro mconfig and the second will remain stupid ai
* minor changes
 2012-09-20 16:55:21 +00:00
Michał W. Urbańczyk
871f680ccc Fixed crash from unitialzied ptr. 2012-09-20 16:25:31 +00:00
Ivan Savenko
2c88845b9e - compile fix 2012-09-20 16:14:23 +00:00
mateuszb
4010978a91 * a bit of work on campaigns 2012-09-19 17:41:22 +00:00
DjWarmonger
3f95ba8ac8 Parsing & loading for new creatures. A lot of tweaks & improvements. Still needs some work. 2012-09-19 16:10:45 +00:00
mateuszb
fb2f19b4c5 * some work on campaigns 2012-09-18 17:47:52 +00:00
mateuszb
aa04a5bcd0 * removed unnecessary include in .h -- they should be avoided 
* fixed bug 1074
* fixed starting new custom campaign
* fixed building of ERM project
 2012-09-18 15:06:29 +00:00
DjWarmonger
20b54a39b6 Some tweaks for mod loading. Still doesn't work. 2012-09-18 14:22:15 +00:00
DjWarmonger
abd4a96bf1 Very simple loading and adding new creatures. Needs testing. 2012-09-18 07:36:07 +00:00
DjWarmonger
9438cfc7e2 Moved creature sounds to CCreature. Sound IDs are now stored as strings. 
Creature parser is complete (untested).
 2012-09-17 19:00:26 +00:00
Ivan Savenko
061ed69c63 - fixed seer hut issue (#1073) 
- separate archive types in filesystem for lod\vid\snd
 2012-09-17 17:25:54 +00:00
mateuszb
2d6f17f3fa * one of campaign-related bugs fixed 2012-09-16 18:43:55 +00:00
DjWarmonger
554a98dbd7 Quests will now be handled as object member instead of inheritance. Enabled quest objects for AI. 2012-09-16 13:34:01 +00:00
alexvins
369f0ae9c6 [PLATFORM] MinGW support added 
* disabled features unsupported by MinGW
* fixed issues with DLL_LINKAGE
! BOOST_THREAD_VERSION in now 3 workaround for existing code added, consider refactoring.
* some small tweaks ("-fpedantic" warnings)
 2012-09-15 19:16:16 +00:00
Michał W. Urbańczyk
74f9c19a7c Implemented spell countering. 2012-09-13 23:41:03 +00:00
Michał W. Urbańczyk
d961ec0507 * Fixed crash on casting spells. 
* version bump
 2012-09-09 23:51:20 +00:00
Ivan Savenko
a138db7c9e - removed lib headers from PCH 
- fixed #1062
- correct terrain penalty check
 2012-09-06 10:39:48 +00:00
Ivan Savenko
0ca9f64573 Next part of town configuration: 
- town screen is mostly implemented, has some minor issues
- factions are now separate from towns, neutrals have faction with id=9
- more constants to GameConstants: town-specific buildings, strings for terrains and resources
- replaced most access to builtBuildings with isBuilt() method
- replaced id's with enums for town subtype and buildings id's
 2012-09-05 12:49:23 +00:00