90f2cde | Max Horn | 01 June 2011, 13:48:44 UTC | PS2: Do not add RELEASE_BUILD First merge screw up: I meant to comment these lines out (as they area now -- in fact, these lines did not exist pre-merge at all, I moved the -DRELEASE_BUILD additions manually to their own lines, so I could comment them out, and then promptly forgot. *sigh*) On the pro side, it was very easy to spot and correct this mistake! | 01 June 2011, 13:48:44 UTC |
a4610df | Max Horn | 01 June 2011, 13:15:31 UTC | Merge branch 'branch-1-3-0' into master I manually resolved all conflicts, and inspected every single change. Many were due to the version string mismatch and thus easily resolved. The MSVC project files add in the 1-3-0 branch were not merged, neither where the changes to gui/themes/translations.dat. Conflicts: NEWS backends/base-backend.cpp backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp backends/module.mk backends/platform/ds/arm9/makefile backends/platform/psp/README.PSP backends/platform/samsungtv/main.cpp backends/platform/samsungtv/samsungtv.cpp backends/saves/posix/posix-saves.cpp base/commandLine.cpp base/internal_version.h base/main.cpp common/array.h configure devtools/create_project/create_project.cpp dists/android/AndroidManifest.xml dists/android/plugin-manifest.xml dists/iphone/Info.plist dists/irix/scummvm.spec dists/macosx/Info.plist dists/redhat/scummvm-tools.spec dists/redhat/scummvm.spec dists/scummvm.rc dists/slackware/scummvm.SlackBuild dists/wii/meta.xml engines/sci/parser/vocabulary.cpp engines/tinsel/handle.cpp gui/themes/translations.dat | 01 June 2011, 13:15:31 UTC |
a4d105c | Max Horn | 01 June 2011, 08:43:02 UTC | COMMON: Move SDL endian check a bit down | 01 June 2011, 08:43:02 UTC |
c86a6c4 | Max Horn | 31 May 2011, 16:08:15 UTC | COMMON: Include SDL_endian.h instead of SDL_byteorder.h | 31 May 2011, 16:08:25 UTC |
05ac17f | Walter van Niftrik | 31 May 2011, 14:13:26 UTC | SCI: Fix up start/end points when pathfinding with opt == 0. Fixes bug #3304901: "SCI: Freddy Pharkas - Stuck in the brothel door". | 31 May 2011, 14:26:38 UTC |
42fa23f | Fabio Battaglia | 31 May 2011, 13:15:19 UTC | CONFIGURE: move some libs required by n64 port Some system libs weren't found during link stage, this should fix it | 31 May 2011, 13:16:25 UTC |
811b257 | Max Horn | 31 May 2011, 12:22:19 UTC | COMMON: Simplify OverlayColor definition This typedef still should be moved somewhere else. Maybe a header file of its own? | 31 May 2011, 12:22:19 UTC |
e06ca65 | Max Horn | 31 May 2011, 12:19:25 UTC | COMMON: Move scumm_str(n)icmp declaration to str.h | 31 May 2011, 12:19:25 UTC |
1c198ce | Max Horn | 31 May 2011, 12:06:47 UTC | COMMON: Move some weird WinCE/MSVC snprintf-#define around | 31 May 2011, 12:06:47 UTC |
8654e84 | Max Horn | 31 May 2011, 12:05:37 UTC | COMMON: Shorten endianess / mem align guessing logic in scummsys.h | 31 May 2011, 12:05:37 UTC |
2d6be5d | Max Horn | 31 May 2011, 11:56:28 UTC | COMMON: Move more stuff from scummsys.h to portdefs.h | 31 May 2011, 11:56:28 UTC |
9c3e2e4 | Max Horn | 31 May 2011, 11:48:03 UTC | COMMON: Move some code from scummsys.h to relevant portdefs.h files | 31 May 2011, 11:48:03 UTC |
bea6858 | D G Turner | 31 May 2011, 11:06:14 UTC | AUDIO: Fix GCC Compilation Warning in FM-Towns Softsynth. | 31 May 2011, 11:06:14 UTC |
c30904b | Max Horn | 31 May 2011, 10:22:26 UTC | BUILD: Fix typo which broke WebOS builds | 31 May 2011, 10:22:26 UTC |
5a2e6e4 | D G Turner | 31 May 2011, 03:44:12 UTC | BUILD: Fix compilation when --enable-plugins is enabled. | 31 May 2011, 03:44:12 UTC |
1edcbe0 | D G Turner | 31 May 2011, 00:18:31 UTC | BUILD: Fix Linking. These defines are adding to, not replacing the MODULES list. | 31 May 2011, 00:18:31 UTC |
9c3a8cd | Max Horn | 30 May 2011, 22:35:27 UTC | BUILD: Compile more files only when necessary | 30 May 2011, 22:35:27 UTC |
127a6f9 | Max Horn | 30 May 2011, 22:25:40 UTC | BUILD: Add SDL_BACKEND=1 to config.mk for all SDL based backends | 30 May 2011, 22:25:40 UTC |
f7e94e9 | Max Horn | 30 May 2011, 21:58:45 UTC | WINCE: Remove unnecessary -I flags | 30 May 2011, 21:58:45 UTC |
22e02b0 | Max Horn | 26 May 2011, 12:03:39 UTC | BUILD: Only add one option per line to INCLUDES/CXXFLAGS/LDFLAGS This improves (IMHO) readability, and makes it easier to diff for changes in compiler options. | 30 May 2011, 21:55:11 UTC |
2be59d5 | Paul Gilbert | 30 May 2011, 10:37:29 UTC | TSAGE: Changed parameter to animate call from NULL to 0 for better type matching | 30 May 2011, 10:37:29 UTC |
f094cb8 | Paul Gilbert | 30 May 2011, 10:28:21 UTC | TSAGE: Bugfix for saving in scene #2150 | 30 May 2011, 10:29:14 UTC |
ed20f18 | Paul Gilbert | 29 May 2011, 11:02:06 UTC | TSAGE: General cleanup of object class | 30 May 2011, 10:29:13 UTC |
7f8a69d | athrxx | 29 May 2011, 19:43:38 UTC | FM-TOWNS AUDIO: fix destructors (thread safety) | 29 May 2011, 23:48:59 UTC |
aa78f06 | strangerke | 29 May 2011, 23:17:12 UTC | TSAGE: Fix a mess in Seeker's actions in scene 2100 | 29 May 2011, 23:17:12 UTC |
82d18d3 | strangerke | 29 May 2011, 22:38:47 UTC | TSAGE: Fix a glitch in scene 2320 (no idea if it was visible or not) | 29 May 2011, 22:38:47 UTC |
10ee61f | strangerke | 29 May 2011, 22:36:56 UTC | TSAGE: Fix a bug in scene 7000, after talking to Skeenar | 29 May 2011, 22:36:56 UTC |
263adb5 | Johannes Schickel | 29 May 2011, 19:12:42 UTC | COMMON: Limit pragma warning use in algorithm.h to MSVC. Since we only want to disable a MSVC specific warning with it and other compilers might have different warnings numbers it is safer to only target MSVC here. | 29 May 2011, 19:12:42 UTC |
1ea9600 | md5 | 29 May 2011, 18:12:37 UTC | SCI: Added a more generalized fix for bug #3306417 | 29 May 2011, 18:12:37 UTC |
c713628 | md5 | 29 May 2011, 16:48:47 UTC | AGOS: Silenced a false positive warning in MSVC | 29 May 2011, 16:48:47 UTC |
bc2e770 | md5 | 29 May 2011, 16:29:01 UTC | CREATE_PROJECT: Fixed typo | 29 May 2011, 16:29:01 UTC |
afe1a77 | md5 | 29 May 2011, 15:54:04 UTC | VS: Disabled libpng, libtheora and opengl in the VS solution files | 29 May 2011, 15:54:04 UTC |
59dd072 | Willem Jan Palenstijn | 29 May 2011, 14:01:56 UTC | SCI: Make 'quit' an alias for 'quit game' in the console | 29 May 2011, 14:01:56 UTC |
e42e83d | md5 | 29 May 2011, 09:33:54 UTC | CREATE_PROJECT: Disable PNG, Theora and OpenGL by default. PNG and Theora are used for the sword25 engine, which isn't stable yet. OpenGL isn't stable yet. | 29 May 2011, 09:35:11 UTC |
4b98d6a | athrxx | 28 May 2011, 22:29:03 UTC | SCUMM: Fix bug #1013617 (ZAK FM-TOWNS: Wrong verb ('Teleport To') shown) | 28 May 2011, 23:04:14 UTC |
d7f877b | athrxx | 28 May 2011, 23:01:07 UTC | KYRA: pause midi sounds while gmm is running | 28 May 2011, 23:04:08 UTC |
c60807c | athrxx | 23 May 2011, 14:37:58 UTC | FM-TOWNS AUDIO: Unlock internal mutex before calling imuse timer proc. | 28 May 2011, 23:04:01 UTC |
3d42141 | athrxx | 22 May 2011, 16:25:29 UTC | SCUMM: implement some missing (very low relevance) imuse code 1) Don't skip transpose setting in sysex command 0. There are only a few sounds where this setting is used (mainly sfx). 2) Make MI2 and INDY4 read certain player start parameters from the sound resource. The start parameters usually match our default parameters (exception: e.g. LeChuck's Fortress). The use of these parameters has been dropped in DOTT (they use default parameters like we do). | 28 May 2011, 23:03:55 UTC |
187ecdd | athrxx | 21 May 2011, 10:54:08 UTC | KYRA: remove useless mutex from sound_towns | 28 May 2011, 23:03:49 UTC |
f38bc65 | strangerke | 28 May 2011, 21:33:50 UTC | TSAGE: Fix a glitch in scene 5100, add some comments | 28 May 2011, 21:33:50 UTC |
402fc4f | strangerke | 28 May 2011, 14:35:08 UTC | TSAGE: Fix an animation issue, and the transition between scene 5300 and 5100 (Seeker waking up and leaving) | 28 May 2011, 14:35:08 UTC |
f51eaed | strangerke | 28 May 2011, 07:37:08 UTC | TSAGE: Fix 'Restart' button, when game is over | 28 May 2011, 07:37:08 UTC |
2aaeb19 | strangerke | 28 May 2011, 07:22:29 UTC | TSAGE: Fix priority glitch in scene 4000 when climbing down the right chimney | 28 May 2011, 07:22:29 UTC |
b5e6a3a | strangerke | 28 May 2011, 06:58:49 UTC | TSAGE: Add some comments, and a missing remove() in scene 2300 | 28 May 2011, 06:58:49 UTC |
e213ecc | strangerke | 28 May 2011, 06:13:51 UTC | TSAGE: Fix similar issue in scene 2150 | 28 May 2011, 06:13:51 UTC |
1bd2f50 | strangerke | 28 May 2011, 05:59:34 UTC | TSAGE: Fix crash when restoring a game in scene 2100 | 28 May 2011, 05:59:34 UTC |
a7580ae | strangerke | 28 May 2011, 05:21:38 UTC | TSAGE: Add specific initialization for ringworld CD, fixing the color of the buttons | 28 May 2011, 05:21:38 UTC |
595728c | strangerke | 28 May 2011, 00:08:19 UTC | TSAGE: Fix several bugs in scene 5300 | 28 May 2011, 00:08:19 UTC |
4b01303 | strangerke | 27 May 2011, 23:05:48 UTC | TSAGE: Fix a couple of glitches in scene 5300 | 27 May 2011, 23:05:48 UTC |
adc087c | strangerke | 27 May 2011, 22:14:45 UTC | TSAGE: Fix bug in scene 2100 when Seeker is in the cave. (Thanks eriktorbjorn for pointing the reason of the problem) | 27 May 2011, 22:14:45 UTC |
daa69cc | strangerke | 27 May 2011, 21:52:16 UTC | TSAGE: Add a workaround for the mouse hidden bug in scene 4150 (also present in the original) | 27 May 2011, 21:52:16 UTC |
6113724 | strangerke | 27 May 2011, 21:30:55 UTC | TSAGE: Fix a sound glitch in scene 4150 | 27 May 2011, 21:32:38 UTC |
625f6d3 | CeRiAl | 27 May 2011, 20:14:04 UTC | WINCE: Update of port-related README | 27 May 2011, 20:21:56 UTC |
67c73a2 | CeRiAl | 27 May 2011, 20:14:04 UTC | WINCE: Update of port-related README | 27 May 2011, 20:14:04 UTC |
f4b2f84 | strangerke | 27 May 2011, 20:11:00 UTC | TSAGE: Fix priority issue in scene 2100, in the lift | 27 May 2011, 20:12:47 UTC |
a6fedd6 | Alyssa Milburn | 27 May 2011, 19:44:41 UTC | TSAGE: Cosmetic tweaks to Scene::setZoomPercents. | 27 May 2011, 19:44:41 UTC |
1d9a788 | strangerke | 27 May 2011, 19:39:55 UTC | TSAGE: Rename _field1800 in scene 2100 | 27 May 2011, 19:39:55 UTC |
edbc712 | strangerke | 27 May 2011, 18:53:05 UTC | TSAGE: Fix (second) bug "Scene 2100: If you sit down at Quinn's console and then get back up again, his walk animation gets screwed" | 27 May 2011, 18:53:05 UTC |
cb990e6 | Lars Skovlund | 27 May 2011, 15:34:43 UTC | SCI: Fix access to variables (gc_interval etc.) from the console | 27 May 2011, 15:34:43 UTC |
ff62a60 | Lars Skovlund | 27 May 2011, 11:15:57 UTC | Revert "SCI: Don't attempt to modify null/disposed objects." This fix for bug #3303802 is a potential cause of unreproducible bugs in all SCI games that taint savegames. This reverts commit 48140a012d69d76de5ae80de7ca926e71c39cd03. | 27 May 2011, 11:15:57 UTC |
d50c627 | Paul Gilbert | 27 May 2011, 09:28:31 UTC | TSAGE: Bugfix for loading savegames directly from the launcher | 27 May 2011, 09:28:31 UTC |
6072f97 | Paul Gilbert | 27 May 2011, 09:14:04 UTC | TSAGE: Bugfix for saving game in scene #4025 | 27 May 2011, 09:14:04 UTC |
fb4bdae | Paul Gilbert | 27 May 2011, 09:08:36 UTC | TSAGE: Bugfix for using lift after restoring a savegame in scene #2320 | 27 May 2011, 09:08:36 UTC |
48140a0 | md5 | 27 May 2011, 00:06:06 UTC | SCI: Don't attempt to modify null/disposed objects. These cases occur usually because of script bugs. Fixes script bug #3303802 - "SCI: PQ1VGA - Crash at the jail" | 27 May 2011, 00:06:06 UTC |
28b7cf7 | md5 | 26 May 2011, 23:47:48 UTC | SCI: Added a workaround for bug #3308087 - "SCI: SQ1VGA - Engine Abort Upon Loading Ulence Flats Save" | 26 May 2011, 23:47:48 UTC |
a010884 | md5 | 26 May 2011, 23:31:03 UTC | SCI: Fixed bug #3306417 - "LAURA BOW 2: segmentation fault while talking to Dr. Myklos" | 26 May 2011, 23:32:22 UTC |
09ba2ad | Max Horn | 26 May 2011, 11:29:09 UTC | DC: Don't set a lib search path for plugins Plugins may not rely on external libs, so there is no point in specifying a custom library search path for them. | 26 May 2011, 11:31:17 UTC |
7b03a6e | Alyssa Milburn | 26 May 2011, 11:20:06 UTC | SWORD25: Fix making multiple saves at the same time. This adds a missing seek. Thanks to [md5] for guessing the cause. | 26 May 2011, 11:23:25 UTC |
86563d0 | md5 | 26 May 2011, 09:34:22 UTC | SWORD25: Committed changes to module.mk which were forgotten in my previous commit | 26 May 2011, 09:34:22 UTC |
62c026d | md5 | 26 May 2011, 09:29:51 UTC | SWORD25: Merged the PNG and thumbnail decoding code into a common class | 26 May 2011, 09:29:51 UTC |
a654115 | Max Horn | 26 May 2011, 09:03:00 UTC | BUILD: Make endianess check stricter | 26 May 2011, 09:06:33 UTC |
de8a44a | Max Horn | 26 May 2011, 09:02:46 UTC | BUILD: Reorder configure some more | 26 May 2011, 09:06:33 UTC |
d505046 | md5 | 26 May 2011, 08:44:52 UTC | SWORD25: Removed the leftover libpng code | 26 May 2011, 08:46:42 UTC |
984f53a | md5 | 26 May 2011, 08:43:28 UTC | SWORD25 (LUA): Removed unused code for handling precompiled LUA scipts | 26 May 2011, 08:46:41 UTC |
7b51cae | Max Horn | 26 May 2011, 06:25:28 UTC | ANDROID: Trying to fix the recent linker failures | 26 May 2011, 06:25:28 UTC |
a2f16d9 | Max Horn | 26 May 2011, 06:22:46 UTC | SWORD25: Const correctness | 26 May 2011, 06:22:46 UTC |
2068bc1 | Max Horn | 26 May 2011, 06:22:36 UTC | SWORD25: Fix warning: double format, float arg on DC | 26 May 2011, 06:22:36 UTC |
2c8a9b0 | Max Horn | 26 May 2011, 06:14:57 UTC | SWORD25: Avoid using strcoll | 26 May 2011, 06:14:57 UTC |
bf490b4 | Max Horn | 26 May 2011, 05:25:52 UTC | BUILD: Reorder plugin stuff in configure some more | 26 May 2011, 05:26:01 UTC |
bed40a6 | Pawel Kolodziejski | 26 May 2011, 05:14:53 UTC | SAMSUNGTV: added readme to dists | 26 May 2011, 05:14:53 UTC |
6098506 | strangerke | 25 May 2011, 21:58:46 UTC | HUGO: Fix comments | 25 May 2011, 21:58:46 UTC |
c6ef39d | strangerke | 25 May 2011, 21:36:50 UTC | HUGO: Add 3 object related functions to the console | 25 May 2011, 21:39:28 UTC |
dceaa08 | strangerke | 25 May 2011, 18:29:43 UTC | TSAGE: Add scene description in scene groups 8 and 10 | 25 May 2011, 21:39:19 UTC |
fe41da8 | strangerke | 25 May 2011, 18:23:02 UTC | HUGO: Add boundaries() to the console. God mode no longer shows boundaries, as in the original | 25 May 2011, 21:39:10 UTC |
be3306a | strangerke | 25 May 2011, 18:08:54 UTC | TSAGE: Cosmetic modification, for consistency | 25 May 2011, 21:39:03 UTC |
65a9ef7 | strangerke | 25 May 2011, 18:08:30 UTC | HUGO: Cosmetic modification, for consistency | 25 May 2011, 21:38:55 UTC |
bb4df3f | strangerke | 25 May 2011, 18:03:48 UTC | HUGO: Add listscreens() and gotoscreen() to console | 25 May 2011, 21:38:47 UTC |
472d45a | strangerke | 25 May 2011, 07:07:09 UTC | TSAGE: Add a couple of comments | 25 May 2011, 21:38:39 UTC |
185536e | Max Horn | 25 May 2011, 21:12:41 UTC | TOON: Remove unused variable | 25 May 2011, 21:12:53 UTC |
218d82c | Willem Jan Palenstijn | 25 May 2011, 20:43:31 UTC | AGI: Fix compilation on 64 bit platforms I'm unable to test this change, but it avoids using a pointer to store an int temporarily. | 25 May 2011, 20:45:21 UTC |
a87d338 | Pawel Kolodziejski | 25 May 2011, 17:40:55 UTC | SAMSUNGTV: revert code of result some previous commit | 25 May 2011, 17:40:55 UTC |
5cd5d26 | Pawel Kolodziejski | 25 May 2011, 17:22:17 UTC | SAMSUNGTV: change default path | 25 May 2011, 17:22:17 UTC |
ed9768f | Eugene Sandulenko | 25 May 2011, 17:00:26 UTC | Merge pull request #9 from tiqpit/a2gs AGI: Fix //gs output | 25 May 2011, 17:00:26 UTC |
9539017 | Matthew Hoops | 25 May 2011, 15:17:11 UTC | ALL: initialise -> initialize | 25 May 2011, 15:17:11 UTC |
7ff9f34 | Matthew Hoops | 25 May 2011, 14:49:12 UTC | QUEEN: tyre -> tire | 25 May 2011, 14:50:47 UTC |
0104d56 | Matthew Hoops | 25 May 2011, 14:48:51 UTC | ALL: recognise -> recognize | 25 May 2011, 14:50:47 UTC |
28301e2 | Matthew Hoops | 25 May 2011, 14:48:13 UTC | ALL: analyse -> analyze | 25 May 2011, 14:50:47 UTC |
e18401a | Matthew Hoops | 25 May 2011, 14:45:38 UTC | ALL: armour -> armor | 25 May 2011, 14:50:47 UTC |
ad9c463 | Matthew Hoops | 25 May 2011, 14:33:35 UTC | GRAPHICS: flavour -> flavor | 25 May 2011, 14:50:47 UTC |
6b36753 | Matthew Hoops | 25 May 2011, 14:32:45 UTC | ALL: favour/favourite -> favor/favorite | 25 May 2011, 14:50:46 UTC |