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,412 Commits 19 Branches 62 Tags 112 MiB
c43b218d64
Commit Graph

4412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DjWarmonger
3f49860d13 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-09-05 15:59:29 +02:00
Ivan Savenko
b551bdb725 Final part of the merge 
Merging VCMI Dirs refactoring + GUI refactoring with current develop
 2014-09-04 20:59:07 +03:00
Ivan Savenko
025ed08391 Merge branch 'karol57-develop' into develop 2014-09-04 20:29:58 +03:00
Ivan Savenko
de9c5b1af7 Merge branch 'develop' of github.com:karol57/vcmi into karol57-develop 2014-09-04 20:29:24 +03:00
Ivan Savenko
7947329a02 Merge pull request #32 from xyzz/update_gitignore 
Updated .gitignore to include cmake/cotire/Qt stuff
 2014-09-04 20:26:41 +03:00
Ivan Savenko
1647b3670c Merge pull request #35 from rhn/rhn 
Fixes to sound handling.
 2014-09-04 20:26:32 +03:00
Ivan Savenko
0e2cc54252 Merge pull request #38 from josch/vcmiserver-handle-options-first 
let vcmiserver handle commandline options first
 2014-09-02 20:33:59 +03:00
Ivan Savenko
7158b87d71 Merge pull request #37 from josch/use-system-minizip 
use system version of minizip, if available
 2014-09-02 20:33:20 +03:00
karol57
864fa0388f Android fix 2014-09-02 19:18:47 +02:00
josch
2e6e026645 let vcmiserver handle commandline options first 
The vcmiserver application will first try to initialize various things
before parsing the commandline arguments. This leads to the program only
outputting an initialization error when it cannot initialize instead of
parsing arguments like --help. This patch moves the argument parsing to
earlier in program execution to avoid this behaviour.
 2014-09-02 18:42:38 +02:00
josch
9bef590960 use system version of minizip 2014-09-02 17:00:20 +02:00
DjWarmonger
fe922605ce Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-09-01 10:37:03 +02:00
DjWarmonger
0edaf4fa8a Merge pull request #26 from vcmi/FFMpeg 
Let's do this, way too many branches running now.
 2014-09-01 10:35:30 +02:00
Karol
b2a140149c Minor fixes #2 
- ChangeLog update
- Updated code for other platforms in CGameInterface
 2014-08-31 23:02:52 +02:00
DjWarmonger
8b10f70afd Migrating to MSVS 2013, which allows to delete inttypes.h file. 2014-08-31 19:08:39 +02:00
Karol
80998b9dc3 Minor fixes. fix 
- Brrr... VS is idiotproof.
 2014-08-30 19:08:04 +02:00
Karol
3f720901ec Minor fixes. 
- Removed unnecessary keywords.
- Inlined some functions.
- Minor coding style fixes.
- Minor fixes.
 2014-08-30 18:45:11 +02:00
Karol
37bd4790f7 VCMIDirs update #6 fix 
- Apple compilation fix
- Removed unnecessary macros
- Updated macros indent style
- Fixed 1. warning.
 2014-08-30 15:04:00 +02:00
Karol
53ab0593b7 VCMIDirs update #6 
- Minor fixes
- CLoadFile updated to boost::filesystem::path
 2014-08-27 12:31:58 +02:00
Karol
a34d148fa3 VCMIDirs update #5 fix 2 
- Linux compilation fixes
 2014-08-26 15:29:56 +02:00
Karol
1b6f2ea3b7 VCMIDirs update #5 fix 
- Updated old OS detect macros.
- Fixed 1 misspell.
 2014-08-26 12:19:04 +02:00
Karol
958839668c VCMIDirs update #5 
- Minor fixes
- string based paths -> boost::filesystem::path paths (I hope it's
final)
- New user data path on windows
- New moving dir method on windows.
 2014-08-21 22:26:28 +02:00
Ivan Savenko
69c6a3fa79 Fixed crash on visiting multi-creature dwellings (1874) 2014-08-19 13:16:25 +03:00
Ivan Savenko
7e05945a6a Swapped skills on level-up screen 2014-08-19 13:15:40 +03:00
Ivan Savenko
ecc705c8b7 Fixed guardians of dragon hive, fixes 1871 2014-08-19 12:09:52 +03:00
DjWarmonger
94832c743c Updated build configs. Everything works. 2014-08-14 16:07:40 +02:00
DjWarmonger
6656515395 Updated Visual for FFMPEG. Need to define environmental variable FFMPEGDIR for it to compile. Not functional yet, though. 2014-08-13 19:21:58 +02:00
DjWarmonger
2c91a10dcd Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-08-13 07:50:41 +02:00
Karol
2da6d9e7dd VCMIDirs update #4 fix 2014-08-11 21:24:31 +02:00
Karol
c16e7d4bcf VCMIDirs update #4 
Added stderr color handling
Updated logger to use boost::filesystem::path. Minor fixes.
Some classes are now structs.
 2014-08-11 20:17:17 +02:00
Ivan Savenko
e692f3f520 Implemnted enemy turn speed selection: 
- implemented switch in settings screen
- implemented "0 speed", animation-free. *may* also work for player-owned heroes
- removed no longer used creature window switch
 2014-08-11 19:16:39 +03:00
Ivan Savenko
8838607669 Trying to fix Travis compilation issues 2014-08-11 17:58:41 +03:00
Ivan Savenko
cc61ffca73 Removed debug output 2014-08-11 17:27:41 +03:00
Ivan Savenko
092df7a71c Fixed crash on stack-less creatures, e.g. war machines 2014-08-11 16:28:15 +03:00
Ivan Savenko
4092929b70 Fixed endianness 2014-08-11 16:21:23 +03:00
Ivan Savenko
8f1a4fcb56 Fixed crash on opening creature window in battle 2014-08-11 15:57:15 +03:00
Karol
a302f6c7ad VCMIDirs update #3 
bfs = boost::filesystem;
- Updateting filenames (std::string -> bfs::path) #1
- Added platform detection, and some specyfic boost::filesystem includes
to Global.h
- Updated CBasicLogConfigurator. Now class uses bfs::path pathes.
 2014-08-10 23:42:39 +02:00
Ivan Savenko
a115406fa3 Fixed data presence check 2014-08-10 10:58:56 +03:00
Karol
5d5db77fc9 VCMIDirs update #2 fix 2014-08-09 20:22:24 +02:00
Karol
8eb1721050 VCMIDirs update #2 
Changet to tree model based on classes
 2014-08-09 19:54:12 +02:00
Karol
ebc8c9d077 VCMIDirs update #1 
- Class VCMIDirs is now deprecated.
- VCMIDirs now is an namespace, not an singletone.
- VCMIDirs uses now boost::filesystem::path, not a std::string.
 2014-08-09 17:22:37 +02:00
Karol
fd9aae60f1 Merge pull request #1 from vcmi/develop 
Update from original
 2014-08-09 17:17:01 +02:00
Ivan Savenko
1e5e02c7df Compilation fixes caused by merge, replaced some remaining boost::bind with std's 2014-08-09 15:14:31 +03:00
Ivan Savenko
b1285bc506 Merged GUI refactoring into develop, fixed conflicts 2014-08-09 15:01:55 +03:00
Ivan Savenko
c0e4591bc7 Added workaround for random objects on water, fixes 1828 2014-08-09 13:48:38 +03:00
Ivan Savenko
05d8fad314 Miscellaneous fixes to banks: 
- fixed evaluation of bank thread by AI (1850)
- fixed crash on evaluating bank threat after loading from save (1830)
- fixed typo in bank config. TODO: schema?
 2014-08-09 12:31:43 +03:00
Ivan Savenko
f55d335e1c Fixed visitable objects resetting on day 7 (1847) 2014-08-08 15:53:04 +03:00
Ivan Savenko
66c4d469f8 Possible fix for neutral palette (1867) 2014-08-07 19:53:07 +03:00
Ivan Savenko
d1dd7eef48 Proper fix for #1712 - Building requirement tests are now fixed 
- added minimize() method in logical expressions that will remove excessive elements
- replaced forEach() with morph() that allows replacing types in variant
 2014-08-07 19:53:07 +03:00
Ivan Savenko
4d6ab2c32d Fixed rendering of bitmap fonts shadow 2014-08-07 19:53:07 +03:00