1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Commit Graph

44 Commits

Author SHA1 Message Date
Michał W. Urbańczyk
898ad292ea A few fixes for artifacts. 2011-01-18 18:56:14 +00:00
Michał W. Urbańczyk
f52d4f7cd6 Merged changes from trunk. 2011-01-15 02:35:46 +00:00
Ivan Savenko
b8f65697ca - fixes for several bugs: #639 #656 #135 #646 #638 #94 #629
- re-enabled console on Linux to allow disabling AI
2011-01-01 20:26:39 +00:00
Michał W. Urbańczyk
c9189119b9 Little more work on artifacts. 2010-12-29 21:04:22 +00:00
mateuszb
4929cf9782 * enum for secondary skills
* THex for battle positions
* towards removal of battleGetStackByID

TODO:
investigate the necessity of putting implementation of BattleAction CGlobalAI::activeStack( const CStack * stack ) in CGeniusAI.cpp
2010-12-23 20:18:10 +00:00
mateuszb
49083c4e5a * ConstTransitive CGI more or less done
* hch contents distributed to more appropriate folders
2010-12-20 21:22:53 +00:00
mateuszb
23c501b79e some changes 2010-12-17 18:47:07 +00:00
Michał W. Urbańczyk
b15ac97c62 Half done refactoring of CHeroWindow. 2010-12-16 22:32:53 +00:00
mateuszb
ad48681d91 * cleanup 2010-12-08 20:17:05 +00:00
Michał W. Urbańczyk
bce805dacc Restored Warmonger's changes to artifacts system.
They will be subject of my further work, along with next part of bonus system.
2010-11-10 00:06:25 +00:00
Michał W. Urbańczyk
aa131bbf15 Reverted r1811, r1812, r1813 2010-10-24 11:23:43 +00:00
DjWarmonger
0f314e106c Artifacts will now be handled by pointers.
Assembling & disassembling combos may be buggy, but it's already been before.
2010-10-03 07:07:53 +00:00
Ivan Savenko
9e8d0651f6 - fix for #32 (b)
- fix for some warnings
2010-08-29 23:12:34 +00:00
Ivan Savenko
4d171bd53c -rewrote GarrisonInt with use of object capturing
- BitmapHandler can now load images from any format supported by SDL_Image
note: file can have any possible format but extension should be .bmp or .pcx
- fixed some warnings
2010-08-27 16:20:35 +00:00
mateuszb
9c60629bcf * minor changes 2010-08-17 14:58:13 +00:00
mateuszb
9445e5b184 * small refactoring
Please don't touch CGI->state directly in client code - use callbacks instead. I'd like to make some mechanics-critical handlers in CGI const - a lot of work, certain changes have been done here.
2010-08-16 09:54:09 +00:00
Ivan Savenko
fd45cd0a6d - fix for #283
- ally support: adventure map
2010-08-13 10:46:08 +00:00
Ivan Savenko
520d40cc59 - uploaded config/settings.txt from 0.82 (fix for #605)
- fixes for #604 and #364
- ally support is mostly done:
-- exchange between heroes
-- exchange between hero\town
-- finishing the game
2010-08-12 15:54:25 +00:00
Ivan Savenko
215dc95acb - implemented Hill Fort (minor issue - you can do ANY upgrades, including archers to sharpshooters without Gelu and so on)
- fixed some g++ errors in macroses
- minor tweaks
2010-07-22 00:32:45 +00:00
Michał W. Urbańczyk
2f996f14ba Exchanging artifacts between slots should work again nicely. Minor fixes. 2010-07-21 19:50:15 +00:00
Michał W. Urbańczyk
88e1636250 Fixed #15, #224, #370, #516
Minor changes.
2010-07-13 05:25:40 +00:00
Ivan Savenko
bb7615309f - Implemented Portal of Summoning (Dungeon) 2010-07-10 16:50:23 +00:00
Michał W. Urbańczyk
d0ff61807d Obtaining town instance pointer via cb. Plz, don't access gamestate directly from player interface! Everything has to go via callback.
Commented out giving starting artifact - new artifact randomization make it crashing. Please fix it.

New control - CTextBox - for multi-line text with optional slider. Used it for map description and info windows. Related changes. Fixes #22 and #96.
2010-07-06 02:10:26 +00:00
Michał W. Urbańczyk
ec6342d9a7 Serializer will now smartly send over network CArtifact* and CHero*. Unified handling of items stored in vector.
Started making support for Black Market / Artifact merchant.
2010-06-26 16:02:10 +00:00
Michał W. Urbańczyk
a14606f32d New bonus system. Unified HeroBonus and StackFeature. Still early version, will need improvements and development.
If you encounter any new crashes / bugs / unacceptable slowdowns, please PM me.
2010-05-02 18:20:26 +00:00
Ivan Savenko
32b6b9cb17 - Full support for scholar skill
- Some code for #366
- Fixed R-click issue from rev 1516
2010-02-28 10:01:36 +00:00
Michał W. Urbańczyk
e6f31b7500 Compilation fixes for VC10.
Changes towards hot-seat support.
2010-02-20 13:24:38 +00:00
mateuszb
d53e4d7c1a * (hopefully) fixed battle interface in hotseat mode
* fixed a bug when defending player (human) attacks in battle with two-hex unit from top-right or bottom-right direction
2010-02-19 16:02:34 +00:00
Michał W. Urbańczyk
da87d25d21 Started making hot-seat GUI. Accompanying changes to rest of GUI. 2010-02-15 06:54:57 +00:00
Ivan Savenko
5eef9cde44 - fixed 355, 356, 360
- fixed bug in map handling (random creatures in random town\hero)
2010-02-13 15:56:34 +00:00
mateuszb
4d9d54735f * campaigns, part 1
* minor changes
2010-02-08 14:38:06 +00:00
Ivan Savenko
fa735b6a67 - partial implementation of scholar skill (spell exchange works, but no message)
- some fixes
2010-02-06 13:27:58 +00:00
Ivan Savenko
3aefb896fe - Created config file for true type fonts (disabled by default)
- Implemented buildings with bonuses for defending hero (glyphs of fear, fountain of fortune, some grails)
- Minor fixes
2010-02-04 15:50:59 +00:00
DjWarmonger
ce00ceaf08 Next part of Seer Hut code, including large number of Components, packs and help functions.
Mapa now contains separate vector of monsters to avoid linear search trough all objects.
2010-02-02 17:05:03 +00:00
Ivan Savenko
3dbeaa5ef8 - Moved most of text output to original fonts
- Temporary disabled ttf output
2010-02-02 16:24:53 +00:00
Michał W. Urbańczyk
94fa59cf45 * Compilation fix (missing includes, do not remove)
* New settings.txt file (needed for kingdom overview to work)
* Last remainings of h3m format: hero placeholders parsing
* Minor improvements
2010-02-01 17:07:46 +00:00
mateuszb
9c404c5c14 * compilation fix 2010-02-01 13:52:17 +00:00
Ivan Savenko
ddd0786739 forgot to fix line endings and one file 2010-01-31 23:30:47 +00:00
mateuszb
6d6fe748d0 * compilation fix 2010-01-31 12:10:13 +00:00
Ivan Savenko
6f0f6564d7 - partial implementation of kingdom overview:
-- moved some kingdom overview values to config
-- small fix to garrison window
-- small fix to button class
2010-01-30 19:08:26 +00:00
Ivan Savenko
6fbcdf63eb Small compile issues in previous revision 2010-01-28 16:28:55 +00:00
Ivan Savenko
c6408f5b4b - Full support for Mystic Pond (Rampart)
- Fixed converHordes issue
- Partial implementation of kingdom overview window
2010-01-28 16:15:46 +00:00
DjWarmonger
88e42828da Added missing (?) includes from last revision. 2010-01-26 11:56:29 +00:00
Ivan Savenko
0f22ba0c0f - First part of kingdom overview window (not a 100% stable)
- Implemented town buildings: dwarven treasury, ballista yard, partially - mystic pond
2010-01-25 21:25:14 +00:00