games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-02 09:02:03 +02:00
Code Issues Releases Activity
2,981 Commits 21 Branches 61 Tags 104 MiB
f6acc8c77b
Commit Graph

1387 Commits

Author SHA1 Message Date
Ivan Savenko
8eba824ada - updated icons + psd file 
- better log messages if server failed to open port
 - 1148 should be fixed. Cleanup in CGameHandler::moveHero()
 - compile fixes
 2012-11-15 21:29:22 +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
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
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
DjWarmonger
347bfde310 Added patch for #1144. Thanks cirdan! 2012-10-27 16:59:24 +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
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
alexvins
b3f317c1ed fix to prev. commit 2012-10-07 10:38:35 +00:00
alexvins
ff3da291a1 [refactor] reduce some code duplication. no functional changes 2012-10-06 20:35:04 +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
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
Ivan Savenko
3542bfdc63 - fixed #1128 #1127 #1121 #1119 
- instructions in linux readme use cmake instead of autotools
- update autoconf files
 2012-10-02 14:22:58 +00:00
Ivan Savenko
42cbbc8682 - linux version update 2012-10-01 07:05:12 +00:00
mateuszb
099e6bf776 * implemented #1111 2012-09-30 12:19:14 +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
Ivan Savenko
77710eaffb - fix for #1106 and #1107 2012-09-29 19:18:35 +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
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
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
b0f669a764 - moved Sprites and Data directory to vcmi "mod' 
- some bugfixing:
- - teleporting animation fixed #1087, partially - #818
- - gui adjustments for #1093 and #1090
 2012-09-29 08:35:31 +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
7e6128b653 Assurance that #1016 won't happen again. 2012-09-28 19:18:08 +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
6c017a0fdf Fixed #1088. 2012-09-28 09:11:18 +00:00
mateuszb
0b15a634f9 * bug 1082 fixed 2012-09-27 17:16:41 +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
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
4ceb6cd272 - better fix for button borders 2012-09-26 13:50:15 +00:00
Ivan Savenko
15a7f43e11 - fixed #1075, #1080, #1081 
- fixed some warnings from cppcheck
 2012-09-26 13:13:39 +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
7fe2692bf8 * support for campaign scenarios with no bonuses 2012-09-24 19:23:11 +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
00c079f7dc * improvements for HERO campaign bonus 2012-09-23 11:26:26 +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
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
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
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
mateuszb
fb2f19b4c5 * some work on campaigns 2012-09-18 17:47:52 +00:00
mateuszb
2cf4905d9c * hopefully fixed 790 2012-09-18 15:17:32 +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
alexvins
2b2b02cccc [static analysis] [WIP] fix few possible bugs 
CBattleAnimations.cpp,CBitmapHandler.cpp,CGameHandler.cpp Possible null pointer dereference
 2012-09-16 14:36:31 +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
96a92d0f45 * fixed remaining part of #1071 — the screen surface has always to be created in the main thread 
* hold events in the queue by value (less ptr jugglery)
 2012-09-11 14:25:19 +00:00
Michał W. Urbańczyk
d935e87dd8 #1071 should be fixed. 2012-09-09 23:57:22 +00:00
Michał W. Urbańczyk
529394a4e7 Development build 0.89b 
* Updated changelog
* Some logging I did for #1066
 2012-09-07 22:43:41 +00:00
Ivan Savenko
a138db7c9e - removed lib headers from PCH 
- fixed #1062
- correct terrain penalty check
 2012-09-06 10:39:48 +00:00
Michał W. Urbańczyk
ea4841045f Fixed #1064. 2012-09-06 10:26:18 +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
Ivan Savenko
44cc848edc first part of town configuration: 
- moved almost all loading to TownHandler
- CBuildings and CStructures are now part of CTown
- merged hall.json into buildings.json

Should not cause any crashes or glitches
 2012-09-02 10:33:41 +00:00
Michał W. Urbańczyk
5a157290d9 Fixed crash occurring after casting Armageddon and killing all stacks. 
Removed some commented-out code.
 2012-08-31 16:33:30 +00:00
Michał W. Urbańczyk
6530e7a1e1 * servers will not allow using out-of-range slots ( #1061 ) 
* server won't crash on some scenarios when they're used
* fixed some minor discrepancies with creature placement in creature banks
 2012-08-30 16:01:19 +00:00
DjWarmonger
31f82cade0 - Removed integer parameters from CCreature, all stats are now handled by Bonus System Only 
- Parsing for creature format http://wiki.vcmi.eu/index.php?title=Creature_Format
Needs rearrangement of some info to work
 2012-08-30 14:57:24 +00:00
Ivan Savenko
c7789992c3 - fix for hero flags along with battlehero cleanup 
- removed unused code
 2012-08-29 14:55:31 +00:00
Michał W. Urbańczyk
d0e2f25cfe * No explosion when catapult fails to damage the wall 
* Missing abilities for Azure Dragon (tons of others are still missing...)
 2012-08-29 13:44:39 +00:00
Ivan Savenko
8fac276922 - a bit nicer stack queue. Check forum for graphics. 
- warning fix
 2012-08-28 16:28:21 +00:00
Michał W. Urbańczyk
0b85cfaf78 Fix for #1058. 2012-08-28 15:38:00 +00:00
Ivan Savenko
4d4f72292e - fixed crash on hovering indestructible walls 
- fix for music player (no music after end of battle)
 2012-08-27 20:45:58 +00:00
Michał W. Urbańczyk
a14f381d48 Fixed #1055 - hang when creature performed automatic (not controleld by player) action. 
Fixed possible crash on arrow turret turn.
 2012-08-27 12:34:43 +00:00
Michał W. Urbańczyk
7c09f73402 * INFINITE_DIST is now enum, it should cause least trouble that way. Uh, it's so hard to fight magic values these days. 
* Fixed crashes in battles after loading game
* Fixed crash in battle AI, when stack is blocked and stands next to an enemy
* Fixes problem when server's moveStack is called with dest==position
* Above should cover #1053.
 2012-08-26 19:13:57 +00:00
Michał W. Urbańczyk
d390113c23 * New files for lib: CBattleCallback.cpp and CBattleCallback.h 
* Updated MSVC project files
* Filesystem: My version of .SND archive does not have \0 after WAV extension. Fixed (though hardcoded 3-char extension length).
* New bonus types: BLOCK_MAGIC_ABOVE for blocking casting spells above given level and BLOCK_ALL_MAGIC for blocking all magic.
* Heavy rewrite of battle callbacks. Fixed some minor bugs. Code reusage between lib/client/server (removed proxy calls). Better access control and support for various perspectives.
* Fixed #1031
* Fixed Orb of Inhibition and Recanter's Cloak (they were incorrectly implemented). Fixed #97.
* Fleeing hero won't lose artifacts. Spellbook won't be captured. Fixed #980.
* Fixed crash when attacking stack dies before counterattack (ie. because of Fire Shield)
* Server does some basic checks if action requests during battle are valid
* Minor stuff.
 2012-08-26 09:07:48 +00:00
DjWarmonger
39d433c1c7 Moved game Modules to config file. 2012-08-24 09:37:52 +00:00
Ivan Savenko
e79ac5f1d7 - removed deprecated ffmpeg functions. Fixes #779 
- removed hardcoded video name constants
 2012-08-21 17:37:06 +00:00
DjWarmonger
9e0c9b4f49 Fixed #1042. Tweaks for Commander bonuses. 2012-08-20 16:10:50 +00:00
Ivan Savenko
deb22b3674 - (linux) use empty video player if av_register_protocol function was not found 2012-08-18 10:29:54 +00:00
DjWarmonger
037d4811a1 Fixed #1047 2012-08-14 06:31:14 +00:00
Ivan Savenko
eec4d3579d - fixed crash on missing videos 
- fixed savegames name selection
 2012-08-11 11:34:49 +00:00
DjWarmonger
289b7b68d9 Mod Handler class. It is connected with engine, but doesn't do anything yet. 2012-08-10 13:07:53 +00:00
Ivan Savenko
d72c44e4c3 - fixed modifiers keys behaviour in TextInput 
- erm compilation is optional in cmake (too memory-consuming for old systems)
-  minor fixes
 2012-08-10 08:49:18 +00:00
DjWarmonger
d3d24d0737 Compile fix for windows. 2012-08-09 13:52:40 +00:00
Ivan Savenko
7e778045b8 - removed no longer used CSndHandler. Transition to new fs is finished 
- moved TownHandler::requirements to CBuilding class
 2012-08-09 10:32:50 +00:00
Michał W. Urbańczyk
08bcfd1285 * windows video player uses the new FS 
* don't crash on missing sounds
 2012-08-09 07:40:47 +00:00
Ivan Savenko
94cfc99d7b - fixes #1044 
- fixes to linux video player
 2012-08-08 20:58:06 +00:00
Ivan Savenko
127600311f - linux video player uses new FS 2012-08-08 12:17:25 +00:00
Ivan Savenko
cab8955d8f - sound player uses new FS 2012-08-08 12:03:32 +00:00
Michał W. Urbańczyk
cd63c177e2 * std::unordered_map implementation in MSVC 10 has terribly slow destructor. Since bug is fixed only in VC11, I replaced it with boost::unordered_map. 
* fixed crash with invalid .lod archive (some H3 installations have fake 1 byte .lod "archives"
* fixed crash when parsing invalid map file
* minor random optimizations (rv-refs, etc)
 2012-08-08 08:25:27 +00:00
Ivan Savenko
9cbc1f1058 - merged basicCreatures and upgradedCreatures into single array 
- missing fix for savegames
 2012-08-07 21:46:24 +00:00