ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,292 Commits 45 Branches 139 Tags
7331a7cbefed7be415da170a32a2549b1c18fd12
Commit Graph
5295 Commits
Author SHA1 Message Date
Max Horn a4610df482 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
 2011-06-01 15:15:31 +02:00
Max Horn 2d6be5d077 COMMON: Move more stuff from scummsys.h to portdefs.h 2011-05-31 13:56:28 +02:00
Max Horn 9c3e2e43bd COMMON: Move some code from scummsys.h to relevant portdefs.h files 2011-05-31 13:48:03 +02:00
D G Turner 1edcbe0b00 BUILD: Fix Linking. 
These defines are adding to, not replacing the MODULES list.
 2011-05-31 01:18:31 +01:00
Max Horn 9c3a8cd3b5 BUILD: Compile more files only when necessary 2011-05-31 00:35:27 +02:00
Max Horn 127a6f920a BUILD: Add SDL_BACKEND=1 to config.mk for all SDL based backends 2011-05-31 00:25:40 +02:00
CeRiAl 625f6d3b0e WINCE: Update of port-related README 2011-05-27 22:21:56 +02:00
CeRiAl 67c73a25f0 WINCE: Update of port-related README 2011-05-27 22:14:04 +02:00
Pawel Kolodziejski a87d33845a SAMSUNGTV: revert code of result some previous commit 2011-05-25 19:40:55 +02:00
Pawel Kolodziejski 5cd5d2663d SAMSUNGTV: change default path 2011-05-25 19:22:17 +02:00
Matthew Hoops 9539017ee3 ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
Matthew Hoops 6b36753170 ALL: favour/favourite -> favor/favorite 2011-05-25 10:50:46 -04:00
Matthew Hoops eea482fa43 ALL: behaviour -> behavior 2011-05-25 10:50:46 -04:00
Max Horn 4b7f6dfa3c BUILD: Rename USE_TEXT_CONSOLE -> USE_TEXT_CONSOLE_FOR_DEBUGGER 
This reduces the similarity in name to the otherwise mostly
unrelated DISABLE_TEXT_CONSOLE #define.
 2011-05-25 13:24:37 +02:00
Max Horn 39076ef972 BUILD: Rename UNIX #define to POSIX 2011-05-25 13:23:03 +02:00
Max Horn ecb8618cb7 BUILD: Unify build & configure rules for SDL based backends 2011-05-25 13:21:01 +02:00
CeRiAl 2395889372 WINCE: Update port specific readme 2011-05-25 00:56:05 +02:00
CeRiAl 91e304e35f WINCE: Update port specific readme 2011-05-25 06:52:52 +08:00
Pawel Kolodziejski 709f0de5c5 SAMSUNGTV: Fix build 2011-05-24 21:32:24 +02:00
Willem Jan Palenstijn 725db142bc SAMSUNGTV: Fix build on non-SDL platforms 2011-05-24 20:58:36 +02:00
Pawel Kolodziejski 48b4c6c923 SAMSUNGTV: Update port 
This combines the following Samsung TV port updates from master:

944e0be209
dc1d07774f

It also includes the parts touching this backend of:

69b1485a22
2fa63ca015
 2011-05-24 20:34:45 +02:00
Max Lingua 96519ad939 PS2 backend: Modified and tidied up Makefiles for 1.3.0 release 2011-05-24 11:55:09 -04:00
Pawel Kolodziejski dc1d07774f SAMSUNGTV: changed paths 2011-05-24 13:31:28 +02:00
Pawel Kolodziejski abd973ee37 SAMSUNGTV: fix typo 2011-05-24 13:24:37 +02:00
Max Horn e5725fa0f5 PSP: Fix compilation 2011-05-24 00:23:42 +02:00
Max Horn c5045f6a84 N64: Fix compilation 2011-05-24 00:22:36 +02:00
Max Horn 6a635f6941 DS: Fix compilation 2011-05-23 21:21:08 +02:00
Max Horn b3b523fddf DC: Fix compilation 2011-05-23 21:20:59 +02:00
Max Horn 6c5f50c246 COMMON: Add exit() to list of forbidden symbols 2011-05-23 19:39:26 +02:00
Max Horn 6f6051a9e1 COMMON: Mark more symbols as forbidden 2011-05-23 19:12:26 +02:00
Max Horn 590c6ede63 BACKENDS: Move SCUMMVM_SAVEPATH env var handling to POSIX savefile manager 2011-05-23 19:12:26 +02:00
Max Horn 8e3aafd30d COMMON: Provide our own implementations for scumm_str(n)icmp 
This takes up a tiny little bit of extra binary size, but gets
rid of some awful #ifdef hackery.
 2011-05-23 19:12:25 +02:00
Pawel Kolodziejski 944e0be209 SAMSUNGTV: update port 2011-05-23 18:11:40 +02:00
agent-q 92d0216db1 Merge branch 'branch-1-3-0' of https://github.com/scummvm/scummvm into branch-1-3-0 2011-05-21 16:01:26 +01:00
agent-q 6fdec4dfac DS: Various changes 
- Enable libmad
- Remove forced include of scummsys.h, it caused problems in the forbidden symbols code.
 2011-05-21 15:51:13 +01:00
CeRiAl e27dd8ac4e WINCE: Change plugin extensions from .dll to .plugin - fixes erroneous loading of runtime-dlls 2011-05-20 06:31:23 +08:00
CeRiAl fb6b61f14e WINCE: Add win32-provider.o to backends/module.mk for WinCE (fixes dynamic plugins) 2011-05-18 06:04:27 +08:00
CeRiAl 70fdec6411 WINCE: Replace custom massadd with the global one (shows progress now) 
Replaces the formerly custom WinCE massadd function (CELauncherDialog::automaticScanDirectory) with the global one, which is better because it shows progress (massadd in combination with a uncached plugin build takes a very long time to complete and user thinks device has crashed when no progress is shown).
Also fixes the additional custom WinCE about dialog (text was cut off before).
 2011-05-18 06:04:25 +08:00
CeRiAl e46f7dc1c0 WINCE: Fix mouse coordinate scaling when ARM scaler support is active 2011-05-18 06:04:24 +08:00
CeRiAl 6db6d69eed WINCE: Enable building of plugins with normal configure/make 
Enables building of plugin .dlls without a custom Makefile.
Also removes generation of scummvm.exe.map from configure script.
 2011-05-18 06:04:23 +08:00
Oystein Eftevaag 5a3aa7a994 IPHONE: Fixed mouse position when the overlay is visible 2011-05-15 21:47:11 -04:00
Oystein Eftevaag a1f02c3f32 IPHONE: Fixed mouse position when the overlay is visible 2011-05-15 21:43:53 -04:00
Max Horn 343237e68a VKEYBD: Update vkeybd_default.zip 
Specifically, in vkeybd_default.xml, 'centre' changed to 'center'.
 2011-05-16 00:35:49 +02:00
Max Horn 136d687dd3 VKEYBD: Update vkeybd_default.zip 
Specifically, in vkeybd_default.xml, 'centre' changed to 'center'.
(cherry picked from commit db068cf8588a2058d49ae5af3d5d247a3353ef8c)
 2011-05-16 00:35:03 +02:00
Oystein Eftevaag b3062b5e7e IPHONE: Changed the iOS queued event handling to fix mouseclicks in Gob 
We now delay the mouseup events for 50ms, rather than just delaying them for an additional couple of pollEvent (which doesn't work anymore due to changes in the eventhandling code elsewhere). This fixes #3018512.
 2011-05-15 18:04:36 -04:00
Oystein Eftevaag b23dfd72f1 IPHONE: Changed the iOS queued event handling to fix mouseclicks in Gob 
We now delay the mouseup events for 50ms, rather than just delaying them for an additional couple of pollEvent (which doesn't work anymore due to changes in the eventhandling code elsewhere). This fixes #3018512.
 2011-05-15 17:55:47 -04:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn 6eba8e8292 N64: Fix code formatting 2011-05-09 16:23:21 +02:00
Max Horn db82d282ea N64: Remove (u)int64 typedefs from common/scummsys.h 2011-05-09 16:23:21 +02:00
Klaus Reimer 1e701b3769 WEBOS: Splitted install directory from package directory. 2011-05-08 20:58:08 +02:00