games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity
3,321 Commits 22 Branches 61 Tags 102 MiB
b57b14b752
Commit Graph

179 Commits

Author SHA1 Message Date
Ivan Savenko
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
beegee1
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
beegee1
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
beegee1
7f04ed990b Major refactoring. First part: BattleInterface 
Introduction of pre compiled headers,...
 2011-12-13 21:23:17 +00:00
Ivan Savenko
2eca314e92 - fixed #841 and #840 
- fixed several crashes
 2011-11-27 18:55:11 +00:00
Ivan Savenko
29f42aa873 - fixed #834 
- fixed crash at campaigns loading
- minor fixes
 2011-11-25 19:41:23 +00:00
Frank Zago
a62634cf94 Add support for SDL 1.3 in compatibility mode. 2011-11-17 00:24:27 +00:00
yupsi
583aca8912 Move hero/Next hero buttons being blocked when they should (#204) 2011-10-04 19:43:49 +00:00
Frank Zago
01566fcde1 Patch from Yupsi. Hero sleep/wake-up. Fixes #162 and #601. 2011-09-24 16:46:23 +00:00
Michał W. Urbańczyk
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
ori.bar
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
Michał W. Urbańczyk
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
Frank Zago
06ca4a7c76 Convert minimap.txt to a json file. 2011-08-26 00:29:37 +00:00
Ivan Savenko
7eb82278d9 - minor fixes to JSON 
- music will resume correctly after battles
 2011-08-20 11:27:09 +00:00
Ivan Savenko
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
Michał W. Urbańczyk
583f37bf1f * Playing terrain music 
* Fixed crash on l-clicking advmap during AI turn
 2011-08-17 21:48:12 +00:00
Frank Zago
aca118b613 Fixed creature bonus parser. Fixed several uninitialized variables. Updated data build script to v0.85. 2011-06-03 03:23:50 +00:00
Michał W. Urbańczyk
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
Michał W. Urbańczyk
df062614d7 Fixed #260, improvement for #250. 2011-05-25 22:44:02 +00:00
DjWarmonger
b97988477e Optimization for terrain path. 2011-05-21 08:44:02 +00:00
Michał W. Urbańczyk
2845123a0a A patch from zjarek ( #727 ) — refactoring of CTerrainRect::showPath. 2011-05-21 01:10:41 +00:00
Michał W. Urbańczyk
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
Michał W. Urbańczyk
b4144dc616 Callback jugglery, part 1. 
Fixed #252.
 2011-05-03 03:14:18 +00:00
Ivan Savenko
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
Ivan Savenko
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
Michał W. Urbańczyk
95efcc7cb5 Fixed #305, #707, #708. 2011-03-19 00:06:54 +00:00
mateuszb
0482195489 * bug 652 fixed 2011-02-24 13:14:52 +00:00
mateuszb
5e0b0e49b2 * bug 392 fixed 2011-02-23 18:21:51 +00:00
Michał W. Urbańczyk
4c9edd3f06 Many fixes around bonus system. Some basic propagation mechanism (not clever but works). 2011-02-21 04:13:00 +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
401b364ad7 Partially functional artifact screen. 
[TBD compound artifacts, backpack arranging, "live" modifying values, many details]
 2011-01-06 20:00:19 +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
Michał W. Urbańczyk
b15ac97c62 Half done refactoring of CHeroWindow. 2010-12-16 22:32:53 +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
Ivan Savenko
9e8d0651f6 - fix for #32 (b) 
- fix for some warnings
 2010-08-29 23:12:34 +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
Michał W. Urbańczyk
78f44dc648 Support for 16bpp displays. Possible optimizations. 2010-08-05 11:02:18 +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
Michał W. Urbańczyk
fc4c496f99 Fixed #556. Version for dev build 0.81d 
EDIT: r1703 will be 0.81d
 2010-07-28 22:24:16 +00:00
Michał W. Urbańczyk
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
Michał W. Urbańczyk
ff078dc440 Fixed #522 (probably), #529, #540. 
Version to be released as dev build 0.81b
 2010-07-24 11:46:04 +00:00
mateuszb
af52f308a2 * fixed #438 and crash on ZMM170S.DEF 2010-07-15 16:21:53 +00:00
Michał W. Urbańczyk
88e1636250 Fixed #15, #224, #370, #516 
Minor changes.
 2010-07-13 05:25:40 +00:00
DjWarmonger
2ed69d3f4d Support for Cover of Darkness 2010-06-06 06:05:39 +00:00
Michał W. Urbańczyk
39eb87924e Fixed #473, #475, #477 2010-05-31 21:14:15 +00:00
Michał W. Urbańczyk
3111a904ae Several minor fixes. 2010-05-26 21:59:58 +00:00
Michał W. Urbańczyk
1002bd2b4f Trading Post handling. 2010-05-18 07:01:54 +00:00
mateuszb
edd31ef41b * half-working boots of levitation and angel's wings 2010-05-15 15:00:19 +00:00
mateuszb
adbc142ff0 * a bit of campaign support 2010-05-08 18:56:38 +00:00
OnionKnight
cc616616c1 * Creatures now guard surrounding tiles. 2010-05-06 12:13:31 +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
mateuszb
5d3d9689e8 * luck support 
* support for distance/wall penalties & no * penalty abilities
* reworked damage calculation to fit OH3 formula better
 2010-04-06 13:19:54 +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
eec43d3c58 Version set to 0.80. (real, fixed release) 
Hopefully fixed #412, #413, #414
 2010-03-02 20:12:32 +00:00
Michał W. Urbańczyk
0b824585e2 Implemented #390. 2010-03-01 19:04:07 +00:00
mateuszb
39dcf007d1 * fixed #392 and #393 2010-03-01 18:45:18 +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
Michał W. Urbańczyk
0a950c508b Grail digging and construction. 
Minor fixes.
 2010-02-24 13:03:36 +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
Michał W. Urbańczyk
da87d25d21 Started making hot-seat GUI. Accompanying changes to rest of GUI. 2010-02-15 06:54:57 +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
Michał W. Urbańczyk
42fade07dc Fixed #13 and #339 2010-02-10 21:31:54 +00:00
Michał W. Urbańczyk
0fdbe787dc * New file: lib/HeroBonus.cpp - updated project files for MSVC 
* Updated changelog
* Support for Lighthosues and Obelisks
* Bonus system extended on players 
* Army speed won't affect movement points when sailing
* Picking grail position (digging not implemented though, puzzle map only partially)
* Minor improvements
 2010-02-10 02:56:00 +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
mateuszb
23a32ebf7a * fixed bug #20 
* minor changes
 2010-01-29 16:19:12 +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
Michał W. Urbańczyk
226935fd89 More missing virtual d-tors. GCC should be pleased. 
Moved some code.
 2010-01-02 01:48:44 +00:00
Michał W. Urbańczyk
eb6f7fffc9 Support for smart pointer serialization. Fixed creature banks serialization. Minor fixes. 2009-12-29 01:07:17 +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
6c4b4f21bc * Implemented rivers animation. Thanks to GrayFace for giving range of colors in palette to be shifted. 
* Hopefully fixed all issues with bliwWithRotate functions family. If there are any artefacts on terrain drawing, let me know.
* Fixed drawing of objects shadows.
 2009-12-22 21:53:50 +00:00
OnionKnight
9dad83590b Fixed bug 129 2009-12-22 07:48:54 +00:00
Michał W. Urbańczyk
85f336cbaa Fixed #158, #236, #243, #248. 
Fixed crash on catapult shot.
 2009-11-29 02:46:30 +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
4151310be6 * better fix for #184 (should fix all related issues) 
* fixed #214, #121, #100
 2009-11-13 21:01:33 +00:00
Frank Zago
6b5feb63e6 Implemented "main menu" in-game option. 2009-11-01 01:15:16 +00:00
OnionKnight
95808db933 * Right-click info window for castles and garrisons you do not own shows a rough amount of creatures instead of none. 
I don't really know under which circumstances no information at all is shown in the original H3 so I haven't dealt with that.
 2009-10-25 19:32:02 +00:00
Frank Zago
ddfe2e6f43 Center system option window. 2009-10-23 01:20:16 +00:00
red1939
142ec8e11a Lacking VCMI library include (VLC not found). 2009-10-22 17:50:37 +00:00
Frank Zago
336fee48aa Check if a right click is in the map, so clicking on the border no longer opens an empty info windows. 2009-10-22 02:25:12 +00:00
Frank Zago
e412619ce7 Info map for terrain type. Fixes bug 5. 2009-10-22 02:09:14 +00:00
Frank Zago
5a9752fb8c genWindow can center on the last mouse event instead of the screen. Fixes bug 188. 2009-10-22 00:25:39 +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
7f5f939f4f * Movement cursor shown for unguarded enemy towns. 
* Battle cursor shown for guarded enemy garrisons.
 2009-10-02 15:50:22 +00:00
OnionKnight
03f2137cab Small fix so vertical garrisons get right-click information. 2009-09-27 20:14:26 +00:00
Michał W. Urbańczyk
307c20e7dc * fixed crash on clicking on the map frame 
* battle settings will be stored
* fixed calculating battle casualties
* fixed crash when clicking on enemy stack without moving mouse when we receive action
* fixed issue when splitting stack to the hero with only one creatures
 2009-09-24 13:23:52 +00:00
Michał W. Urbańczyk
ee3c318ed9 Version for development release 0.73c 
* version set to 0.73c, bumped save format version, updated changelog
* new stack queue for higher resolutions (needs new graphics!)
* improved stack ordering during battle
* many minor fixes
* temporarily disabled AI
 2009-09-20 12:47:40 +00:00
Michał W. Urbańczyk
efb1049860 * fixed crashes with paths when fastly switching heroes 
* fixed and improved slider behavior
* fixed possible thread access conflicts
* support for attacking town with visiting hero
* fixed dwellings saving
* minor improvements
 2009-09-12 22:17:23 +00:00
Michał W. Urbańczyk
df87b34662 * fixes for moving War Machines 
* automatic merging same creatures stacks if needed when moving hero to town garrison
* minor improvements
 2009-09-11 05:45:40 +00:00
OnionKnight
3d2ab9c753 * Garrison dialogs for garrisons. Required a bit restructuring of the code to take removable units into account. All showGarrisonDialog methods and the GarrisonDialog struct now takes it as a parameter. Visiting ally towns would benefit from this other than garrisons. 
* Garrison right-click information shown, but not taking detailed info into account.
* Town info dialogs centered around cursor.
 2009-09-09 17:49:03 +00:00
Michał W. Urbańczyk
9e7771272d * improved "Split" button behavior. It can be used for calling hero meeting screen in town screen. 
*fixed problems with underground switch button in higher resolutions
* minor graphical fixes for Marketplace window
* minor fixes
 2009-09-09 06:04:42 +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
mateuszb
399f58f1af * partially implemented puzzle map 2009-08-31 15:57:15 +00:00
Michał W. Urbańczyk
ca7ee8936c Implemented redesigned pathfinder. Using new info from it, implemented various adventure map cursors. 
(Paths are still calculated using the old pathfinder, it will be changed soon)
 2009-08-30 12:47:40 +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