aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-10MORTEVIELLE: Fix mergeStrangerke
2012-10-10Merge branch 'master' of github.com:scummvm/scummvm into mortevielleStrangerke
Conflicts: base/plugins.cpp configure
2012-10-10MORTEVIELLE: Some renamingStrangerke
2012-10-10IPHONE: Fix cursor artifacts when linear filterting is used.Johannes Schickel
We need to set a proper texture coordinate wrap parameter for this.
2012-10-09GRAPHICS: Fix compilation of conversion.cpp on motomagx.Johannes Schickel
Using plain "inline" instead of "FORCEINLINE" allows the compiler to continue even when it fails to inline crossBlitLogic/crossBlitLogic3BppSource. The impact of other systems now not inlining the functions anymore is hopefully small enough to not cause any problems.
2012-10-09TEST: Add two (simple) tests for MemoryWriteStream.Johannes Schickel
2012-10-09COMMON: Properly handle error indicator in MemoryWriteStream.Johannes Schickel
Thanks to waltervn for noticing that MemoryWriteStream::write doesn't handle setting the error indicator properly.
2012-10-08Merge pull request #282 from bluegr/nipponfixFilippos Karapetis
PARALLACTION: Fix the ending of Nippon Safes (bug #5866)
2012-10-08Merge pull request #257 from lordhoto/graphics-conversionJohannes Schickel
Extend crossBlit for abitrary (in-place) conversions and add a in-place conversion to Surface
2012-10-08SCI: Add documentation regarding all SCI1.1 CD games in syncIngameAudioOptions()Filippos Karapetis
2012-10-08SCI: Also add LSL6 CD to syncIngameAudioOptions()Filippos Karapetis
2012-10-08SCI: Document syncIngameAudioOptions()Filippos Karapetis
2012-10-08SCI: Add a workaround for the large text boxes in Freddy Pharkas CDFilippos Karapetis
Fixes bug #3575276 - "SCI: Freddy Pharkas: Text sometimes drawn/erased incorrectly"
2012-10-08CREDITS: Update the web credits path in the make ruleThierry Crozat
This is not guarantied to work but will work if both scummvm and scummvm-web have been cloned in the same parent directory. The old rules was always failing anyway, so this is an improvement. But maybe we should comment that line?
2012-10-08CREDITS: Mark Lothar Serra Mari as retiredThierry Crozat
2012-10-08MORTEVIELLE: Get rid of some magic valuesStrangerke
2012-10-07SCI: Fix Uhura's Woo conversation optionWillem Jan Palenstijn
This is bug #3040722. It was trying to open a non-existent submenu. We now force a return after handling the conversation option right before it tries to look for this submenu.
2012-10-07SCI: Flip assertWillem Jan Palenstijn
This way the assert is checking that the allocated buffer is large enough for the memcpy that follows it.
2012-10-06SWORD1: Enable American ("Circle of Blood") panelTorbjörn Andersson
If the language is explicitly set to American English, use the American version of the panel for the main control panel. In all other aspects, American English will behave as British English, so it shouldn't break anything.
2012-10-06SCI: Fix dissect_script crash with invalid object typesWillem Jan Palenstijn
2012-10-06SCI: Fix some console output formattingWillem Jan Palenstijn
2012-10-06TOLTECS: Improve the shake screen effects during moviesTorbjörn Andersson
I don't know how often the original shook the screen (perhaps as often as it could?), but at least we now have the opportunity to shake the screen more than once per movie frame.
2012-10-06TOLTECS: Hide the mouse cursor while a movie is playing, like the originalFilippos Karapetis
Thanks to eriktorbjorn for noticing this
2012-10-06TOLTECS: Wait a bit after drawing each frameFilippos Karapetis
This reduces the CPU load considerably (it's around 10% now, down from 50%)
2012-10-06TOLTECS: Remove redundant screen updatesFilippos Karapetis
2012-10-05SCI: Add kReadNumber fixmeWillem Jan Palenstijn
Thanks to Walter for noticing this.
2012-10-03TOLTECS: Fix menu positining in the simplest way I can think ofTorbjörn Andersson
All this does is to offset the image when copying it to the screen, and offset the position when checking for clickable items at specific coordinates. It looks and works right to me. I guess that just leaves the buildColorTransTable2() function, but I'm useless for that so someone else will have to look into it.
2012-10-03PEGASUS: Fix uninitialized variableMatthew Hoops
2012-10-03AUDIO: Don't allow skipping negative times in skipSamples()Matthew Hoops
2012-10-03TOLTECS: Improve audio/video sync in the movie playerTorbjörn Andersson
At least on my computer, the sound would stall frequently after a while because the delay between frame was calculated from frame to frame. Now it's calculated from the start of the sound instead.
2012-10-03TOLTECS: Added TODO comment about main menu positionTorbjörn Andersson
I'm guessing that the unused _top variable is what causes the main menu to be drawn at the wrong position at the very start of the game. At that point, it's 30 which seems to be by how much the Y coordinate is off.
2012-10-02TOLTECS: Draw shaded rects to "front screen", not "background"Torbjörn Andersson
The shadeRect() function is called just once (at the time of writing) and immediately afterwards the "front screen" is copied to the "background". Therefore, drawing to the background doesn't seem to make any sense. The colors are wrong, but I assume that's for the same reason that the text colors are wrong as well.
2012-10-01SCI: Fix compilation with MSVC (atan2() was ambiguous)Filippos Karapetis
2012-10-01PEGASUS: MarsTimerEvent is a structFilippos Karapetis
2012-09-30SCI: Implement kMergePolyWillem Jan Palenstijn
Thanks to Walter for creating debugging tools for MergePoly and testing.
2012-09-29WINTERMUTE: Make scGetProperty use Common::String& instead of const char*Einar Johan Trøan Sømåen
2012-09-28WINTERMUTE: Privatize variables in BaseQuickMsgEinar Johan Trøan Sømåen
2012-09-28WINTERMUTE: Privatize variables in BaseRegion and BaseSubFrameEinar Johan Trøan Sømåen
2012-09-28WINTERMUTE: Privatize variables in BaseFrame and BaseSpriteEinar Johan Trøan Sømåen
2012-09-28WINTERMUTE: Privatize variables in BaseFaderEinar Johan Trøan Sømåen
2012-09-28WINTERMUTE: Privatise member-variables in BaseDynamicBufferEinar Johan Trøan Sømåen
2012-09-28TONY: Update the Obj tables in other languagesStrangerke
2012-09-28TONY: Fix German fontsStrangerke
2012-09-28PARALLACTION: Add a workaround for the end credits of NSFilippos Karapetis
The game scripts try to show a non-existing frame. We set it to an existing one here. Part of the fixes for bug #5866
2012-09-28PARALLACTION: Add a workaround for the end credits of NSFilippos Karapetis
The end credits reference a version of Dino called "Dinor", which makes the engine look for a non-existing file. We set the name to "dino", as it should be in this case, so that the engine loads the correct file. Part of the fixes for bug #5866
2012-09-28PARALLACTION: Add a missing return statementFilippos Karapetis
The final credits screen has no background, it just reuses the background of the final scene. Part of the fixes for bug #5866
2012-09-28PARALLACTION: Fix a script bug in the end of the multilingual DOS version of NSFilippos Karapetis
The mouse cursor is incorrectly hidden outside the final cave in NS because of a script bug. A workaround is added to fix that screen and the final screen in order to make it playable. Part of fixes for bug #5866
2012-09-27PARALLACTION: Clean up global variables a bit.Alyssa Milburn
2012-09-27PARALLACTION: Remove unused function.Alyssa Milburn
2012-09-27Merge pull request #281 from fuzzie/parallaction-adlibAlyssa Milburn
PARALLACTION: Add custom Adlib driver for BRA.