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,748 Commits 22 Branches 61 Tags 102 MiB
6658e173f1
Commit Graph

3748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DjWarmonger
6658e173f1 - Possible fix for #1769 
- Fixed all possible (even unexpected) crashes when AI looses active hero
 2014-05-18 13:13:31 +02:00
AlexVinS
0412fe29b0 Tweak absolute immunities for spells accordint to FizMiG 2014-05-18 11:25:09 +04:00
DjWarmonger
e074c9b310 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-05-18 09:00:32 +02:00
DjWarmonger
e2d44f6ac6 Fixed #868 - wrong battlefield in ship-to-ship combat 2014-05-18 08:52:03 +02:00
DjWarmonger
9f28e4e4ca Merge pull request #10 from Macron1Robot/works 
Bug 0001789 correction (incorrect battle field detection)
 2014-05-18 08:26:36 +02:00
Macron1Robot
e4cbfe7f0b Bug 0001789 correction (incorrect battle field detection) 2014-05-18 03:16:53 +04:00
DjWarmonger
00c31b4b85 Fixed #1790 2014-05-17 21:30:55 +02:00
AlexVinS
9dad229440 Fix #1737 2014-05-17 16:07:19 +04:00
DjWarmonger
573293d425 Merge pull request #9 from alexvins/issue/1763 
Try to fix #1763 and a small refactoring
 2014-05-17 10:35:28 +02:00
AlexVinS
5be005ee36 Try to fix #1763 and a small refactoring 2014-05-17 11:24:26 +04:00
DjWarmonger
1ea6723a32 Merge pull request #8 from xyzz/android-rolling 
Android port.
 2014-05-17 05:17:54 +02:00
Ilya Zhuravlev
db7cd79cf7 Android port. 
Conflicts:
	lib/vcmi_endian.h
 2014-05-16 23:24:29 +04:00
DjWarmonger
52f92a0190 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-05-16 19:33:09 +02:00
DjWarmonger
6ab0039053 Fixed #1600 - incorrect specialty of Saurug 2014-05-16 19:27:01 +02:00
beegee1
80765eb0a3 - fixed clang compiler warnings (detects now unused constant vars) 2014-05-16 19:22:21 +02:00
DjWarmonger
a9b3a03bdd Fixed #1670 - Mirth working on immune creatures 2014-05-16 12:47:09 +02:00
DjWarmonger
eb337d7407 Fixed #1638 - spells banned in map settings appeared in town guild 2014-05-16 12:15:35 +02:00
Ivan Savenko
ccc5c69fa2 Merge pull request #7 from xyzz/fix_ifdef_linux 
Replace defined(linux) with __linux__/__linux/linux in vcmi_endian.h
 2014-05-14 22:45:01 +03:00
Ilya Zhuravlev
3c35b3eefe Replace defined(linux) with __linux__/__linux/linux in vcmi_endian.h 2014-05-14 09:49:25 +04:00
beegee1
60f6c00f2e Logging API: - removed unused method declaration - updated comments - ensured thread safety 2014-05-10 21:12:33 +02:00
AlexVinS
3e101d89ef few formatting. Mostly space-> tab 2014-05-07 03:58:58 +04:00
AlexVinS
1d7c63da57 Split spell config. 
It`s aready large and will grow more.
 2014-05-07 03:58:57 +04:00
stopiccot
667cc3b067 make download_dependencies.sh also build vcmibuilder 2014-05-02 17:02:55 +03:00
stopiccot
9996013946 changes xcode-pack url 2014-05-02 16:04:12 +03:00
stopiccot
0dff64bd9b shell script to automate downloading of OS X prebuilt dependencies 2014-05-02 15:55:34 +03:00
DjWarmonger
1dbc0c7177 Compilation fix. This will be released as VCMI 0.95b. 2014-05-02 12:19:50 +02:00
DjWarmonger
fb5152254d Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup 
Conflicts:
	client/CKingdomInterface.cpp
 2014-05-02 12:03:02 +02:00
DjWarmonger
9540f9e451 Merge branch 'develop' of https://github.com/vcmi/vcmi into WarmysBackup 2014-05-01 14:27:32 +02:00
AlexVinS
2947bdedfc [c::b] configure Test project dependencies 2014-04-30 22:09:26 +04:00
Macron1Robot
345df14d60 Update JsonDetail.cpp 
Replaced new JSON by previous version of JSON comitted by IvanSav and added video file test again
 2014-04-30 13:11:04 +04:00
Macron1Robot
9976fcc671 Update GUIClasses.cpp 
spaces change
 2014-04-29 22:25:30 +04:00
Macron1Robot
553613a165 Update tower.json 
Spaces issue
 2014-04-29 22:22:38 +04:00
Macron1Robot
791d8ad436 Update tower.json 
Spaces issue
 2014-04-29 22:21:06 +04:00
Macron1Robot
a67b3b31b4 Update fortress.json 
Tabs issue
 2014-04-29 22:19:34 +04:00
Macron1Robot
b642169b81 Update castle.json 
Tabs issue
 2014-04-29 22:19:01 +04:00
Macron1Robot
70013e709d Update tower.json 
Converted spaces to tabs
 2014-04-29 22:12:47 +04:00
Macron1Robot
1269cda6ae Update stronghold.json 
Converted spaces to tabs
 2014-04-29 22:12:07 +04:00
Macron1Robot
4a6c9c8d1d Update rampart.json 
Converted spaces to tabs
 2014-04-29 22:11:33 +04:00
Macron1Robot
cb0e47ac83 Update necropolis.json 
Converted spaces to tabs
 2014-04-29 22:10:53 +04:00
Macron1Robot
10c0bfaea9 Update inferno.json 
Converted spaces to tabs
 2014-04-29 22:10:29 +04:00
Macron1Robot
56109903fc Update fortress.json 
Converted spaces to tabs
 2014-04-29 22:10:03 +04:00
Macron1Robot
cc4dd6ede8 Update dungeon.json 
Converted spaces to tabs
 2014-04-29 22:09:37 +04:00
Macron1Robot
72573a23b2 Update conflux.json 
Corrected spaces to tabs
 2014-04-29 22:09:12 +04:00
Macron1Robot
98718c0e42 Update castle.json 
corrected spaces to tabs
 2014-04-29 22:08:46 +04:00
Macron1Robot
4a7a952590 Update faction.json 
Added videoFile format to tavernVideo property
 2014-04-29 21:55:35 +04:00
Macron1Robot
9494c6d335 Update JsonDetail.cpp 
Added video file existence check
 2014-04-29 21:53:50 +04:00
Macron1Robot
fd1640f931 Update GUIClasses.cpp 
Removed excessive check for tavernVideo string
 2014-04-29 13:06:55 +04:00
Macron1Robot
cd7ec5716f Update CObjectHandler.cpp 
Changed type of "for" variable to auto in dailyIncome
 2014-04-28 23:23:24 +04:00
Macron1Robot
558b155c0e Update CTownHandler.h 
Removed definition of unnecessary type
 2014-04-28 23:18:56 +04:00
Macron1Robot
324bb3c98d Update CModHandler.h 
Returned type of loadConfigFromFile back to void
 2014-04-28 23:17:24 +04:00