games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity
1,621 Commits 19 Branches 62 Tags 110 MiB
565d474364
Commit Graph

152 Commits

Author SHA1 Message Date
OnionKnight
137ab65a13 Fixed artifact screens so only local changes are made. Some ugly const casting, for now. 2010-02-05 22:28:31 +00:00
mateuszb
bc6cba565e * next part of thieves' guild window 2010-02-04 18:40:40 +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
mateuszb
f5a719c2da * next part of thieves' guild window 2010-02-01 17:51:33 +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
Frank Zago
cf03071de5 g++ compile fix. 2010-02-01 05:45:44 +00:00
Ivan Savenko
ddd0786739 forgot to fix line endings and one file 2010-01-31 23:30:47 +00:00
Ivan Savenko
eefdd686de - Almost finished kingdom overview window 
- modified garrison to allow placing it in 2 rows
- some fixes to hero and exchange windows
 2010-01-31 23:22:25 +00:00
mateuszb
0f21d9c762 * first part of Thieves' Guild window 2010-01-31 18:41:22 +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
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
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
OnionKnight
ef5b1ca1de * Fixed bug #112 
* Improved the security checks for ExchangeArtifact and SetArtifact, but have also come to realize that SetArtifact  is inherently broken and can be used for cheating. :(
* Preliminary work for combination artifacts, it's now possible to identify artifacts that are combined and what they're made up of.
* Happy New Year!
 2009-12-30 15:33:28 +00:00
Michał W. Urbańczyk
5d74e61e3e Hopefully fixed compilation. Unified line endings. 2009-12-30 07:49:25 +00:00
DjWarmonger
63ba552d87 -Fixed Pyramid bug and incorrect behaviour of specific banks 
-Commited some old scraps of better InfoWindow with scrollbar
 2009-12-29 17:13:40 +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
Michał W. Urbańczyk
f4dd78507c Patch from Ivan ( http://vcmi.antypika.aplus.pl/forum/viewtopic.php?p=4089#4089 ) 
"I've noticed that on town screen left-bottom info panel doesn't behave like in H3 and it looks that I fixed this as well as some connected issues:
-all elements now response like in H3 on mouse moves\clicks
-town status bar was not cleaned when nothing is selected
-growth calculation was a bit wrong (in case of town with grail)
-in H3 legion statue effect does not include effect of its components - only global +50% "
 2009-12-23 01:46:15 +00:00
Frank Zago
a04b9ffa0c Fixed position of system buttons. Added placeholders for load and restart butttons. 2009-12-11 04:52:51 +00:00
OnionKnight
0a96decf87 * Fixed the artifact screen completely, hopefully. Structural overhaul of the CArtPlace and CArtifactsOfHero classes, and I had to add a new server message SetArtifact to deal with things properly. The only thing that differs from H3 now is that you can't have gaps of empty slots in the backpack. 
* Preliminary work on bug #112, a bigArtifacts set is added to CArtHandler.
 2009-12-01 23:19:43 +00:00
Michał W. Urbańczyk
df3ef1c330 Incremented versions. Updated changelog. 2009-12-01 22:14:25 +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
OnionKnight
dced6ec17c * Fixed bug 195, possible slots for artifacts are highlighted when selecting an artifact. 
* Mostly fixed so that artifacts looks like they're being carried when selected.
 2009-11-28 19:55:40 +00:00
Michał W. Urbańczyk
82faf7538e Fixed #160, #167 2009-11-24 20:29:50 +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
Michał W. Urbańczyk
f99c4d3c66 Fixed #110. 
Some minor changes / fixes.
 2009-11-13 16:02:25 +00:00
OnionKnight
64a72c39cb * Fixed bug 101, placing artifacts in specific slots in the backpack. Cleaned up swapArtifacts() to use more descriptive names as well. 2009-11-10 03:10:14 +00:00
OnionKnight
e040033950 * Fixed bug 38. (Swapping with artifact from backpack) 2009-11-06 02:26:25 +00:00
Frank Zago
6b5feb63e6 Implemented "main menu" in-game option. 2009-11-01 01:15:16 +00:00
OnionKnight
46c1127cc4 * Fixed bug 196. 2009-10-31 15:29:05 +00:00
DjWarmonger
ddd755c0c1 1.Removed unused code from hero handler 
2.Minor changes in GUI
3.Attempt to manage different alignments of ships
 2009-10-28 10:45:45 +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
ddfe2e6f43 Center system option window. 2009-10-23 01:20:16 +00:00
Frank Zago
218194c36e Fixed bug 186. 2009-10-22 03:28:54 +00:00
Frank Zago
598334a71e Hide the mouse cursor while displaying a popup window. 2009-10-22 03:12:01 +00:00
Frank Zago
063bb9dc47 Hide the mouse cursor while displaying a popup window. 2009-10-22 02:41:09 +00:00
mateuszb
ad0848f1d2 * fix for bugs 47 and 89 2009-10-18 14:39:53 +00:00
DjWarmonger
476443101f Fixed bug #175 2009-10-17 15:51:58 +00:00
DjWarmonger
913c0af6fa Fixed bugs 11, 24 & 26 
Next part of Shops script, however still no GUI.
 2009-10-03 11:16:42 +00:00
OnionKnight
e3eeed0b70 gcc compilation fixes. 2009-09-25 21:11:13 +00:00
Frank Zago
66541027b5 Correct spelling. 2009-09-25 04:05:01 +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
DjWarmonger
b29ac50dcb 1.Support for cage of Warlord, Temple of Valhalla, Wall of Knowledge, Order of Fire 
2.Level-up from newly implemented School of War crashed the game.
3.A sketch of shops support
 2009-09-21 09:00:33 +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
fc2a11359e * different fixes and improvements for puzzle window 2009-09-05 10:23:29 +00:00
mateuszb
399f58f1af * partially implemented puzzle map 2009-08-31 15:57:15 +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
579b7236b7 Fixed crash when r-clicking spell. 2009-08-23 18:23:21 +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
OnionKnight
d8c2055809 * Shipyard window had it's wood and gold spots swapped, fixed. 
* Melee cursor in battle now works like it should for 2-hex creatures.
 2009-08-19 15:47:00 +00:00
OnionKnight
d8ddc4236b Shipyard window fixed. 2009-08-17 17:19:09 +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
1d765e8f29 Second part of GUI reorganization. Some things may not work properly. 2009-08-11 16:05:33 +00:00
Frank Zago
bf17a77e00 Added workaround for a const value treated by gcc -O0 as a regular variable, and thus preventing linking. 2009-08-08 05:45:00 +00:00
mateuszb
9d531b0d84 * fixed: 
- 0.72d #27
- 0.73 #13
 2009-08-07 09:45:21 +00:00
Michał W. Urbańczyk
a91ab8872b First part of GUI reorganization: extracted CGuiHandler from CPlayerInterface. 
Minor fixes for Creature Generators and recruitment window.
 2009-08-06 22:36:51 +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
1f75aeaf34 Video working with 32 bpp. Proper loading of hero on boat. Fixed problems with newly recruited hero blockvis info. Fixed possible crashes. 2009-08-01 10:08:16 +00:00
mateuszb
8e63c73cf8 * flaggable objects change their color on minimap when taken over 
* corrected damage inflicted by spells and ballista
* minor changes
 2009-07-30 12:49:45 +00:00
Michał W. Urbańczyk
25663d2605 Fixes for exchange window in non 800x600 res 
Minor improvements and fixes.
 2009-07-27 17:55:56 +00:00
mateuszb
898d266580 * swapping artifacts in hero window almost works (artifacts are cloned instead of swapped for some reason) 2009-07-26 15:37:27 +00:00
Michał W. Urbańczyk
0d408bc6c2 Fixed switching music between towns and system options window. 2009-07-26 11:42:00 +00:00
Michał W. Urbańczyk
e358845873 Golems Factory and Elemental Conflux creature generators supported. Minor improvements. Updated changelog. 2009-07-26 10:43: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
Michał W. Urbańczyk
eb40ade906 * saving system options 
* saving hero direction
* minor changes in saving
 2009-07-18 03:13:13 +00:00
Michał W. Urbańczyk
d1d2823c58 * fixes for glitches in garrisons in non 800x600 resolutions 
* fixed timed events
* in recruitment window upgraded creatures will be selected by default
* bumped version number
* spell points won't be negative
 2009-07-17 21:53:28 +00:00
Michał W. Urbańczyk
b24bd585bc Really fixed glitches in garrison slots. 2009-07-16 01:10:16 +00:00
Michał W. Urbańczyk
ac175895b1 MKinor bugfixes. 
(cf http://vcmi.antypika.aplus.pl/forum/viewtopic.php?p=2980#2980 )
 2009-07-15 23:58:47 +00:00
Michał W. Urbańczyk
23803c9f17 * improved Events handling 
* fixed saving town available creatures info
* minor improvements
 2009-07-15 22:46:00 +00:00
Michał W. Urbańczyk
824061e185 * it's possible to exchange stacks between heroes 
* fixed bugs with displaying stacks health
* 'T' hotkey opens marketplace window
 2009-07-01 07:04:21 +00:00
mateuszb
85eb5c7eb9 * artifact manipulation in exchange window works (without switching artifacts between different heroes) 
* support for 3 new artifacts:
- Ring of Vitality
- Ring of Life
- Vial of Lifeblood
* restructures creature ability preparing (creature abilities are now loaded from cr_abils.txt file). It needs further work - all changes in abilities should be moved from CCreatureHandler.cpp to cr_abils.txt as it's done in this commit (I hope it's clear how it should be done as there is an example)
 2009-06-28 13:49:39 +00:00
Michał W. Urbańczyk
9093320da8 Garrison interface in Exchange Window. 2009-06-28 08:21:50 +00:00
Frank Zago
6be7a77fee Linux video player updates. 2009-06-27 23:33:59 +00:00
mateuszb
0919235948 * next part of hero exchange window 
* minor changes
 2009-06-26 15:41:19 +00:00
mateuszb
20676e8f95 * compilation error fix 2009-06-24 12:14:48 +00:00
Michał W. Urbańczyk
f0dea8d708 Video in Tavern Window. Minor improvements. 2009-06-24 09:17:33 +00:00
mateuszb
d2003d59c7 * next part of exchange window 
* corrected typo in constructors of CSndHandler and CVidHandler causing compilation errors under MSVC
 2009-06-19 12:10:36 +00:00
mateuszb
9a5aea6635 * next part of exchange window 2009-06-18 15:05:00 +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
mateuszb
7932a9e8ad * next part of exchange window 
* minor changes
 2009-06-17 09:38:03 +00:00
mateuszb
8231a6e6cc * first part of exchange window 
* minor changes
 2009-06-16 11:18:14 +00:00
Michał W. Urbańczyk
58c12e8d73 Reshaped some code responsible for hero list / paths. 
* Garrisoning, then removing hero from garrison move him at the end of the list
* problems with the hero window hero list should be fixed
 2009-06-11 17:21:06 +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
Frank Zago
cbf2ed6b7a Protects against concurrent access to in game console texts. 2009-06-09 03:53:29 +00:00
Frank Zago
8bc64d87e9 Force the popup window to be completely oin scs\reen. Fixes bug #2799727. 2009-06-02 03:01:17 +00:00
Frank Zago
ee385d7654 Fix comment from previous commit. 2009-05-30 17:37:53 +00:00
Frank Zago
e7b2074812 In tavern update the hover text for the RECRUIT button when a hero is selected. 2009-05-30 16:17:44 +00:00
Frank Zago
5b25b21a15 Hero description in tavern is invariant, so move it into its constructor instead of recreating it for every frame. 2009-05-30 15:58:28 +00:00
Michał W. Urbańczyk
4581c30b20 * VCMI won't try to calculate path when clicking terrain on the other map level then that of currently selected hero (caused hangs) 
* Mines / Resource Silos won't give income in the first turn
* Double click on hero slot during stack splitting won't crash
* Fixed problems with updating buttons / minimap
 2009-05-24 23:21:55 +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
Michał W. Urbańczyk
1d5565b3a3 * updated project files for MSVC 
* fixed a few includes paths
* it's possible to enter Tavern via Brotherhood of Sword
* fixes for statusbar
* fixes for townlist
* fixed crashes on building / clicking some buildings
* bumped version number to 0.71c
* bonuses from wearing more than one same artifact won't cumulate
 2009-05-21 23:50:45 +00:00
mateuszb
429b226517 * moved a few files 2009-05-20 10:08:56 +00:00