1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Commit Graph

186 Commits

Author SHA1 Message Date
d9064f4f7d Implemented #714 — restart functionality, including quick restart tweak (bound to CTRL+R). 2012-04-08 03:06:27 +00:00
3bf76cb719 Fixed #216 and #907.
* CTRL+T will open marketplace window
* T in adventure map will switch to next town
* T in castle window will open a tavern window (if available)
* G will open thieves guild window if player owns at least one town with tavern
* various minor changes
2012-04-08 01:15:18 +00:00
7317e803db Locking pim mutex in client pack handling method, instead of dozens playerint call-ins. GUI won't try updating in between gamestate change and call-ins about it. Should fix #912.
Minor changes.
2012-04-06 15:02:15 +00:00
9ce3c78387 - fix for compilation with gcc-4.5
- fix for #881
2012-02-28 11:26:08 +00:00
e18419f5d2 * adventure map GUI should be properly blocked during AI turn
* battle window will wait till all dialogs are closed
* fixed problems with AI working after the game ended
* fixed problems with overzealous redrawing of infobar
2012-02-22 13:41:27 +00:00
e4dc00abac * new file lib/UnlockGuard.h — unlock_guard is for unlocking a mutex for the scope time (RAII)
* all lock/unlock and unlock/lock pairs are done by RAII guards now
* fixed two possible crashes at the end of battle when last stack was killed by spell. That should fix #749 and #752.
* fixed a very nasty race condition, eliminating possible deadlock at the start of battle when human hero has tactics
* fixed #422
2012-02-19 21:03:43 +00:00
7a66c1bf2b * added an initial version of adventure AI: VCAI, more details here: http://forum.vcmi.eu/viewtopic.php?p=6508#6508
* VCAI set as default adventure AI
* several adjustments in GUI (hourglass during AI turn), minor changes
2012-02-14 18:04:45 +00:00
86e7d96b39 - setting system: replaced settings.txt + sysopt.bin with json-based system (defaultSetting.json + settings.json)
- some work on system settings window
- new menu for selecting resolution (reused town portal graphics), can be opened from system settings
2012-01-12 15:23:00 +00:00
156aa6e4d9 * Updated class - file - handling
* Renamed color constants
* Renamed class AdventureMapButton to CAdventureMapButton
* Moved basic controls like CTextBox from GuiClasses to CIntObjectClasses
* Moved new creature window from GuiClasses to CCreatureWindow
2011-12-22 13:05:19 +00:00
2f5d6f2684 * CHexField renamed to CBattleHex
* CHexFieldControl renamed to CClickableHex
* CCreatureAnimation.cpp/.h moved to BattleInterface/CCreatureAnimation.cpp/.h
* Removed unused project files
* Added VCMI_client filters file for VS 2010
* Gathered common parts of StdInc.h in Global.h
* Boost.Spirit has been included in PCH for ERM project
* StopWatch renamed to CStopWatch
* GuiBase.cpp split up in UIFramework/...
2011-12-17 18:59:59 +00:00
7f04ed990b Major refactoring. First part: BattleInterface
Introduction of pre compiled headers,...
2011-12-13 21:23:17 +00:00
2eca314e92 - fixed #841 and #840
- fixed several crashes
2011-11-27 18:55:11 +00:00
29f42aa873 - fixed #834
- fixed crash at campaigns loading
- minor fixes
2011-11-25 19:41:23 +00:00
a62634cf94 Add support for SDL 1.3 in compatibility mode. 2011-11-17 00:24:27 +00:00
583aca8912 Move hero/Next hero buttons being blocked when they should (#204) 2011-10-04 19:43:49 +00:00
01566fcde1 Patch from Yupsi. Hero sleep/wake-up. Fixes #162 and #601. 2011-09-24 16:46:23 +00:00
6ef44bde5a Work on pathfinder: torn the code out from CGameState into a separate class. It can use Subterranean Gates and Boats. Removed code for handling Fly spell effect. It didn't work as supposed anyway. 2011-09-19 20:50:25 +00:00
5b836f428a Partial fix for 37. Full fix for 27, 64, 600. Fix for bug where code tried to reload non existent file. 2011-09-04 00:04:48 +00:00
18444fc72f Rewritten code handling growth to eliminate duplication and make it conformant to OH3 mechanics. Proper support for Statue of Legion.
Displaying shield over minimap during AI turn.
2011-08-26 20:32:05 +00:00
06ca4a7c76 Convert minimap.txt to a json file. 2011-08-26 00:29:37 +00:00
7eb82278d9 - minor fixes to JSON
- music will resume correctly after battles
2011-08-20 11:27:09 +00:00
8054c85091 - some work on sound and music players:
-- Adventure map music will update with hero movement
-- implemented battle intro sounds
-- battle music tracks will  be selected randomly each time
- fixed #781
2011-08-19 19:50:24 +00:00
583f37bf1f * Playing terrain music
* Fixed crash on l-clicking advmap during AI turn
2011-08-17 21:48:12 +00:00
aca118b613 Fixed creature bonus parser. Fixed several uninitialized variables. Updated data build script to v0.85. 2011-06-03 03:23:50 +00:00
2d61fab7e9 * Probably fixed #655.
* Fixed #736, #737.
* Fixed crash on loss/victory.
* Fixed crash on loading some AB maps.
* Fixed crash on loading map where victory/loss condition objective hero was placed inside the town.
* Fixed crash on loading map when neutral Dungeon has built Portal of Summoning.
* Mutex protecting GS will be used to prevent changes in GS when GUI might read it.
* Little more securities around moving hero and ending turn, still needed more.
2011-05-29 23:49:25 +00:00
df062614d7 Fixed #260, improvement for #250. 2011-05-25 22:44:02 +00:00
b97988477e Optimization for terrain path. 2011-05-21 08:44:02 +00:00
2845123a0a A patch from zjarek ( #727 ) — refactoring of CTerrainRect::showPath. 2011-05-21 01:10:41 +00:00
617e1f962e New files for lib:
* lib/ERMScriptModule.cpp
* lib/ERMScriptModule.h
* lib/CObstacleInstance.h

More jugglery with callbacks. Moving stuff from CGameState to CGameInfoCallback. Work on unified game events interface for player (AI or GUI) and script module. Directing events to ERM interpretetr, first attempts of calling some triggers. Crashy, if there any scripts.
Some other changes, including fighting amount of includes in includes and tracking of hero visits (need further work).
2011-05-09 22:20:47 +00:00
b4144dc616 Callback jugglery, part 1.
Fixed #252.
2011-05-03 03:14:18 +00:00
61af4c745e - recursive directory parser for LodHandler - for creature abilities and new main menu images
- fixed screen updating on closing window
- minor fixes
2011-04-23 10:27:44 +00:00
0f605256e9 - added new files to build system
- minor gcc fixes
- updated castle interface code, added missing parts including #380
- buildings enum in global.h
2011-04-07 17:54:08 +00:00
95efcc7cb5 Fixed #305, #707, #708. 2011-03-19 00:06:54 +00:00
0482195489 * bug 652 fixed 2011-02-24 13:14:52 +00:00
5e0b0e49b2 * bug 392 fixed 2011-02-23 18:21:51 +00:00
4c9edd3f06 Many fixes around bonus system. Some basic propagation mechanism (not clever but works). 2011-02-21 04:13:00 +00:00
450ae1772c - Buttons optimization - less memory and CPU usage
- gcc compilation fixes
2011-02-20 09:24:53 +00:00
2ff07fa66a - Next part of animation system:
-- Reduced memory usage for images with margins
-- Implemented RLE compression
- Linux-related changes:
-- build system updated to include changed paths
-- new dependency: boost-program-options
-- configure option --disable-debug will produce optimized build

- Several gcc compile fixes
- Optimized CPU usage on town screens
- Removed several includes from headers
- Possible fix for #496
2011-02-06 17:26:27 +00:00
401b364ad7 Partially functional artifact screen.
[TBD compound artifacts, backpack arranging, "live" modifying values, many details]
2011-01-06 20:00:19 +00:00
49083c4e5a * ConstTransitive CGI more or less done
* hch contents distributed to more appropriate folders
2010-12-20 21:22:53 +00:00
b15deaa203 * more constTransitivePointers in GameInfo, separated client GUI classes from it, moved def handlers from CGDefInfo 2010-12-19 14:39:56 +00:00
b15ac97c62 Half done refactoring of CHeroWindow. 2010-12-16 22:32:53 +00:00
dbe38a7062 A few bug fixes and arious warning fixes: unused code/variables, out of order initializations, ... 2010-10-30 21:53:41 +00:00
9e8d0651f6 - fix for #32 (b)
- fix for some warnings
2010-08-29 23:12:34 +00:00
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
fd45cd0a6d - fix for #283
- ally support: adventure map
2010-08-13 10:46:08 +00:00
78f44dc648 Support for 16bpp displays. Possible optimizations. 2010-08-05 11:02:18 +00:00
52319f5713 * CBonusSelection will now work on CCampaignState instead of CCampaign; unfortunately there seems to be no elegant way to move that state between bonus selection screen and CGameState::init, so it's not yet moved. 2010-08-04 11:18:13 +00:00
fc4c496f99 Fixed #556. Version for dev build 0.81d
EDIT: r1703 will be 0.81d
2010-07-28 22:24:16 +00:00
dc936d5686 Fixed #543 and #547. Fixes for marketplace. Combined artifacts will again give bonuses from their constituents. 2010-07-26 15:37:58 +00:00