games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
4,492 Commits 19 Branches 62 Tags 112 MiB
943a5bf0d3
Commit Graph

156 Commits

Author SHA1 Message Date
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
Ivan Savenko
b3c17d2788 large filesystem update. Filesysytem is now fully functional, everything should work. 
- completely replaced CLodHandler, removed bitmaph and spriteh
- replaced CLodStream in favour of CCompressedStream (2 new files)
- renamed CResourceLoaderFactory and ResourceIndetifier to shorter names
NOTES:
- campaign loading is currently broken. Will fix.
- I am going to remove several unused files in several days (e.g. LodHandler)
 2012-08-01 12:02:54 +00:00
Ivan Savenko
13de841e10 - minor tweaks to quest window 
- fixed #531
- fixed query crash (empty funciton)
 2012-07-21 20:16:54 +00:00
Ivan Savenko
9d2711fb51 - rewrote most of classes from adventure map window 
-- new files: client/AdventureMapClasses.*
-- implemented all missing details from infobox
- textinput can handle numbers as input
- fixed several bugs caused by CIntObject changes
- fixed #988
 2012-06-13 13:04:06 +00:00
Ivan Savenko
c512069177 - fixed #982: 
-- replaced 8to24 bilt with sdl blit
-- fixed alpha values for images loaded via SDL
 2012-05-27 14:07:12 +00:00
Ivan Savenko
665837d656 - hopefully better town development for AI 
- fixed minimap blitting
- fixed crash on attacking town without moat
 2012-05-19 16:22:34 +00:00
Ivan Savenko
45c2809a40 - pregame will use same resolution as main game 
- disabled most of now unused code for changing resolution
- added missing spell effect sounds
- adventure map spells sounds
- remaining fixes for big endian systems
 2012-05-18 17:35:46 +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
Frank Zago
8403d177aa Added endian aware macros read_le_u16 and read_le_u32 to replace readNormalNR(). Fixes a couple of issues on big endian machines. 2011-10-08 01:23:46 +00:00
Ivan Savenko
d113517db4 - fixed #108, #798, #810 
- fixed several gcc warnings
- some work on JSON (const char* as input, no crash on missing value)
 2011-09-23 15:58:18 +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
Frank Zago
04995938dc Fixed bad battle backgrounds (introduced in r2334). 2011-09-03 03:53:08 +00:00
Frank Zago
d8249d007f Replaced a few iterators with BOOST_FOREACH. 2011-09-01 04:01:54 +00:00
Frank Zago
35622913f9 Convert ERMU_to_picture.txt into ERMU_to_picture.json. 2011-08-31 23:27:33 +00:00
Ivan Savenko
3fc42134b7 - fixed #586, #757, #758 
- fixed spinning projectiles for some creatures
 2011-08-31 12:11:34 +00:00
Frank Zago
e5349c58cd Created wall_pos.json from wall_pos.txt. 2011-08-31 04:11:44 +00:00
Frank Zago
71b1eef6b6 Merged AC_desc.txt into battles_graphics.json. 2011-08-31 03:27:18 +00:00
Frank Zago
68090a4ec6 Created battles_graphics.json from battleBack.txt and battleHeroes.txt. 2011-08-31 01:11:41 +00:00
Frank Zago
0a58d1f2cf Created town_pictures.json from townPics.txt. 2011-08-31 00:35:04 +00:00
Frank Zago
21f72c61b1 Created creature_backgrounds.json from cr_bgs.txt. 2011-08-31 00:12:02 +00:00
Frank Zago
81e50c9f2b Convert hero portraits config file to json. 2011-08-20 18:46:52 +00:00
beegee1
cef16ccc74 * Fixed battle positions bugs: #174, #172, #400 
* Turret creatures have no longer a standing animation
* Turret creatures get cut at a certain y position(lower part of shooters are hidden)
 2011-06-27 17:11:17 +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
beegee1
36d29424f0 * Turrets, keep and turret covers can be now be placed by altering wall_pos.txt 
* Fixed recruitment slider bug
* Fixed #271
* Improved color management
 2011-04-30 19:52:35 +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
5e0b0e49b2 * bug 392 fixed 2011-02-23 18:21:51 +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
848a00bc6f Stacks #4 -> giving creatures still needs to be fixed. 2010-12-05 23:10:02 +00:00
Michał W. Urbańczyk
32ce20af15 Moving stack system to pointers, part #1 2010-11-22 00:34:46 +00:00
Ivan Savenko
9771dd12ff - changes in LodHandler: 
-- file type (text, image...) can be specified in getFile(), all hacks removed
-- replaced Nodrze with std::set
-  some gcc warnings fixed
 2010-11-09 11:27:58 +00:00
Michał W. Urbańczyk
4434a73651 #630, ofstream doesn't have constructor from std::string on older compilers. 2010-11-07 12:14:31 +00:00
Michał W. Urbańczyk
30ae49864a Workaround for the font issue. 2010-11-05 20:48:54 +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
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
mateuszb
a7d3c5fbca * minor cleanups 2010-07-16 14:22:18 +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
8bda10b695 * Freelancer's Guild support (both town structure and adventure map object) 
* fixed crashes on r-click on hero in tavern and adv map
* fixed descync issue
* allow free movement FROM guarded tile
 2010-05-26 09:47:53 +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
993036e4a1 New non battle stack class. (Base for future improved bonus system, stack exp / arts) 
Fixed #443
 2010-04-02 02:07:40 +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
e6f31b7500 Compilation fixes for VC10. 
Changes towards hot-seat support.
 2010-02-20 13:24:38 +00:00
mateuszb
8637b021cc * (hopefully) full reading of h3c 
* minor changes
 2010-02-12 15:04:01 +00:00
mateuszb
d0bf334394 * reading of .h3c headers 
* a bit of readNormalNr deduplication
* minor changes
 2010-02-09 13:48:14 +00:00
mateuszb
5fe80d89ef * warning fixed (use of an uninitialized variable) 2010-02-05 10:54:59 +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
Ivan Savenko
3dbeaa5ef8 - Moved most of text output to original fonts 
- Temporary disabled ttf output
 2010-02-02 16:24:53 +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
Ivan Savenko
def041a8c9 #39 and #106 - fixed cosmetic buildings behaviour 
#102 - fixed config + requirements system
#161 - extended clickable rectangle
and some minor fixes
 2009-12-29 13:40: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
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
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
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
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
mateuszb
49a142b92e * minor changes 2009-08-17 13:08:05 +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
78afb07f52 New, experimental crashhandler for windows (creates minidumps). 
Several minor fixes and improvements.
 2009-07-31 20:10:22 +00:00
Michał W. Urbańczyk
9fd4b5bb62 Fourth part of sailing code. 
Support for Shipyard (both for town and adventure map versions). Improved boat displaying code. Minor changes.
 2009-07-26 03:33:13 +00:00
mateuszb
4bc0d1ace6 * partially fixed problems with boats 
* minor changes
 2009-07-25 12:49:45 +00:00
Michał W. Urbańczyk
fbd496b756 Infowindows for enemy towns. 2009-07-20 02:56:35 +00:00
Michał W. Urbańczyk
c9cac18482 Support for infowindows on enemy heroes. 2009-07-20 01:47:49 +00:00
Michał W. Urbańczyk
9272f501cd Second part of sailing support: 
* boat graphics and appropriate flags are used
* disembarking possible
* new objects supported:
 - Flotsam
 - Shipwreck Survivor
 - Sea Chest
 2009-07-19 03:10:24 +00:00
Michał W. Urbańczyk
2ca7cc5b5c First part of Boat and sailing support. 
[It's possible to enter the boat and move by sea, graphical glitches removal and disembarking will be done soon]
 2009-07-19 01:00:19 +00:00
Michał W. Urbańczyk
b551f6a72b Partially done support for external creature dwellings. 2009-07-06 19:41:27 +00:00
Michał W. Urbańczyk
9aff190899 Added palette colors for neutral "player" (Thx to Dru). Support for using them via blueToPlayersAdv(surface, 255). 2009-06-30 15:36:12 +00:00
mateuszb
ae3fa69134 * next part of exchange window 
* changed some CDefHandlers to CDefEssential (the second is less memory consuming)
* minor changes
 2009-06-17 16:46:16 +00:00
Frank Zago
73949f3367 Build fixes for linux. 2009-05-21 00:55:30 +00:00
Michał W. Urbańczyk
90fd75e66c * Removed trailing newline from settings.txt (caused warning) 
* Sprite/Bitmap handlers moved to VCMI_Lib
* Moved volume sliders 1px down for better look
 2009-05-09 16:18:27 +00:00
mateuszb
f9ae91d88c * further changes towards support for ranged spells 
* added info about author & license in files
 2009-04-15 14:03:31 +00:00
Michał W. Urbańczyk
cebd5db8b2 * it's possible to revisit object under hero by pressing Space 
* splitting window allows to rebalance two stack with the same creatures
* slightly improved sliders
* minor improvements
 2009-03-26 23:05:40 +00:00
Michał W. Urbańczyk
6ce9a253a4 * support for Redwood Observatory 
* support for Shrine of Magic Incantation / Gesture / Thought
* minor improvements
 2009-03-14 11:25:25 +00:00
mateuszb
489bd1e4f2 * various obstacles fixes 
* better support for battle backgrounds
 2009-02-10 14:21:51 +00:00
mateuszb
ba9b58d3a4 * moved graphics from CAbilityHandler to Graphics 
* reading BALLIST.TXT
* minor changes
 2009-02-06 14:15:45 +00:00
Michał W. Urbańczyk
3474fdaf05 * save/load partially working 
* Arena and Witch Hut support
* improved support for Resources
* minor fixes and changes
 2009-01-10 22:08:18 +00:00
mateuszb
b114582857 * corrected indentation 
* centered battle interface
* battle cursor while 1024x768 is now correct
* new version of settings.txt from Tow
 2008-12-23 13:59:03 +00:00
Łukasz Wychrystenko
633b0007ba some warning & code cleanup - nothing significant 2008-12-21 19:17:35 +00:00
mateuszb
6fc8ed9365 * showing spell effects affecting stack in creature info window 
* more appropriate coloring of stack amount box when stack is affected by a spell
 2008-12-21 11:07:23 +00:00
mateuszb
45204d8beb * displaying spell effects (currently only arrow magic effect is shown) 
* minor fixes
 2008-10-19 15:41:18 +00:00
Michał W. Urbańczyk
9d099e8c54 * blocked map scrolling where dialog window is opened 
* it's possible in battles to check remeaining HP of neutral stacks
* function in CGameInterface called when spell is casted. Support for the Magic Arrow from engine side.
* heroes can regain mana
* support for mistycisim and intelligence skills
* fixed leak with creating frameratekeeper every turn
* minor improvements
 2008-10-18 11:41:24 +00:00
mateuszb
538ffb1579 * added support for archery, offence and armorer secondary abilities 
* hero's primary skills account for damage dealt by creatures in battle
* magical hero are given spellbook at the beginning
* added initial secondary skills for heroes
* minor fixes and improvements
 2008-09-29 11:03:30 +00:00
Michał W. Urbańczyk
856698bd80 * fixes for MSVC (it needs to have global variables from library explicitly exported) 
* renamed logging variables to tlogX ('_' in var names looks ugly)
* cleaned it improved setting formations
* fixed crashbug on maps with random hero
 2008-09-19 08:16:19 +00:00
Vadim Glazunov
a1dd7f22f9 gcc fixes(bad idea to call global vars such as log2, this name used by math function). Colored log support on some non-win32 platforms. Small Automake project update 2008-09-18 20:24:53 +00:00
Michał W. Urbańczyk
629d934810 * moved CConsoleHandler to lib (update project files) 
* using winapi for better console handling with MSVC (I hope I didn't break anything at GCC)
* new logging system (use log0 - log5 for different priorities and colors (at msvc))
* using lists for storing activated interface objects
* more proper closing of server
 2008-09-17 10:18:22 +00:00
Michał W. Urbańczyk
3d147a7be8 * version set to 0.63 
* mostly done morketplace
* more logging around netcode
 2008-09-07 03:38:37 +00:00
Michał W. Urbańczyk
6613955463 * hero placed in the town starts as visiting hero, not garrisoned 
* if hero doesn't have a spell book, he can buy one in a mage guild
* improvements in closing
* fixed crash on picking artifact
* added event message when picking artifact
* fixed problems with disappearing pikemen
* InfoWindow will be properly centered
* hero portraits again visible in PreGame
* fixed problems with handling Pandora's Box
* support for Campfires
* minor changes
 2008-08-25 10:25:16 +00:00
Michał W. Urbańczyk
22ade5efbe * make compatible with boost 1.36.0 (there was breaking change in boost::function) 
* randomizing spells in towns
* fixed reading forbidden structures
* support for heroes starting in town garrisons
* hopefully fixed problems with wrong town defs (village/fort/capitol)
* moved CSpellHandler.* to VCMI_Lib (project files must be updated)
* redone reading spell info
* added missing features to the fort screen
* minor improvements

* partially done mage guild screen
 2008-08-20 06:57:53 +00:00
Michał W. Urbańczyk
61e66fa89c * icon in infobox showing that there is hero in town garrison 
* fort/citadel/castle screen
 2008-08-17 09:11:16 +00:00
Michał W. Urbańczyk
b89c951d09 * version set to 0.62 
* almost redone treasure chest
* working gaining levels for heroes (including dialog with skill selection)
* corrected another typo i cr_shots
 2008-08-13 00:44:31 +00:00
mateuszb
92971e0df0 * working minimap's FoW 
* properly displayed neutral buildings' flags
 2008-08-07 15:09:10 +00:00
Michał W. Urbańczyk
c7bb04235c * merged changes in pregame 
* portrait initialziaton
* minor
 2008-08-05 22:11:32 +00:00
Michał W. Urbańczyk
a15ffb06e6 * compiles under MSVC (haven't I broken anything on gcc?) 
* half-done support for battles
 2008-08-04 15:56:36 +00:00
Vadim Glazunov
6e737bbf3c Now netcode branch may be compiled with gcc. Sorry can't check build with MSVC 2008-08-04 09:05:52 +00:00
Michał W. Urbańczyk
cc7be20b07 Merged most of the changes from trunk. 
Because of really huge amount of modifications here I've probably missed some minor stuff. I doubt if it's still compatible with gcc - some changes should be reapplied.
 2008-08-02 15:08:03 +00:00
Michał W. Urbańczyk
5c5c80933b Made CreatureSet serializable and using creature id. Stack moving, swapping, merging, splitting. 2008-07-31 13:21:42 +00:00
Michał W. Urbańczyk
3247a9a4dd Rewrote hero moving code. Seems to be working. 2008-07-28 12:44:08 +00:00
Michał W. Urbańczyk
1b73678b7c Fighting with includes. 2008-07-02 08:39:56 +00:00
Michał W. Urbańczyk
ea8562a6b1 Rest of commit: broken battles, starting hero, town displaying and linker errors. 
Further changes for netcode.
 2008-06-30 00:06:41 +00:00