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
24 Commits
Author SHA1 Message Date
Johannes Schickel c1be2aedbb SAGA: 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
agent-q 3ce4b76b0d DS/SAGA: Due to what looks like a compiler bug, having one Common::Array template inside another causes the DS build to crash during Common::Array::resize(). The only fix I can find is to make the internal byte array a normal malloc'ed() buffer. This way, the code runs fine. Need to dig into the assembly output for this to find out what's truly going on with the original code. 2011-05-21 15:54:20 +01:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Andrew Kurushin f24394b85f SAGA: replace Actor::_pathCell, Anim::*, Converse::text, IsoMap::*, Music::_songTable, ObjectMap::*, PalAnim::*, Scene::sceneLut, SndRes::_fxTable* malloc based arrays with Common::Array implementation 
add ByteArray type
fix debug Tile Hittest frame drawing
debug 0x%x => 0x%X

svn-id: r53719
 2010-10-22 23:13:17 +00:00
Andrew Kurushin 1bd1a253f0 SAGA: replace Font "::*alloc" & "::free" with Common::Array 
svn-id: r53656
 2010-10-20 21:23:02 +00:00
Torbjörn Andersson c91a07229a JANITORIAL: Removed most punctuation at end of warning() and error() 
Our warning() and error() functions always add an exclamation mark
to the end of the message anyway.

svn-id: r52791
 2010-09-18 10:55:16 +00:00
Max Horn 00dfb4db29 SAGA: Fix warning on systems where enum's are unsigned 
svn-id: r50685
 2010-07-05 16:08:43 +00:00
Max Horn 2149a2383d Reduce indirect header dependencies further 
svn-id: r48936
 2010-05-04 12:00:16 +00:00
Max Horn 51933629d1 Changed foo(void) to foo() in almost all non-backend source files 
svn-id: r45616
 2009-11-02 21:54:57 +00:00
Filippos Karapetis 7287457672 Got rid of SortedList 
svn-id: r39928
 2009-04-11 09:54:55 +00:00
Filippos Karapetis 02ca56eec8 Removed all but one of the functions of the SortedList, apart from the custom insert() operation. It's only used in one place now (in _drawOrderList) 
svn-id: r39925
 2009-04-11 09:23:40 +00:00
Max Horn 1c5110e725 SAGA: Got rid of some more SortedList methods 
svn-id: r39922
 2009-04-11 00:29:52 +00:00
Max Horn 7412b0f8e8 SAGA: Stop needlessly using operator*() and operator->() (many of the resulting &* uses can be removed if references are used instead of pointers everywhere, which would be a good idea anyway) 
svn-id: r39920
 2009-04-11 00:29:12 +00:00
Filippos Karapetis 9c04b0c229 All the screen drawing functions draw to the back buffer, so there is no point in passing it everywhere 
svn-id: r35260
 2008-12-06 14:24:40 +00:00
Filippos Karapetis beb18533c3 Cleanup 
svn-id: r35246
 2008-12-04 21:25:44 +00:00
Filippos Karapetis b67db7baf5 Cleanup 
svn-id: r33373
 2008-07-28 12:46:30 +00:00
Jordi Vilalta Prat 66e9d4f5e8 Removed trailing spaces. 
svn-id: r30664
 2008-01-27 19:47:41 +00:00
Paul Gilbert 6eb64102a4 Fix to remove a tab character from the GPL header 
svn-id: r30238
 2008-01-05 12:45:14 +00:00
Filippos Karapetis 5f05e7b64b Added a debug command for font mapping 
svn-id: r28935
 2007-09-17 23:32:25 +00:00
Filippos Karapetis 86b3c8ddeb Character with ASCII code 9 is tab 
svn-id: r28934
 2007-09-17 22:56:28 +00:00
Max Horn 218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots 
svn-id: r27024
 2007-05-30 21:56:52 +00:00
Torbjörn Andersson 6050989bd8 Changed SAGA_ACTOR_H__ to SAGA_ACTOR_H etc for consistency. 
svn-id: r23583
 2006-07-23 15:16:50 +00:00
Max Horn 26ee630756 Moved engines to the new engines/ directory 
svn-id: r20582
 2006-02-11 22:45:04 +00:00