games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity
2,482 Commits 19 Branches 62 Tags 111 MiB
13f26fc3cb
Commit Graph

215 Commits

Author SHA1 Message Date
Frank Zago
129c9d521e Warning fixes + typo. 2011-06-18 23:56:48 +00:00
ozsy1023
671e7bc3ec Modified and added some functions in BattleHelper.cpp. 2011-06-09 13:23:38 +00:00
Frank Zago
4af4f0a707 Compile and warning fixes. 2011-05-27 22:34:58 +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
Frank Zago
0c3f3c67a9 Callback naming fix. 2011-05-04 02:32:35 +00:00
Michał W. Urbańczyk
b4144dc616 Callback jugglery, part 1. 
Fixed #252.
 2011-05-03 03:14:18 +00:00
Michał W. Urbańczyk
d092eaf9d1 Artifact Merchant: selling artifacts. Messy, but completes H3 town structures functionalities. 
BTW updating screen after closing marketplace is broken.
 2011-04-22 21:51:10 +00:00
Frank Zago
ecb3508690 (linux) Added configure test for the icc and clang compilers, and set some extra parameters for them. 2011-04-09 17:28:51 +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
Michał W. Urbańczyk
4d3776058d My project files for VC10. 2011-03-17 23:06:48 +00:00
Michał W. Urbańczyk
a382b641b7 Removing old, VC9 project files. 2011-03-12 22:53:52 +00:00
Ivan Savenko
a2f512813f - gcc compile fixes 
- fixed locale issue
- Makefiles for StupidAI
- fix for #671 (not tested)
- linux readme update, including #598
 2011-02-28 15:14:26 +00:00
mateuszb
13af78edca * unnecessary arguments removed 2011-02-26 17:34:23 +00:00
mateuszb
1dd05788c9 * fixed #53 2011-02-26 17:32:56 +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
Michał W. Urbańczyk
cab8f9e11d AI for neutral creatures and battles and player AIs can be different. StupidAI will handle neutrals by default. 
Fixes for issues with deserialization and handling Tactics secondary skill.
 2011-02-23 03:57:45 +00:00
DjWarmonger
9d313d3d2c Minor fixes and tweaks. 2011-02-22 14:23:09 +00:00
Michał W. Urbańczyk
2f9ed138f6 Tactics more or less working (some improvements still needed, as proper updating battle GUI). 2011-02-14 20:31:53 +00:00
DjWarmonger
125f39275d Compile fix for previous commit. 2011-02-06 17:37:51 +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
31fc8f6db3 Merged Warmonger's changes from trunk 2011-02-06 08:32:05 +00:00
DjWarmonger
78fc212489 A little more work on Expert System. 2011-02-05 18:24:32 +00:00
DjWarmonger
094bb6fd8f Moving some work in progress from one computer to another. It shall not explode. 
Fixed video issue from #670.
 2011-02-01 18:10:43 +00:00
Frank Zago
872a057aa7 Fixed bad prototype. 2011-01-29 19:07:49 +00:00
Michał W. Urbańczyk
f52d4f7cd6 Merged changes from trunk. 2011-01-15 02:35:46 +00:00
mateuszb
56ec829049 * minor refactoring 
* minor improvements in battle interface
 2011-01-09 17:41:46 +00:00
Michał W. Urbańczyk
c1bd81abdd Mostly fixed battle animations. 
Added proper ending for duel mode.
 2011-01-08 19:38:42 +00:00
Michał W. Urbańczyk
a53ec23556 Stupid AI is capable of winning / losing battle. 2011-01-08 18:33:40 +00:00
mateuszb
957f1764d7 * some progress in StupidAI 
* refactoring of battle handling
WARNING: strange crash on entering battle
 2011-01-07 10:48:31 +00:00
Michał W. Urbańczyk
471c23ba71 Compile fixes, more work on new artifact system. 2010-12-26 14:34:11 +00:00
mateuszb
b3fd14b524 * splitted CGameState into general game state and battle game state 
* added missing fields to serialize in CHero
 2010-12-25 19:23:30 +00:00
Michał W. Urbańczyk
a82469a205 Ooops. Some obvious corrections to previous commit. 2010-12-25 01:48:02 +00:00
Michał W. Urbańczyk
2cf6729eee Towards duel support. 2010-12-25 01:43:40 +00:00
Ivan Savenko
3d9dc0642d - gcc compile fixes 
- corrected projectiles for some units
 2010-12-24 15:37:48 +00:00
mateuszb
4929cf9782 * enum for secondary skills 
* THex for battle positions
* towards removal of battleGetStackByID

TODO:
investigate the necessity of putting implementation of BattleAction CGlobalAI::activeStack( const CStack * stack ) in CGeniusAI.cpp
 2010-12-23 20:18:10 +00:00
Michał W. Urbańczyk
2fe8b07f4f Little more development for duel mode. 2010-12-23 00:33:48 +00:00
Michał W. Urbańczyk
cde0e8933f Moved StupidAI to AI/ subfolder. 2010-12-22 22:23: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
Michał W. Urbańczyk
e677cd5b07 Merged r1880. 2010-12-11 20:30:33 +00:00
Michał W. Urbańczyk
69b97e0a51 Little more changes. 2010-12-09 23:10:28 +00:00
mateuszb
ad48681d91 * cleanup 2010-12-08 20:17:05 +00:00
Michał W. Urbańczyk
f020562570 Merged changes from trunk. 2010-12-05 23:26: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
mateuszb
6f56b5bb30 * a few more consts 2010-12-04 19:44:23 +00:00
mateuszb
efedb1a55a * minor cleanup 2010-12-04 19:15:20 +00:00
DjWarmonger
ea03273c8e Some work towards useful AI: 
-It is possible to toggle adventure AI on / off typing "ai" in the console (default is true)
-General cleaning and formatting of code
-Some minor optimizations
-Teal console log for AI

AI tends to hang in the maze of mutexes and current player interface, further investigation is needed.

Fixed #580
minor tweaks
 2010-11-28 16:39:13 +00:00
Michał W. Urbańczyk
7c3f3d20c3 Stacks #2 -> towards new system of stack operations. 2010-11-27 01:46:19 +00:00
Michał W. Urbańczyk
32ce20af15 Moving stack system to pointers, part #1 2010-11-22 00:34:46 +00:00
Michał W. Urbańczyk
9250cc8adf Separated CStack and CStackInstance. 2010-11-20 17:36:02 +00:00
DjWarmonger
67baa3d8e4 I hope that's final shape of universal Expert System, now it's time to add some functionality. 2010-11-13 19:25:21 +00:00
DjWarmonger
e2f4a60c4b A bit more metamagic for expert system. 2010-11-12 15:20:44 +00:00
DjWarmonger
6da5c8ee56 A framework for generic expert system, currently aimed at Bonus processing. 2010-11-11 21:01:35 +00:00
Frank Zago
e252c2d06c Build files update. 2010-08-21 00:41:40 +00:00
Frank Zago
fdad7e34e1 Remove line break in comment. 2010-08-04 03:33:10 +00:00
Frank Zago
006a7d1f11 serialID is gone. 2010-08-04 03:32:24 +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
DjWarmonger
695c862638 Support for creature damage bonus. 
TODO: display it in a creature window
 2010-07-16 06:18:41 +00:00
mateuszb
71b73bad53 * mostly working hero flying and water walking; support for artifacts: 
- Angel's Wings
- Boots of levitation
and spells
- fly
- water walk
 2010-05-16 13:42:19 +00:00
Frank Zago
df151cceba Various compile and warning fixes. 2010-05-12 02:32:56 +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
mateuszb
ac7bc76b7b * implemented first aid kit including first aid secondary ability 2010-03-07 17:40:33 +00:00
Michał W. Urbańczyk
0a950c508b Grail digging and construction. 
Minor fixes.
 2010-02-24 13:03:36 +00:00
Michał W. Urbańczyk
e6f31b7500 Compilation fixes for VC10. 
Changes towards hot-seat support.
 2010-02-20 13:24:38 +00:00
Frank Zago
3ec6cfd115 (linux) Meved version to 0.75 (at last) and regenerated the makefiles. 2010-01-25 03:19:55 +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
7f97a56a28 Fixed crash on casting spell. Fixed giving resources from towns. Version set to 0.74c. Incremented save format version. 
Disabled adventure AI. Will be released as dev build.
 2009-11-28 01:42:08 +00:00
red1939
f7a1b74092 Next batch of code clearing. 2009-11-01 20:13:12 +00:00
red1939
3f3c019784 Next part of AI code cleaning/reformatting. 2009-10-28 16:28:52 +00:00
red1939
ed9b75b447 First part of reformatting the code, renaming variables, rewriting tricky part. Basically making the code more readable, maintainable and ready for further additions. 2009-10-22 22:04:42 +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
4c458a7e47 Bumped version, restored AI and Cage. 2009-10-01 22:18:37 +00:00
Michał W. Urbańczyk
5073365eb9 Disable AI and Cage of Warlorlds for release (crashes) 2009-10-01 22:13:11 +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
a424032ec3 Bumped version to 0.73d, restored AI. 2009-09-20 13:22:47 +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
mateuszb
1a08772bc8 * reading of creature banks' names 2009-09-17 11:05:50 +00:00
mateuszb
c8ac6cf914 * certain improvements for animations in battles 
* obstacles won't be placed on battlefield when creature bank is attacked
 2009-09-11 12:46:26 +00:00
Frank Zago
a9617b3dfd Fixed prototype. 2009-09-10 14:06:28 +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
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
a4df8e8831 * partial support for arrow turrets 2009-09-04 14:11:42 +00:00
Frank Zago
f92b6fc2b6 Depending on the distros, ffmpeg headers aren't always installed in the same directory. Fix from Szpak. 2009-08-29 15:52:29 +00:00
Michał W. Urbańczyk
1f0a1bd771 More fixes. 2009-08-28 19:34:08 +00:00
Frank Zago
90c31d5cd5 Typo. 2009-08-28 00:27:25 +00:00
DjWarmonger
82ddb607e6 1.blocked critical AI call 
2.Yet another chapter of epic battle with creature banks
 2009-08-24 14:59:24 +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
Trevor Standley
f4743d2fc6 Various fixes. Temporarily replaced neural network's output with random number. 2009-08-21 18:18:52 +00:00
Trevor Standley
af1a55e063 More AI stuff. 2009-08-19 10:18:14 +00:00
Frank Zago
81109b3897 Added missing headers. 2009-08-19 05:01:25 +00:00
Frank Zago
a7b7b0a431 Add new files to makefiles. 2009-08-19 04:45:33 +00:00
Trevor Standley
a3b6bb4892 AI loads .brain file which contains a list of objects to visit and what features are necessary to determine how valuable that objective is. 
AI creates random neural networks and assumes that their outputs are trained values.
 2009-08-18 07:37:45 +00:00
mateuszb
49a142b92e * minor changes 2009-08-17 13:08:05 +00:00
DjWarmonger
dd91e7e406 1. Support for Pandora Box 
2. Improved functions handling experience. Now it works with values over 65K, but still didn't with event giving 99M exp
I have no idea what it has to do with AI though
 2009-08-16 15:39:18 +00:00
Frank Zago
69217ff217 Compile fix for g++. 2009-08-12 02:08:59 +00:00
Frank Zago
575840f641 Use amin instead of min. 2009-08-08 06:13:56 +00:00
Trevor Standley
3d93e0acf0 AI doesn't try to visit itself. AI doesn't try to visit OPW/OPH objects that have been visited. Soon AI will be able to learn priorities. 2009-08-07 08:41:40 +00:00
Trevor Standley
184676d7c4 AI now performs almost all basic operations. 
-builds buildings
-recruits creatures/heroes
-upgrades creatures
-moves heroes to random destinations.
-passes units to heroes/upgrades heroes' units
-attacks weaker parties
-and more.
 2009-08-06 09:59:33 +00:00
Trevor Standley
cd4d3e6db3 2009-08-06 09:52:07 +00:00