| Age | Commit message (Collapse) | Author |
|---|
|
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!
|
|
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
|
|
|
|
svn-id: r53160
|
|
svn-id: r51465
|
|
configure.
svn-id: r48977
|
|
svn-id: r45898
|
|
- dropped gBitFormat
- added extra param "const Graphics::PixelFormat *" to
OSystem_PS2::initSize
OSystem_PS2::setMouseCursor
Note! To compile on SVN you will have (for now ;-) to create
few few empty folders by hand, note very elegant but will
keep you going until when we (ehm...) refine the PS2 Makefile.
Here comes the brute force script I use inside backends/platform/ps2
mkdir -p backends/platform/ps2
mkdir -p base
mkdir -p engines/scumm
mkdir -p engines/scumm/he
mkdir -p engines/scumm/imuse
mkdir -p engines/scumm/imuse_digi
mkdir -p engines/scumm/insane
mkdir -p engines/scumm/smush
mkdir -p engines/agi
mkdir -p engines/agos
mkdir -p engines/cine
mkdir -p engines/cruise
mkdir -p engines/drascula
mkdir -p engines/gob
mkdir -p engines/gob/demos
mkdir -p engines/gob/save
mkdir -p engines/gob/sound
mkdir -p engines/igor
mkdir -p engines/igor/parts
mkdir -p engines/kyra
mkdir -p engines/lure
mkdir -p engines/made
mkdir -p engines/parallaction
mkdir -p engines/queen
mkdir -p engines/saga
mkdir -p engines/sky
mkdir -p engines/sky/music
mkdir -p engines/sword1
mkdir -p engines/sword2
mkdir -p engines/touche
mkdir -p gui
mkdir -p graphics
mkdir -p graphics/fonts
mkdir -p graphics/scaler
mkdir -p graphics/video
mkdir -p graphics/video/coktelvideo
mkdir -p sound
mkdir -p sound/mods
mkdir -p sound/softsynth
mkdir -p sound/softsynth/opl
mkdir -p backends/events/default
mkdir -p backends/fs
mkdir -p backends/fs/amigaos4
mkdir -p backends/fs/ds
mkdir -p backends/fs/palmos
mkdir -p backends/fs/posix
mkdir -p backends/fs/ps2
mkdir -p backends/fs/psp
mkdir -p backends/fs/symbian
mkdir -p backends/fs/windows
mkdir -p backends/fs/wii
mkdir -p backends/keymapper
mkdir -p backends/midi
mkdir -p backends/plugins/dc
mkdir -p backends/plugins/posix
mkdir -p backends/plugins/sdl
mkdir -p backends/plugins/win32
mkdir -p backends/saves
mkdir -p backends/saves/default
mkdir -p backends/saves/posix
mkdir -p backends/saves/psp
mkdir -p backends/timer/default
mkdir -p backends/vkeybd
mkdir -p common
I know, you don't need all those "-p" but it looks more consistent ;-)
svn-id: r44683
|
|
- general file write corruption (eg. ScummVM.ini, etc.)
- COMI specific save crash / corruption
(added option in engines/scumm/saveload.cpp to disable
thumbnails on PS2, as emergency fallback in case the
fix should prove to be insufficient)
- implemented _screenChange logic
(fixes grabOverlay & COMI popup menu)
- fixed higher pitch (chipmunk fx)
- made NET IRXs optional to allow it to work on fat PS2 without net+hd
- fixed cursor restore on RTL
- added "." as R2 to skip single lines of dialog
- added write cache
svn-id: r42404
|
|
- new GUI/themes
- no more funky colors!
- load/delete saved games
- cleaned-up Makefile.PS2 :
- dropped multiple extra paths
- dropped deprecated deps (UCL, MPEG2)
- all possible devices are supported to store, play and save games:
- CD
- HD
- USB
- MC
- REMOTE ! (this could actually be anywhere on the internet
as long as you run "ps2client listen" on the machine on
the other side that hosts the games)
- tested from :
- ps2link
- uLE
- toxicOS
- tested with:
- bass
- bs1
- mi1
- comi
- indy4
- ft
- ite
- ihnm
- elvira1
- dig
- kyra
- lure
- simon2
- goblins1
Played all those games in 1 session using RTL. Very smooth,
sub-second RTL experience. No crash!
- new PAL/NTSC detection : we are now reading the flavor from PS2 ROM,
it should work on all PS2 slim too
- new PAL TV centering : no more missing chunk of games on top/bottom
- we can now read the savefiles from Linux/SDL and other backends!
if you add that you can read them from remote together with the
games that you already have there, you can imagine the fun ;-)
- we fully implement RTL with every games/engine
- we nicely reboot / shutdown on quit
- fully support for themes/savegames paths. Run from MC, play the
games on remote and store your data on USB or HD. No limits!
- universal write/read for every media (of course no write on CD/DVD!)
- fully async / DMA read-write access to every media (even MC!)
- optimized cache/read-ahead for every media - now COMI is fast and
enjoyable from remote as it is from CD ;-)
- non polluting MC storage, just 1 folder + 1 icon, so that you can
copy all your settings / saved games to another MC in one go!
svn-id: r39102
|
|
Thanks Max [the other one] for pointing it out!
svn-id: r33117
|
|
svn-id: r33089
|
|
svn-id: r31099
|
