1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

220 Commits

Author SHA1 Message Date
mateuszb
ccecc6637f * partially done support for VERM
* MSVC compilation fix (using boost::ref is an error)
2011-04-01 19:09:05 +00:00
Ivan Savenko
407acce4c6 - gcc 4.5 / boost 1.46 compilation fixes
- configure will accept CXXFLAGS parameter correctly
- boost version check in ERMParser - to skip compilation with old boost
2011-03-29 17:16:10 +00:00
beegee1
b6c385f158 Better implementation of campaign selection screen 2011-03-21 19:32:48 +00:00
Ivan Savenko
7209f158a1 - gcc/Linux fixes
- added --nointro parameter to skip intro videos
- minor fixes to scenario selection menu
2011-03-19 22:27:05 +00:00
Michał W. Urbańczyk
5e4140762f Fixed #687. 2011-03-19 14:35:29 +00:00
beegee1
fb929fa9b0 AB campaign selection screen added 2011-03-19 14:27:51 +00:00
Frank Zago
66c05ddcff Some gcc/linux fixes. 2011-03-17 03:56:36 +00:00
beegee1
38837ebfc9 Implementation of WOG and ROE campaign selection screen 2011-03-15 14:35:36 +00:00
Michał W. Urbańczyk
207e573001 Fixed #645 by reverting support for screen scrolling [there are still some remains in settings file]
Removed some unused code.
2011-03-01 09:57:18 +00:00
Michał W. Urbańczyk
e505328fcd Reverted r1992 for now [boost < 1.46 won't work with it] 2011-02-24 14:01:58 +00:00
Michał W. Urbańczyk
1afcaf2817 * CThreadHelper.cpp now belongs to VCMI_lib project
* fixed console on Windows (restored old code)
 * GeniusAI won't get blocked when it has a hero with tactics in battle
 * fixed an issue with switching turns in hot-seat mode when there is Cover of Darkness active
 * suppressed bonus system console output: it goes only to the logfile
 * [win32] setting thread names (debug purposes)
 * minor fixes
2011-02-24 13:57:47 +00:00
mateuszb
4647d4af2c boost 1.46 compile fixes. 2011-02-24 12:21:48 +00:00
Ivan Savenko
450ae1772c - Buttons optimization - less memory and CPU usage
- gcc compilation fixes
2011-02-20 09:24:53 +00:00
Ivan Savenko
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
Michał W. Urbańczyk
15011e611d Merged Ivan's changes from trunk (r1921) 2011-01-28 02:33:26 +00:00
Ivan Savenko
551d1f1b26 - Possible support for sounds in GOG version
- Fixed all issues with Russian localisation
- (Linux) fixed #637
2011-01-17 16:07:08 +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
b15deaa203 * more constTransitivePointers in GameInfo, separated client GUI classes from it, moved def handlers from CGDefInfo 2010-12-19 14:39:56 +00:00
Ivan Savenko
265d7a22d6 Animation system update:
-- files moved to /client, GUI classes added
-- handling of creatures, used in creature cards, fixed #469 \ #490
-- handling of town buildings
#631 crash at hill fort fixed
2010-11-15 15:15:00 +00:00
Frank Zago
dbe38a7062 A few bug fixes and arious warning fixes: unused code/variables, out of order initializations, ... 2010-10-30 21:53:41 +00:00
Michał W. Urbańczyk
0e12c1419e Not very nice fix for campaigns. 2010-10-30 14:53:23 +00:00
Ivan Savenko
923fed7dc1 - fix for bonuses in campaign screen
- fixed gcc warnings
- build system updated
2010-10-25 19:37:21 +00:00
Michał W. Urbańczyk
daeb3af67a Early changes towards MP support.
It's possible to connect several clients (running on localhost) and enter MP pregame. The actual MP game still not playable. (though it can be started)
2010-10-24 11:35:14 +00:00
Ivan Savenko
c10dac929d - New animation system:
-- New files: hch/CAnimation.h/cpp
-- Class CAnimation capable to load file partially and/or keep data in compressed state
-- Buttons now use CAnimation instead of CDefHandler

- build system regenerated to include new files
- fixed several gcc warnings
- updated README.linux
2010-10-18 15:08:59 +00:00
mateuszb
9356ba15ef * minor improvements for campaigns 2010-09-04 14:49:15 +00:00
Frank Zago
4b8be22fb6 Several compile/link fixes. 2010-09-04 14:47:39 +00:00
mateuszb
4ba3c68ced Chenges (networking for PG, minor fixes) 2010-09-03 18:42:54 +00:00
mateuszb
fc79b9b6cf * partial implementation of hero crossover
* minor fixes to resolution handling
* other minor fixes and changes
2010-08-28 14:52:20 +00:00
mateuszb
d1bfe4cbd6 * a bit better screen scrolling for small resolutions
* a bit optimized terrainRect
2010-08-26 15:33:55 +00:00
mateuszb
6b8718b046 * partially done support for resolutions smaller than 800x600 by screen scrolling 2010-08-23 15:16:40 +00:00
mateuszb
d681afe1c1 Changes towards campaign support. 2010-08-20 13:34:39 +00:00
Ivan Savenko
8319e5e703 - town events implemented
- merged CustomImagecComponent into SComponent
- moved some subID-related code from CastleInterface
2010-08-18 14:24:30 +00:00
Michał W. Urbańczyk
4aa60cd40e Minor changes. 2010-08-18 09:50:25 +00:00
mateuszb
9c60629bcf * minor changes 2010-08-17 14:58:13 +00:00
mateuszb
7002e73908 * small fix 2010-08-05 07:52:34 +00:00
mateuszb
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
mateuszb
54496ddee1 * player's serialID removed (save format broken, new game seems to work)
* building bonus (campaigns) supported
2010-08-03 11:36:52 +00:00
mateuszb
3361126c55 * partially done building bonus (campaigns)
* ERMU -> picture name mapping by Ivan (thanks)
2010-08-02 14:29:30 +00:00
mateuszb
b441143a73 * monster campaign bonus handled
* selecting / displaying difficulty
2010-08-01 14:40:34 +00:00
mateuszb
c06de1f1ce * improved campaign handling - bonus selection screen is mostly functional
* preliminary support for giving campaign bonuses (resources and spells, artifacts, skills for generated hero are given)
* differing the amount of resources given to AI and human players
* minor changes
2010-07-31 13:55:05 +00:00
mateuszb
af7aebc806 * minor changes 2010-07-30 14:26:37 +00:00
mateuszb
99fcb23182 * several implrovements in campaign handling
* new cheat codes:
- vcmisilmaril - player wins
- vcmimelkor - player loses
2010-07-30 11:29:42 +00:00
Frank Zago
686061071f Compile fix. 2010-07-30 02:08:53 +00:00
mateuszb
052e4f08e5 * partially done campaign bonus selection 2010-07-29 17:00:34 +00:00
Michał W. Urbańczyk
cc96374a40 Fixed #552 2010-07-28 10:46:36 +00:00
Michał W. Urbańczyk
cd9ab4cc62 VCMI won't crash with invalid video file (should fix #92). 2010-07-20 10:46:38 +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
3111a904ae Several minor fixes. 2010-05-26 21:59:58 +00:00
mateuszb
adbc142ff0 * a bit of campaign support 2010-05-08 18:56:38 +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
Michał W. Urbańczyk
80f49badc9 Implemented Scuttle Boat and Dimension Door spells.
Fixed #417 and #418.
Moved / refactored some code. Minor fixes.
2010-03-20 22:17:19 +00:00
Michał W. Urbańczyk
3699786ab0 Little more work on pregame. Fixed some leaks.
Fixed: #80, #159, #234, #235, #319, #320, #430
2010-03-07 22:56:51 +00:00
Michał W. Urbańczyk
85f463e479 Several fixes for pregame:
Fixed #240, #255, #397, #411
2010-03-05 22:51:09 +00:00
Michał W. Urbańczyk
9e6d3a4453 Version set to 0.8. (not release yet, waiting for a few more fixes)
* fixed possible crash on visiting Obelisk
* fixed #394, #391, #395, #373
2010-03-01 18:22:22 +00:00
Michał W. Urbańczyk
9588e39e84 To be released as 0.75d. Fixed town list with hotseat. Fixed colouring hero window. Minor fixes. 2010-02-26 11:18:09 +00:00
mateuszb
b52ed2aa8e * fix for scenario options preview after the game is started 2010-02-25 13:51:30 +00:00
Michał W. Urbańczyk
0a950c508b Grail digging and construction.
Minor fixes.
2010-02-24 13:03:36 +00:00
mateuszb
5b0d646ddb * support for SPELL_AFTER_ATTACK, including most of spell 77 support 2010-02-23 15:39:31 +00:00
mateuszb
b2aa0e5930 * partial support for grail digging 2010-02-21 15:03:30 +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
80d42a5313 * next part of campaigns. Now all campaigns all available via custom campaign menu.
* puzzleMap now works
2010-02-18 14:09:16 +00:00
mateuszb
db755622b3 * next part of campaign support 2010-02-18 12:34:44 +00:00
mateuszb
968148c4dc * next part of bonus selection screen (including Ivan's config) 2010-02-16 17:28:56 +00:00
Michał W. Urbańczyk
4035155969 Mostly finished pregame part of hot-seat mode. 2010-02-16 16:35:24 +00:00
mateuszb
5db0c9da16 * generally finished custom campaign selection screen
* minor fixes
2010-02-15 13:28:33 +00:00
mateuszb
448c2e7225 * next part of campaign support
* a few fixes for .h3c reading
2010-02-15 12:12:21 +00:00
Michał W. Urbańczyk
49b99f470f More hot-seat GUI in pregame. 2010-02-15 11:37:47 +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
Michał W. Urbańczyk
78f54ffcd3 Fixed game loading.
Release 0.75d
2010-02-13 21:45:46 +00:00
mateuszb
40d50aaaa1 * a bit of custom campaign selection screen 2010-02-13 16:26:47 +00:00
Michał W. Urbańczyk
96819379c5 Fixed #109, #352, #359.
Possibly also #344, #353.
Allowed switching heroes with l-click when another hero is selected. (works for not accessible heroes)
2010-02-13 04:47:31 +00:00
mateuszb
8637b021cc * (hopefully) full reading of h3c
* minor changes
2010-02-12 15:04:01 +00:00
mateuszb
a975c54f86 * most of .h3c reading 2010-02-11 14:12:22 +00:00
Michał W. Urbańczyk
dd92dfed86 Fixed #82
This version will be released as dev build 0.75b
2010-02-11 04:24:37 +00:00
mateuszb
4d9d54735f * campaigns, part 1
* minor changes
2010-02-08 14:38:06 +00:00
Michał W. Urbańczyk
5279e2e9fc First part of support for victory & loss conditions.
Implemented and tested are
victory:
Defeat hero
Capture town
Defeat monster
Flag dwellings
Flag mines

Lose:
Loss hero
Time expire

**

Some others may work but not has been tested yet.
I've added a new page in VCMI Status spreadsheet with status of various victory/loss conditions.
2010-01-29 20:52:45 +00:00
Michał W. Urbańczyk
01831e912a Fixes for adventure AI: battles where AI is the attacker should work, fixed drawing AI heroes under FoW.
Restructured thread structure: no new thread on yourturn, instead of that introduced update() method called by thread dispatching GUI events. 

Further changes are planned.
2009-12-28 04:08:24 +00:00
Michał W. Urbańczyk
4bfc161adc Fixed #237.
Implemented #132 for Windows.
2009-11-28 17:21:54 +00:00
Michał W. Urbańczyk
82faf7538e Fixed #160, #167 2009-11-24 20:29:50 +00:00
Michał W. Urbańczyk
c00d4bf905 Reverted r1366
GUI automatically assigns the parent objects (CMenuScreen) with it's children controls. They're activated/deactivated/shown/deleted automatically. (it's enabled by OBJ_CONSTRUCTION macro in scope)
2009-11-24 19:50:20 +00:00
Frank Zago
f252b58f96 Commented out unused code. 2009-11-21 18:04:09 +00:00
Michał W. Urbańczyk
d18b6c3d5a Fixed #2, #10, #118, #209, #210 2009-11-14 20:14:15 +00:00
Michał W. Urbańczyk
a6f61e33bd * restored 0.74 savegames compatibility (for easier reproducing reported issues)
* Fixed #184 and #189
* minor fixes
2009-11-13 19:04:36 +00:00
Frank Zago
6b5feb63e6 Implemented "main menu" in-game option. 2009-11-01 01:15:16 +00:00
mateuszb
f22570712e * again, please don't include headers in headers if not necessary
* minor changes
2009-10-26 15:01:12 +00:00
Frank Zago
7471372074 Fixed several crashes when exiting. 2009-10-26 05:39:30 +00:00
Frank Zago
c6bd8e3518 Fixed bug 163 and display the right text when saving a game. 2009-10-23 01:48:03 +00:00
Frank Zago
6c008d5fea Restore 'click' sound when pressing a button. 2009-10-13 04:58:15 +00:00
Frank Zago
b02d4c1c2f (linux) Manage one directory per user for save games and config. 2009-10-10 05:47:59 +00:00
Frank Zago
668b203486 Work with full file paths instead of partial ones. 2009-10-10 01:42:33 +00:00
Michał W. Urbańczyk
3697b1d64e Fixed #74, #83, #84 2009-10-06 01:14:00 +00:00
Michał W. Urbańczyk
fe7ef6bbe1 Smart map object serialization over net.
Fixed doubling click sound on map selection.
2009-10-06 00:32:33 +00:00
Frank Zago
1609b8fdb9 Made all paths dependent on DATA_DIR, USER_DIR, BIN_DIR or LIB_DIR. Data access can now be separated from saved games and binaries.
Fixed a file handle leak.
Bumped revision to 0.74b (linux).
Reworked the build system to remove uneeded dependencies (linux).
Removed use of PATHSEPARATOR since Windows can use / too.
2009-10-04 02:02:45 +00:00
OnionKnight
e3eeed0b70 gcc compilation fixes. 2009-09-25 21:11:13 +00:00
Michał W. Urbańczyk
bff3abe122 Fixed positioning of battle effects / animations in non 800x600 resolutions. 2009-09-21 08:29:41 +00:00
OnionKnight
9f6fd12b5f * When sorting/filtering is applied during map selection the first map in the list is selected. 2009-09-11 11:11:01 +00:00
Michał W. Urbańczyk
956a87f264 * redone stack queue algorithm
* recalculating paths only after finished movement / switching selection
* moving hero uses "new" pathfinder
* moving hero by arrow keys / numpad
* VCMI window should start centered
* fixed pairing Subterranean Gates
* fixed issues with creatures sounds after loading
* several minor changes and improvements
2009-09-07 02:29:44 +00:00
Michał W. Urbańczyk
1f0a1bd771 More fixes. 2009-08-28 19:34:08 +00:00
Michał W. Urbańczyk
6bdfddd0c4 Mostly implemented Scenario Information and Save Game windows. Adventure Options Window (crash after closing it is known, will be soon fixed). Several minor improvements for pregame. Arrogance will be selected by default when starting a new game. 2009-08-27 08:04:32 +00:00
Michał W. Urbańczyk
1f79af440f * @previous revision: not an AI bug, it was a vector traversing bug. Fixed :-)
* Scrolling through scenario list with mouse wheel, HOME, END, PAGE UP and PAGE DOWN buttons
* Starting selected scenario with double-click
2009-08-23 18:01:08 +00:00
Michał W. Urbańczyk
66dd31fd8a * attacking and capturing towns
* r-click popups on selected town/hero.bonus and teams in pregame
* disabled music due to bugs in SDL_mixer and smpeg (probably it was the source of reported random crashes / hangups)
* minor fixes
2009-08-22 13:59:15 +00:00
Michał W. Urbańczyk
3915b71869 Various fixes. Subtitles for choosen hero/town/bonus in pregame. Fixed arrows behavior. Really fixed shortcuts. Fixed map scrolling. Fixed disappearing battle interface. 2009-08-18 08:22:56 +00:00
mateuszb
e892913635 * support for battles in creature banks (hopefully) 2009-08-17 10:47:08 +00:00
Michał W. Urbańczyk
b4070c6b3e Third part of GUI reorganization:
* Rewritten pregame
* FNT fonts support
* Several additions to GUI system. 

Changes are significant, some things may be broken.
2009-08-17 08:50:31 +00:00
Michał W. Urbańczyk
92ef19942f Splitting buttons in the exchange window. Minor fixes. Updated changelog. Version set to 0.73. 2009-08-01 19:25:12 +00:00
Michał W. Urbańczyk
64d9665c39 * fixed crash when there was flaggable building next to map edge
* increased char per line limit for subtitles under components
* saves are sorted primary by map format, secondary by name
* fixed displaying date of saved game (uses local time, removed square character)
* removed redundant quotation marks from artifact events text
* corrected some exp/level values
* primary skills cannot negative values
* fixed crash on entering hall when town was near map edge
* workaround to prevent crashes when gaining same sec skill on leveling serie
* fixed displaying luck effect animation
* minor improvements
2009-07-12 14:07:36 +00:00
Frank Zago
6be7a77fee Linux video player updates. 2009-06-27 23:33:59 +00:00
Michał W. Urbańczyk
f0dea8d708 Video in Tavern Window. Minor improvements. 2009-06-24 09:17:33 +00:00
Michał W. Urbańczyk
60f7048662 Finished BIK handler. Refactored CVideoPlayer. Added intro and main menu animation. (Win only). 2009-06-24 06:56:36 +00:00
Michał W. Urbańczyk
e2c30df5a6 * fix for problems after r-clicking hero in tavern
* refactored Options::show
* minor improvements
2009-06-10 20:48:55 +00:00
Michał W. Urbańczyk
29e1f2a0b8 * removed redundant code for displaying map difficulty
* bumped version name to 0.72b
* more diagnostics in music handler (should help to catch the reported bug with not playing main menu theme)
* probably fixed problems with horde buildings in towns that start with upgraded dwellings (0.72#1 http://vcmi.antypika.aplus.pl/forum/viewtopic.php?t=159)
2009-06-10 19:44:09 +00:00
Frank Zago
3398941231 Fix difficulty level displayed (Normal instead of ormal). 2009-06-10 00:34:40 +00:00
Michał W. Urbańczyk
a17936908a * updated changelog
* version set to 0.72
* integrated save format version to the CLoadFile
* fixed problems on entering non-number as resolution number
* minor improvements
2009-06-01 22:31:11 +00:00
Michał W. Urbańczyk
cff70406f1 * enter can be used to open window with selected hero/town
* fixed slider behavior when showing less maps/games than available slots
* added a few missing sounds for creatures
* fixed problems with artifacts info caused by bug in serialization
* fixed bug in Scholar's serializetion
* all stacks features will be serialized (should fix problems with missing premies from artifacts)
* proper serialization of HeroBonus, fixes some problems/crashes
* resource silos won't give resources on the first day
* fixed problems with removing artifacts when all visiblebackpack slots are full
2009-05-30 16:00:26 +00:00
Frank Zago
94b8fa4f9d Added support for Home/End. 2009-05-29 02:39:12 +00:00
Frank Zago
53129ec1a7 Made sortMaps clearer. 2009-05-29 01:54:45 +00:00
Frank Zago
e863269893 Use a temporary vector to keep list of maps to display instead of using sizeFilter. That should fix all the glitches reported. Added support for pgup/pgdown. 2009-05-29 01:50:33 +00:00
Frank Zago
6635cf4f23 Made a few functions static or static inline. 2009-05-23 22:57:39 +00:00
Frank Zago
8e2a6466e2 Split audioh into soundh and musich. Derive both from a new CAudioBase class. Fixed crash when there is no sound card present. 2009-05-22 04:14:59 +00:00
mateuszb
429b226517 * moved a few files 2009-05-20 10:08:56 +00:00