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
2,660 Commits 22 Branches 61 Tags 102 MiB
e4c88d5088
Commit Graph

1225 Commits

Author SHA1 Message Date
Ivan Savenko
59255a4cad - background for main menu can be scaled. Won't work as default due to non-scalable video 2012-05-20 11:03:21 +00:00
DjWarmonger
88639be91b Enabled commander artifacts. Don't work yet. 2012-05-20 08:39:19 +00:00
Michał W. Urbańczyk
a234b4c935 Fixed #956. 
Removed unused code left after tests.
Updated changelog.
 2012-05-19 22:57:24 +00:00
Ivan Savenko
a13a62537b - fixed crash in hero window (#963) 
- added unused for now image scaling algorithm
 2012-05-19 21:38:01 +00:00
DjWarmonger
6419f953cb Some (disabled) work for commander artifacts. Hero artifacts window seems broken. 
Minor fixes.
 2012-05-19 18:27:23 +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
6f6cd6814e - fixed wrong battlefield (#961) 
- minor tweaks
 2012-05-19 11:47:26 +00:00
Michał W. Urbańczyk
d168f3eac2 * Implemented Moat functionality during siege (stops movement and deals dmg) 
* Mostly implemented battle spells:
 - Fire Wall
 - Force Field
 - Land Mine
 - Quicksands
 2012-05-18 20:50:16 +00:00
DjWarmonger
5435101182 Lots of fixes and improvements for Commander interface. 2012-05-18 19:44:15 +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
DjWarmonger
d491bc1c3a Commanders can level up. It's non-interactive yet. 
Printing secondary skills for Commanders.
 2012-05-18 14:02:27 +00:00
Ivan Savenko
ed634a5f06 - minor fix to last commit 2012-05-17 11:15:11 +00:00
Ivan Savenko
97aeaa9f28 - moved ColorPutter's to separate SDL_Pixels.h file 
- added Channels namespace for accessing subpixels in format-independent way
- fixed several big-endian issues
- re-generated buld system
 2012-05-17 10:44:48 +00:00
DjWarmonger
416c08260a - Basic Commander window 
- First part of unified quests interface

This graphics package is needed:
http://forum.vcmi.eu/viewtopic.php?p=6943#6943
 2012-05-16 17:29:05 +00:00
Ivan Savenko
99439e1ed6 - fixed creature sounds (#802, #113) 
- added missing sounds for commanders and sharpshooters (#524)
- minor fixes
 2012-05-15 16:29:40 +00:00
DjWarmonger
fb34a48eec Compile fix for previous commit. 2012-05-15 09:21:32 +00:00
Ivan Savenko
8de71c2b39 - fixed #711, #862, #321 
- moved PutPixel templates into header to allow inlining
 2012-05-15 08:47:11 +00:00
Ivan Savenko
90ff99d4eb - fixed ancient #31 
- fixed #603
 2012-05-14 16:29:06 +00:00
Ivan Savenko
9efe05c90b - removed usage of Graphics in several places (Components and hero window). 
minor:
- fixed several deprecation warnings in video player
- config file may have multiple upgrades for creatures
 2012-05-13 15:04:21 +00:00
Ivan Savenko
46f48f0676 - bugfixing: 
-- fixed #942 and #898
-- removed dublicated code in dwelling loading, #900 is fixed
-- fixed roads rendering for #895
 2012-05-11 19:03:40 +00:00
DjWarmonger
9cbbfcf258 - Fixed all bugs with battle interface. It's now more consistent. 
- Minor cleaning.
 2012-05-07 16:04:43 +00:00
DjWarmonger
ee2768ab07 - Some work for commanders 
- New creature window - visit forum for package with necessary graphics: http://forum.vcmi.eu/viewtopic.php?p=6908#6908
- More AI optimizations - heroes will be processed starting from the fastest one.
- AI will check is GATHER_ARMY object is reachable
 2012-05-07 12:54:22 +00:00
Ivan Savenko
82b60c00a2 - fixed compile issues. Renamed several "battleobstacleSplaced" to "battleobstacleplaced" 
- implemented --disable-video command line switch
 2012-05-05 08:32:55 +00:00
Michał W. Urbańczyk
5449546447 Advanced work on support for Quicksand and Land Mine spells. 2012-05-04 21:16:39 +00:00
DjWarmonger
5d311fb3ed - Hopefully fixed possibleActions for every case 
- better algorithm for looting artifacts, yet buggy
 2012-05-01 13:56:32 +00:00
DjWarmonger
2fbc57e140 1. Better way to disable stack / cursor glitches 
2. An attempt to handle looting artifacts after battle
 2012-05-01 08:52:22 +00:00
DjWarmonger
25bdcd3cab - Fixed wrong creature teleported 
- Support for Sacrifice
 2012-04-28 19:40:27 +00:00
DjWarmonger
f5e47474c5 - Fixed random crashes after creature spellcasting 
- Added dummy projectiles to Commanders
 2012-04-28 15:38:34 +00:00
DjWarmonger
192de453af - Fixed Remove Obstacle spell 
- Fixed freeze at Chain Lightning
 2012-04-28 15:18:21 +00:00
DjWarmonger
d6873d7570 - No battle actions will be available during tactics phase 
- Fixed moving stacks during tactics
- Fixed Genie spell targeting
- Fixed AI getting stuck at Tree of Knowledge when no resources
 2012-04-28 13:01:39 +00:00
Michał W. Urbańczyk
b0371597cd A better tweak. 2012-04-24 19:11:23 +00:00
Michał W. Urbańczyk
482051eb17 Tweaks for obstacles. 2012-04-24 05:16:04 +00:00
Michał W. Urbańczyk
7dc0d6878e Rewritten battle obstacles. New file for lib: CObstacleInstance.cpp. 
Now obstacles should be placed exactly like they were in OH3. 
All problems with displaying obstacles in battlefield should be gone. They should be now matched to the single pixel. 
If there are still some discrepancies, please report them.
 2012-04-23 19:56:37 +00:00
DjWarmonger
81e74f8c33 - Config settings & parsing for Commanders. 
- Fix for Regeneration icon
 2012-04-22 13:28:46 +00:00
Michał W. Urbańczyk
017013a5a4 Throwing runtime_errors instead of string (or even char*) objects. 2012-04-22 07:32:45 +00:00
Ivan Savenko
fef876e1ec - fixed #934 (batte screen after changing resolution) 2012-04-19 21:21:11 +00:00
DjWarmonger
cd1a9414ac - Restored Genie random spell 
- Fixed crashes in many strange creature-spellcasting scenarios, including stack with multiple cast abilities and Enchanter with non-stadard spell
 2012-04-18 15:57:49 +00:00
DjWarmonger
05311dd30c - Fixed and simplified Teleport casting 
- Stack artifacts will now not be wearable by hero (by default)
- Fixed crash involving clone
 2012-04-18 13:24:18 +00:00
DjWarmonger
f9dff013eb Fixes for battle interface, including #932. Basic funtionality is restored. 2012-04-18 09:01:08 +00:00
DjWarmonger
f720038ca5 - Battle interface fixes. It's possible to move stacks & attack 
- Creature window allows to pass stack artifact to hero
- Fixes for Mana Drain, including #916
 2012-04-17 14:50:23 +00:00
DjWarmonger
294276ea13 - Second part of battle interface. 
- Testing for Stack Artifacts feature.
 2012-04-17 08:46:09 +00:00
DjWarmonger
aeb9cf9460 - First part of battle interface rewrite. Untested. May work or not work randomly. 
- Tweaks for AI logging.
 2012-04-16 17:12:39 +00:00
Ivan Savenko
66f5b5e2d7 - gcc compile fixes 2012-04-14 16:28:36 +00:00
Michał W. Urbańczyk
6ec3501909 Fixed #927. 2012-04-14 07:39:32 +00:00
Michał W. Urbańczyk
722ec55384 Redid stack artifacts. Broken save compatibility. Added serializer support for boost::variant and sending CStackInstace* over network by implicitly passing IDs. Moved seeds and checksum to StartInfo. Various minor changes. 2012-04-14 02:20:22 +00:00
Michał W. Urbańczyk
8baec8b093 Implemented #715 (load game from sys options). Fixed #224. Minor improvements. 2012-04-09 02:53:50 +00:00
Michał W. Urbańczyk
f9f0fe9d97 Likely fixed #920. 2012-04-08 20:49:16 +00:00
Ivan Savenko
f426a48d09 - fixes for gcc-4.7 
- added missing virtual destructors (new warning from gcc)
 2012-04-08 10:34:23 +00:00
Michał W. Urbańczyk
d9064f4f7d Implemented #714 — restart functionality, including quick restart tweak (bound to CTRL+R). 2012-04-08 03:06:27 +00:00
Michał W. Urbańczyk
d6223dd137 Fixed #686. 
Minor changes.
 2012-04-08 02:29:11 +00:00
Michał W. Urbańczyk
9f6270a1f7 Fxied #306 and #856. 2012-04-08 02:14:20 +00:00
Michał W. Urbańczyk
b874295b3a Really fixed #918. 2012-04-08 01:43:40 +00:00
Michał W. Urbańczyk
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
Michał W. Urbańczyk
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
DjWarmonger
038d105bcc - first sketch of Commanders 
- accumulateBonus should make mechanics simpler
 2012-04-04 17:41:55 +00:00
DjWarmonger
2193f8912e - Framework of new battle interface 
- Minor fixes for AI
 2012-04-04 08:03:52 +00:00
Michał W. Urbańczyk
c61f536d8b * fixed remaining parts of #760 
* it's possible to switch active creature during tacts phase by clicking on stack
* a few minor fixes after handleHex rewrite
 2012-04-02 23:23:14 +00:00
Michał W. Urbańczyk
584b761d37 Fixed #917. 2012-04-02 11:38:59 +00:00
Michał W. Urbańczyk
7ccc78c757 Fized crash on attacking walls with Cyclop Kings. 2012-04-01 13:40:14 +00:00
Michał W. Urbańczyk
414a896dbd Fixed #890. 2012-03-30 23:39:44 +00:00
Michał W. Urbańczyk
a9af0da0ab Rewritten handling mouse movement over hex and l-clicking hex into one procedure. That way the tooltip and cursor are always accurate, because they're set by the same routing that selects action. Having that logic duplicated in two methods was unmaintainable. [though the new one is still monstrous...] By the way fixed numerous issues, including: 
* #785 and parts of #760
* first aid tent can heal only creatures that suffered damage
* war machines can't be healed by tent
* creatures casting spells won't try to cast them during tactic phase
* console tooltips for first aid tent
* console tooltips for teleport spell
* cursor is reset to pointer when action is requested
* fixed a few other missing or wrong tooltips/cursors

Implemented opening creature window by l-clicking on stack. Master Genie's spell is picked by server, not client.
Minor changes.
 2012-03-30 21:36:07 +00:00
Michał W. Urbańczyk
c698181c4c * simple mechanism for detecting desync after init 
* moving stacks in tactics phase won't affect stack queue  (part of #760)
* moved all boost headers in server to PCH
 2012-03-27 20:08:54 +00:00
Michał W. Urbańczyk
7b7ddf987a Fixed #909. 
Minor fix in using requestActionASAP (capture by val).
 2012-03-26 11:38:51 +00:00
Michał W. Urbańczyk
13f26fc3cb * Client is able to await for answers for multiple queries at the same time 
* Hackish solution allowing AI undertaking actions from event-handling thread
* Fixed crash when death stare or acid breath activated on stack that was just killed
* minor fixes
 2012-03-25 22:46:14 +00:00
DjWarmonger
7e4855c271 Quick fix for #910. 2012-03-12 15:00:32 +00:00
Michał W. Urbańczyk
6db3c5bc7e * VCAI: can't request actions from action handling thread 
* Save game screen and returning to main menu will work if game was started with --start option
* GUI controls can selectively capture keyboard events. CTextInput won't capture Enter. Fixes #654.
 2012-03-11 16:29:01 +00:00
DjWarmonger
88e9dec974 Fixed Thieves Guild window showing for all players. 
It needed 11 files modified... :/
 2012-03-07 14:05:54 +00:00
Michał W. Urbańczyk
d0e259864e * Replaced boost::shared_ptr with std::shared_ptr. 
* Brought shared_ptr and unique_ptr and their factories (make_shared, make_unique) to the global scope. 
* Removed excessive usage of shared_ptr in bonus system interface. 
* Fixed bonus system limiters/caching interactions. That covers #823, #859 and a number of rare edge-cases. 
* Implemented multiple-step limiters applying, fixing hasAnotherBonusLimiter  and allowing transitional dependencies between bonuses. 
* Bonus system should be slightly faster, since we cache limited bonuses. Some rare usages (limiting query against a foreign node) however can't use caching.
 2012-03-06 16:59:55 +00:00
Michał W. Urbańczyk
77b13404c0 Fixed #888. 2012-03-01 13:36:58 +00:00
Michał W. Urbańczyk
a833cbd308 Fxied #887. 2012-03-01 11:57:38 +00:00
DjWarmonger
18b1b83c8a Fixed creatures casting aimed spells at dead stacks. 2012-02-29 13:47:57 +00:00
Michał W. Urbańczyk
f2642cb62c Added VCAI and EmptyAI to the VS solution. Removed from it GeniusAI. 
Fixed #329, #884, #885.
 2012-02-29 01:31:48 +00:00
Ivan Savenko
9ce3c78387 - fix for compilation with gcc-4.5 
- fix for #881
 2012-02-28 11:26:08 +00:00
Ivan Savenko
2018fc09a4 - fullscreen config option will take effect immediately 
- fixed bug with highlightable buttons
- added several missing spells sounds
 2012-02-24 20:41:14 +00:00
Michał W. Urbańczyk
4f182744e7 * Fixed in game scenario info and save game screens 
* AI will now use tlog6 (teal color) for logs
 2012-02-22 19:22:11 +00:00
Michał W. Urbańczyk
3546c7841a * Possibly fixed #870 
* Fixed crash after catapult successfully destroyed one of turrets (stack queue wasn't properly updated)
 2012-02-22 17:43:59 +00:00
Michał W. Urbańczyk
37d3bea0a9 Missing part of fix for #871. 2012-02-22 14:38:40 +00:00
Michał W. Urbańczyk
d9a78ff1ce * fixed #871 
* dead stacks won't be also shaded as possible targets
 2012-02-22 14:31:53 +00:00
Michał W. Urbańczyk
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
Ivan Savenko
354b9e7fb3 - fixed #793 and #865 
- fixed #866 but may result in performance decrease
- (deb) removed vcmi-doc package
 2012-02-21 14:08:42 +00:00
Michał W. Urbańczyk
5afa5cfb54 * fixed #863 — all members of team will receive notification about FoW change 
* fixed #486 
* removed reference to a deleted file from lib VC project file
 2012-02-20 21:01:54 +00:00
DjWarmonger
5e14d17ed3 Fixes for r2543. 2012-02-20 09:50:49 +00:00
DjWarmonger
444b59d478 1. Fixed #843 
2. Refactoring for battle console hoover texts
3. Clone should work only for creatures of certain tier. However, ALL creature immunities stopped working in the meantime. Looking for an earlier bug.
 2012-02-20 08:19:03 +00:00
Michał W. Urbańczyk
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
DjWarmonger
5c86d32903 Cloned stack dissapear when killed. 
Fixed #864
 2012-02-18 17:39:47 +00:00
Michał W. Urbańczyk
0867451f26 Fixed path issues: #491, #834, #845. 
Fixed AI crash when enemy hero was teleported onto tile not visible for AI.
 2012-02-18 14:59:37 +00:00
Ivan Savenko
d1d21b16dc - replaced auto_ptr with c++11 unique_ptr 2012-02-17 20:34:34 +00:00
Michał W. Urbańczyk
1abf089bc7 Missed fixed for #858 (TortoiseSVN tricked me...) 
Fixed #852.
 2012-02-16 21:46:28 +00:00
Michał W. Urbańczyk
4baf4e13ed * fixed #857 and #858 
* fixed crash when AI attacked player before his first turn
* fixed various crashes when mass-effect spells affected town turrets in sieges
* some refactoring around spell positiveness
 2012-02-16 21:19:07 +00:00
Ivan Savenko
0c3e88226f - (linux) replaced Genius with VCAI 
- gcc set to c++0x mode
- most of gcc warnings fixed
- replaced boost::assign with initialization lists (if available in compiler)
- new cheat code: vcmiarmenelos - build everything
- updated linux readme
- minor fixes, applied patch for #98
 2012-02-16 17:10:58 +00:00
Michał W. Urbańczyk
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
DjWarmonger
c724092028 Partial support for Clone spell. 2012-02-10 13:13:24 +00:00
DjWarmonger
9e5fcc3152 Stack artifact backup. 
Still doesn't serialize properly, though.
 2012-02-10 10:32:21 +00:00
DjWarmonger
2bddf29cbf Stack artifacts part 2, not working yet. 2012-02-04 16:34:29 +00:00
DjWarmonger
b8a5d0d430 Stack artifacts - part 1 2012-01-30 16:07:52 +00:00
DjWarmonger
56c56f81e3 Fixed #849. Fixed buying artifacts for free. 
Minor tweaks.
 2012-01-28 11:42:15 +00:00
DjWarmonger
1cbd7e94e4 - Extended cap or removed sign for some values that may potentially overflow 
- Fixed #851
 2012-01-26 16:48:53 +00:00
Ivan Savenko
dbc603b7d7 - fixed crash on opening spellbook during enemy turn 
- fixed last known localization issue (bank configs)
- diplomacy and new weeks\month mechanics should be identical to H3
- minor fixes
 2012-01-19 14:33:22 +00:00
DjWarmonger
ba646b1d41 Compile fix for #847 2012-01-12 20:41:32 +00:00
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