Commit Graph
100 Commits
Author SHA1 Message Date
Frank Zago b853df76ba Consolidated crerefnam.txt, monsters.txt, cr_factions.txt, cr_upgrade_list.txt, CREDEFS.TXT, cr_shots.txt and cr_to_turret.txt into creatures.json 2011-08-20 21:53:03 +00:00
Frank Zago 81e50c9f2b Convert hero portraits config file to json. 2011-08-20 18:46:52 +00:00
Frank Zago 233ce7d6e3 Merge buildings3.txt into buildings.json. 2011-08-20 16:03:27 +00:00
Frank Zago 8fa540b4da Add building blit priorities in the json building file. Reorganized building coordinates processing code a little. 2011-08-20 06:08:48 +00:00
Frank Zago 6bbccaa76d Convert the buildings coordinates into a json file. 2011-08-20 04:48:23 +00:00
Frank Zago b3a3cabd5b Moved the starting ressources into a json file. 2011-08-20 02:53:57 +00:00
Frank Zago 3519cca2c9 Moved the spell sounds into a json file. 2011-08-20 01:57:03 +00:00
Frank Zago cf1d179acf Store battle fields sounds in a json file instead of a text file. 2011-08-20 01:15:37 +00:00
Frank Zago f6c39eed0c Added a new json constructor to read from a file. 2011-08-20 01:04:59 +00:00
Frank Zago c1ffe738f0 Load sound file from 2nd CD. 2011-08-07 21:37:07 +00:00
Frank Zago 2cc80e1267 Modified CMediaHandler to handle more than one file. 2011-08-07 19:14:46 +00:00
Frank Zago 56bf3dc8ab Replaced io_service()) with get_io_service(). Fixes bug #780. 2011-08-04 23:49:32 +00:00
Frank Zago 18a376696d Support for newwer libavformat API. Patch from exine, bug #779. 2011-08-04 22:12:53 +00:00
Frank Zago 5eab8339d0 Someone likes to put semicolons in the wrong places. Fixed. 2011-07-28 00:38:19 +00:00
Frank Zago 20574dea3d Added missing initializations. 2011-07-21 02:39:37 +00:00
Frank Zago 9c3a10b2c7 Fixed a bug in phoenix code. Fixed a couple warnings. 2011-07-09 22:42:39 +00:00
Frank Zago 7c9c939675 (linux) autoconf update for the new scripting directory. 2011-06-21 02:35:23 +00:00
Frank Zago f99d0bf966 (linux) autoconf update for the new scripting directory. 2011-06-21 02:34:11 +00:00
Frank Zago 129c9d521e Warning fixes + typo. 2011-06-18 23:56:48 +00:00
Frank Zago 4b7d0f3092 Partial integration of Android patches, from Pelya. 2011-06-15 02:15:05 +00:00
Frank Zago 14efb9fd13 Warning fix. 2011-06-15 01:36:36 +00:00
Frank Zago 415b142522 (linux) configure fix. 2011-06-15 01:35:25 +00:00
Frank Zago b471c10149 Compile fix, from Pelya. 2011-06-14 13:22:00 +00:00
Frank Zago eecb470e74 Fixed all warnings "take address of temporary". 2011-06-11 04:54:41 +00:00
Frank Zago 78b5e11b93 Compile fix. 2011-06-10 12:49:31 +00:00
Frank Zago bf9f0beb01 (linux) configure fixes. 2011-06-09 23:41:52 +00:00
Frank Zago f9a5cf430f (linux) set LIBS and CFLAGS before testing for sdl and ffmpeg presence. 2011-06-07 03:10:37 +00:00
Frank Zago aca118b613 Fixed creature bonus parser. Fixed several uninitialized variables. Updated data build script to v0.85. 2011-06-03 03:23:50 +00:00
Frank Zago 4d699d735c Added test for presence of the SDL headers. 2011-06-02 01:26:56 +00:00
Frank Zago ff49b852df Silenced several "warning: suggest parentheses around ‘&&’ within ‘||’": added some parenthesis, optimized a couple statments and fix a bug in another. 2011-05-30 19:20:14 +00:00
Frank Zago b11981293f Compile fix. 2011-05-28 05:09:06 +00:00
Frank Zago 4af4f0a707 Compile and warning fixes. 2011-05-27 22:34:58 +00:00
Frank Zago abc0d3537e Some compile fixes. 2011-05-27 13:49:18 +00:00
Frank Zago c6498d0af2 Updated data build script to 0.84. 2011-05-14 15:25:18 +00:00
Frank Zago 2bcba53a5d (linux) compile fix. 2011-05-12 01:39:37 +00:00
Frank Zago c165593896 (linux) added new files into the makefiles and compile fixes. 2011-05-10 01:15:10 +00:00
Frank Zago 98577e402f av_free_packet is a library call. Don't reproduce its code here. 2011-05-04 03:42:09 +00:00
Frank Zago f7a4bb906c Several minor cleanups. 2011-05-04 02:38:58 +00:00
Frank Zago 91dc7a0dd4 Include proper boost header. 2011-05-04 02:37:27 +00:00
Frank Zago c46f3da9ab Fixed potential NULL dereference. 2011-05-04 02:35:44 +00:00
Frank Zago 0c3f3c67a9 Callback naming fix. 2011-05-04 02:32:35 +00:00
Frank Zago 5795334eec Added missing throw(). 2011-04-09 19:10:29 +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
Frank Zago b0cecac5c9 (linux) Use avcodec_decode_video when avcodec_decode_video2 is not present. Updated vcmi version number. 2011-04-08 04:21:41 +00:00
Frank Zago 29ea089e47 Use newer m4 macros to detect libboost. This should fix the lib64/ issue seen on OpenSUSE. 2011-04-08 03:30:20 +00:00
Frank Zago 69364b5b60 Various gcc compile fixes, and updates to linux code. 2011-04-07 02:16:32 +00:00
Frank Zago 66c05ddcff Some gcc/linux fixes. 2011-03-17 03:56:36 +00:00
Frank Zago 9bd484a6de gcc compile fix. 2011-03-13 16:06:20 +00:00
Frank Zago 872a057aa7 Fixed bad prototype. 2011-01-29 19:07:49 +00:00
Frank Zago 92f1fbd825 (linux) Update version to 0.83. 2010-11-02 01:38:26 +00:00
Frank Zago dbe38a7062 A few bug fixes and arious warning fixes: unused code/variables, out of order initializations, ... 2010-10-30 21:53:41 +00:00
Frank Zago 1406f89093 (linux) config update to support clang. 2010-10-30 21:51:28 +00:00
Frank Zago 3b0f0a7a4e Reverted rev 1822 2010-10-27 02:01:12 +00:00
Frank Zago 9c3df38517 Updated debian files. 2010-10-27 02:00:25 +00:00
Frank Zago b1636fd920 Fix for file found in directory, but not in in LOD archive. 2010-09-05 16:33:19 +00:00
Frank Zago 24218eba67 Updated build to v0.82b. 2010-09-05 16:31:11 +00:00
Frank Zago 246043008f Updated for v0.82. 2010-09-05 16:30:25 +00:00
Frank Zago 4b8be22fb6 Several compile/link fixes. 2010-09-04 14:47:39 +00:00
Frank Zago 205126e7e6 Debian packaging update. 2010-08-21 01:00:54 +00:00
Frank Zago e252c2d06c Build files update. 2010-08-21 00:41:40 +00:00
Frank Zago c84c9cb481 Fixed a few warnings. 2010-08-21 00:39:37 +00:00
Frank Zago 29045f5c0f Compile fix. 2010-08-21 00:37:19 +00:00
Frank Zago 904f764628 Compile and warning fixes. 2010-08-06 02:47:43 +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
Frank Zago 3d7e3e4acf Compile fix. 2010-08-03 03:03:57 +00:00
Frank Zago ac54784e55 (linux) bumped to version 0.82. 2010-08-01 23:23:37 +00:00
Frank Zago 686061071f Compile fix. 2010-07-30 02:08:53 +00:00
Frank Zago 7078d2caf5 (linux) scripts updates to current revision. 2010-07-17 22:55:17 +00:00
Frank Zago 48b5e7c458 (linux) Updated revision to 0.81b. 2010-07-17 22:54:37 +00:00
Frank Zago c9439b1621 Removed some c++0x extensions. 2010-07-17 22:53:04 +00:00
Frank Zago eecfa0f2bd (g++) Compilation fixes. 2010-07-17 01:19:16 +00:00
Frank Zago 57b4bc6c67 (gcc) disable signedness warnings. There's just too many of them. 2010-06-29 01:58:31 +00:00
Frank Zago 9544b5c13e Include assert.h since assert is used. 2010-06-29 01:48:12 +00:00
Frank Zago df151cceba Various compile and warning fixes. 2010-05-12 02:32:56 +00:00
Frank Zago e3af43fb48 Updated debian package files. 2010-04-11 05:56:41 +00:00
Frank Zago c331aaf2f4 Updated makefiles. 2010-04-07 03:42:59 +00:00
Frank Zago d2d076cd23 Added command line parser. 2010-04-03 22:06:50 +00:00
Frank Zago ca8e2ba80f Added CCreatureSet.(cpp|h) 2010-04-03 21:40:51 +00:00
Frank Zago 127408e379 std::sqrt needs cmath. 2010-04-03 03:39:00 +00:00
Frank Zago 2641fd4299 (linux) update to version 0.8. 2010-03-02 02:28:41 +00:00
Frank Zago 3459819a8f Compile fix. 2010-02-27 15:59:21 +00:00
Frank Zago a6aa36c5a9 Compile and warning fixes. 2010-02-16 05:01:15 +00:00
Frank Zago 68a9de5ab7 Partial port to SPARC Linux. 2010-02-11 05:25:17 +00:00
Frank Zago ad65664914 Added HeroBonus to makefiles. 2010-02-10 05:49:23 +00:00
Frank Zago ba80ba4f6e Compile fix + updated makefile. 2010-02-09 02:17:38 +00:00
Frank Zago 090cc602b6 Fixed buildings parsing. 2010-02-06 18:46:25 +00:00
Frank Zago 9bfe9c476d g++ chokes on contains2, but since it's unused ... 2010-02-05 00:47:14 +00:00
Frank Zago cf03071de5 g++ compile fix. 2010-02-01 05:45:44 +00:00
Frank Zago 7c9f0eb19f Compile fix. 2010-01-27 05:11:31 +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
Frank Zago 7affd71443 (linux) Saved games are not in the data directory. 2010-01-25 03:09:42 +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
Frank Zago 39ad6b0270 Only include SDL_syswm.h on Windows. 2009-12-03 04:01:14 +00:00
Frank Zago f252b58f96 Commented out unused code. 2009-11-21 18:04:09 +00:00
Frank Zago 6b5feb63e6 Implemented "main menu" in-game option. 2009-11-01 01:15:16 +00:00
Frank Zago c78d48473b (linux) Disable the console. It's just too broken. 2009-10-31 22:55:05 +00:00
Frank Zago 7a6f1a383a Free now uninitialized std::map in CPlayerInterface::~CPlayerInterface. 2009-10-31 16:43:12 +00:00
Frank Zago fe80e8b553 Fixed some typos. 2009-10-31 16:33:11 +00:00
Frank Zago 359ca49f26 (gcc) Fixed some warnings. 2009-10-31 16:32:18 +00:00