1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-09 13:14:02 +02:00

78 Commits

Author SHA1 Message Date
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
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
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
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
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
Michał W. Urbańczyk
7e6128b653 Assurance that #1016 won't happen again. 2012-09-28 19:18:08 +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
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
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
mateuszb
2cf4905d9c * hopefully fixed 790 2012-09-18 15:17:32 +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
Ivan Savenko
c7789992c3 - fix for hero flags along with battlehero cleanup
- removed unused code
2012-08-29 14:55:31 +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
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
037d4811a1 Fixed #1047 2012-08-14 06:31:14 +00:00
Ivan Savenko
708ad6ac7f - music player uses URI's instead of enum from music base
- #1045 and #1046 should be fixed
- moved pregame backgrounds to config/mainmenu
- animation can be overriden with .json multiple times
2012-08-06 07:34:37 +00:00
DjWarmonger
385be09248 Foxed #943 2012-08-06 06:01:02 +00:00
Ivan Savenko
e67f8afdd9 - removed multiple unused files
- config folder with all json files is used via new FS API
- fixed campaigns loading. Replaced "detect h3m starts" heuristics with CCompessedStream::getNextBlock()
2012-08-02 11:03:26 +00:00
DjWarmonger
a15ad329b4 Fixed #1015. 2012-06-20 13:03:05 +00:00
Michał W. Urbańczyk
d0816a7924 Fixed crash when artifact casts spell ( #991 ) 2012-06-10 12:01:56 +00:00
Michał W. Urbańczyk
f378e5be31 MSVC compile fix #997.
CClickableHex apparently can't be held by value in vector anymore.
2012-06-09 16:45:45 +00:00
Ivan Savenko
d60f2d57a0 - first part of CIntObject API clean-up.
- - mostly remove usage of (de)activateSomething functions
- - CIntObject's can be safely deleted in active state or without removing from parent first
- - Added CWindowObject to use as base of all windows (will be required for such features as shadows)

Report any crashes or glitches - it should not cause any issues apart from more console output. 

TODO:
- remove redundant (de)activate and show(All) calls
- decrease usage of blitAtLoc\printAtLoc methods
- switch all windows to new base
2012-06-02 15:16:54 +00:00
Michał W. Urbańczyk
dc4d30df0e Ench0's patch from #948. 2012-06-01 17:23:26 +00:00
Ivan Savenko
61ccabde53 - vcmi can be compiled with clang-3.1 2012-05-27 19:06:35 +00:00
Michał W. Urbańczyk
77e7a25ed7 Fixed #970.
Fixed issue where cursed ground obstacles were appearing on holy ground (and vice versa).
Fixed battle interface blocking itself up after clicking on owned stack to open creature window.
2012-05-26 11:01:31 +00:00
Ivan Savenko
49495c9caf - possibly fixed #966 and #958
- fixed crash on shutdown 
- fixed compile issue #973
2012-05-25 11:49:56 +00:00
DjWarmonger
18e53a1717 - Fixed a scenario when AI could visit the town without picking troops, resulting in a lock
- Added ench0's patch for creature range tooltip (#948)
2012-05-22 10:15:16 +00:00
DjWarmonger
d34cf90bf7 Support for Chain Lightning.
Fixed getClosestTile function.
2012-05-20 11:40:23 +00:00
Ivan Savenko
6f6cd6814e - fixed wrong battlefield (#961)
- minor tweaks
2012-05-19 11:47:26 +00:00
Michał W. Urbańczyk
d168f3eac2 * Implemented Moat functionality during siege (stops movement and deals dmg)
* Mostly implemented battle spells:
 - Fire Wall
 - Force Field
 - Land Mine
 - Quicksands
2012-05-18 20:50:16 +00:00
Ivan Savenko
99439e1ed6 - fixed creature sounds (#802, #113)
- added missing sounds for commanders and sharpshooters (#524)
- minor fixes
2012-05-15 16:29:40 +00:00
DjWarmonger
9cbbfcf258 - Fixed all bugs with battle interface. It's now more consistent.
- Minor cleaning.
2012-05-07 16:04:43 +00:00
Michał W. Urbańczyk
5449546447 Advanced work on support for Quicksand and Land Mine spells. 2012-05-04 21:16:39 +00:00
DjWarmonger
5d311fb3ed - Hopefully fixed possibleActions for every case
- better algorithm for looting artifacts, yet buggy
2012-05-01 13:56:32 +00:00
DjWarmonger
2fbc57e140 1. Better way to disable stack / cursor glitches
2. An attempt to handle looting artifacts after battle
2012-05-01 08:52:22 +00:00
DjWarmonger
25bdcd3cab - Fixed wrong creature teleported
- Support for Sacrifice
2012-04-28 19:40:27 +00:00
DjWarmonger
f5e47474c5 - Fixed random crashes after creature spellcasting
- Added dummy projectiles to Commanders
2012-04-28 15:38:34 +00:00
DjWarmonger
192de453af - Fixed Remove Obstacle spell
- Fixed freeze at Chain Lightning
2012-04-28 15:18:21 +00:00
DjWarmonger
d6873d7570 - No battle actions will be available during tactics phase
- Fixed moving stacks during tactics
- Fixed Genie spell targeting
- Fixed AI getting stuck at Tree of Knowledge when no resources
2012-04-28 13:01:39 +00:00
Michał W. Urbańczyk
b0371597cd A better tweak. 2012-04-24 19:11:23 +00:00
Michał W. Urbańczyk
482051eb17 Tweaks for obstacles. 2012-04-24 05:16:04 +00:00
Michał W. Urbańczyk
7dc0d6878e Rewritten battle obstacles. New file for lib: CObstacleInstance.cpp.
Now obstacles should be placed exactly like they were in OH3. 
All problems with displaying obstacles in battlefield should be gone. They should be now matched to the single pixel. 
If there are still some discrepancies, please report them.
2012-04-23 19:56:37 +00:00
DjWarmonger
81e74f8c33 - Config settings & parsing for Commanders.
- Fix for Regeneration icon
2012-04-22 13:28:46 +00:00
DjWarmonger
cd1a9414ac - Restored Genie random spell
- Fixed crashes in many strange creature-spellcasting scenarios, including stack with multiple cast abilities and Enchanter with non-stadard spell
2012-04-18 15:57:49 +00:00
DjWarmonger
05311dd30c - Fixed and simplified Teleport casting
- Stack artifacts will now not be wearable by hero (by default)
- Fixed crash involving clone
2012-04-18 13:24:18 +00:00
DjWarmonger
f9dff013eb Fixes for battle interface, including #932. Basic funtionality is restored. 2012-04-18 09:01:08 +00:00
DjWarmonger
f720038ca5 - Battle interface fixes. It's possible to move stacks & attack
- Creature window allows to pass stack artifact to hero
- Fixes for Mana Drain, including #916
2012-04-17 14:50:23 +00:00