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
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
59 Commits
Author SHA1 Message Date
Johannes Schickel 627d766325 SDL: Add basic abstraction class for the SDL window. 2015-02-16 01:03:29 +01:00
Johannes Schickel a3d012357e SAMSUNGTV: Make GPL headers consistent in themselves. 2014-02-18 02:39:37 +01:00
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 ecb8618cb7 BUILD: Unify build & configure rules for SDL based backends 2011-05-25 13:21:01 +02: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
Pawel Kolodziejski dc1d07774f SAMSUNGTV: changed paths 2011-05-24 13:31:28 +02:00
Pawel Kolodziejski 944e0be209 SAMSUNGTV: update port 2011-05-23 18:11:40 +02:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn 2fa63ca015 COMMON: Forbid use of getcwd&getwd; add macro to enable unistd.h compatibility 2011-05-03 14:30:25 +02:00
Max Horn a162ff18bc SDL: Various more SdlEventSource related fixes 
svn-id: r54553
 2010-11-28 22:04:39 +00:00
Max Horn 364382cf9f SDL: Change refs to SdlEventManager to SdlEventSource 
svn-id: r54544
 2010-11-28 18:39:04 +00:00
Max Horn 8f37f6634c SDL: Merge deinit() into OSystem_SDL destructor and overload fatalError 
svn-id: r54526
 2010-11-28 15:44:34 +00:00
Max Horn 7760077cf5 Merging the gsoc2010-opengl branch 
svn-id: r54518
 2010-11-28 14:56:31 +00:00
Johannes Schickel e1030e53a5 BACKENDS: Implement logging API proposed by Max on -devel. 
This commits a slightly modified patch from my patch tracker item #3104630
"OSYSTEM: Add logging API as proposed by Max on -devel".

I was not able to test compilation on Android and SamsungTV, since there is no
toolchain for those on buildbot (or I was too blind to find them).

svn-id: r54339
 2010-11-18 19:12:14 +00:00
Alejandro Marzini fb4086cadb Merged from trunk, from Rev 50841 to HEAD 
svn-id: r51495
 2010-07-30 05:28:09 +00:00
Max Horn d22ebd358d BUILD: Unify how MODULE_DIRS is computed for backends 
This should help avoid situations where MODULE_DIRS is not set to a
complete list of build dirs (which causes troubles with the automatic
header dependency detection logic).

On the long run, we should replace the relevant code by a macro or also
use rules.mk for this (with yet another if/else case add to it).

svn-id: r51467
 2010-07-29 13:03:21 +00:00
Alejandro Marzini 4e50b23005 Cleanup and documentation. 
svn-id: r50610
 2010-07-03 00:25:06 +00:00
Alejandro Marzini afd2a2c01d Renamed Samsung TV SDL Event Manager class and file for constancy, and added initialization for it on Samsung TV backend. 
svn-id: r50481
 2010-06-29 05:00:44 +00:00
Alejandro Marzini 936f558579 Improved getDefaultConfigFileName(). Code cleanup. 
svn-id: r50364
 2010-06-27 05:12:37 +00:00
Alejandro Marzini e08762fe51 Missing character. 
svn-id: r50303
 2010-06-26 04:03:07 +00:00
Alejandro Marzini 51a7440a7c Override quit() and getConfigFileNameString(). Changed parent class to OSystem_POSIX. 
svn-id: r50302
 2010-06-26 03:51:28 +00:00
Alejandro Marzini d04a2a266d Modularized Samsung TV port. 
svn-id: r50258
 2010-06-25 05:02:40 +00:00
Max Horn 767edc91fa OSYSTEM: Get rid of kFeatureAutoComputeDirtyRects 
svn-id: r49388
 2010-06-02 00:52:57 +00:00
Paweł Kołodziejski 47d6e9eab7 sync with parent sdl backend 
svn-id: r49134
 2010-05-21 18:33:24 +00:00
Jordi Vilalta Prat 22e5a557b7 Added the svn:keywords property to some files missing it. 
svn-id: r48148
 2010-02-27 17:02:58 +00:00
Paweł Kołodziejski b6b96d9452 samsungtv: cleanup 
svn-id: r45972
 2009-11-18 11:16:50 +00:00
Paweł Kołodziejski 424c5eea92 samsungtv: no need make surface conversion here any more, sdl do that with internal emulation 
svn-id: r45971
 2009-11-18 10:14:30 +00:00
Paweł Kołodziejski 0d20aafb04 samsungtv: cleanup 
svn-id: r45953
 2009-11-17 14:27:11 +00:00
Paweł Kołodziejski e105a6ffc2 samsungtv: since new sdl lib port support mouse and keyboard, adopting handle remote controller events 
svn-id: r45952
 2009-11-17 14:13:15 +00:00
Paweł Kołodziejski 836e5c088e samsungtv: no need workaround to subclasses, alternate sdl static library works fine 
svn-id: r45940
 2009-11-16 21:27:09 +00:00
Paweł Kołodziejski 09cdfac8c4 samsungtv: remap keycode, main tv software tell with SDLK_POWER to imediately quit sdl app 
svn-id: r45939
 2009-11-16 21:13:21 +00:00
Paweł Kołodziejski ace686aa3f samsungtv: continue reduction of code duplication 
svn-id: r45900
 2009-11-14 15:46:38 +00:00
Paweł Kołodziejski 5e136e5596 reduce code duplication, unconst pixel format 
svn-id: r45895
 2009-11-14 12:58:39 +00:00
Paweł Kołodziejski f031cb2415 samsungtv: ops that should not go here 
svn-id: r45883
 2009-11-13 21:08:14 +00:00
Paweł Kołodziejski f721078edf samsungtv: remove code duplication 
svn-id: r45882
 2009-11-13 21:01:09 +00:00
Paweł Kołodziejski cb7b147881 samsungtv: revert last hasFeature change, feature kFeatureCursorHasPalette is needed 
svn-id: r45881
 2009-11-13 20:51:42 +00:00
Paweł Kołodziejski 1f00ac2e19 samsungtv: fix hasFeature flag 
svn-id: r45880
 2009-11-13 16:07:45 +00:00
Paweł Kołodziejski 42d0aa04e2 update includes 
svn-id: r45879
 2009-11-13 00:43:33 +00:00
Paweł Kołodziejski 0bbb62771a rename sdl.*->samsungtv.* 
svn-id: r45878
 2009-11-13 00:37:53 +00:00
Paweł Kołodziejski 82dfea7e56 samsungtv: remove more code duplication in the backend, based on Max patch 
svn-id: r45877
 2009-11-13 00:31:36 +00:00
Paweł Kołodziejski 06c73ee29f samsungtv: fix sdl surface type 
svn-id: r45870
 2009-11-12 20:44:37 +00:00
Paweł Kołodziejski d4057ea90a samsungtv: disable SDL_UpdateRects it make worse 
svn-id: r45865
 2009-11-12 18:46:51 +00:00
Paweł Kołodziejski 1b3a3de946 samsungtv: disable selecting resolution based on aspect ratio for now 
svn-id: r45837
 2009-11-11 15:23:44 +00:00
Paweł Kołodziejski b7a2c8dfe6 samsungtv: reduction of includes 
svn-id: r45836
 2009-11-11 14:42:56 +00:00
Paweł Kołodziejski 2a1cd33a46 added more cases for samsungtv to allow reuse main sdl code 
svn-id: r45835
 2009-11-11 14:36:46 +00:00
Paweł Kołodziejski a3363e6e1f samsungtv: move DEFAULT_CONFIG_FILE into main sdl code to prevent code duplication 
svn-id: r45831
 2009-11-11 14:21:58 +00:00
Paweł Kołodziejski 6bc410ba34 samsungtv: add missing . 
svn-id: r45830
 2009-11-11 14:10:17 +00:00
Paweł Kołodziejski 565fcbcc8d samsungtv: remove keymapper, its pointless here. fixed key mapping 
svn-id: r45829
 2009-11-11 13:52:03 +00:00