Johannes Schickel
5673dc1692
QUEEN: Rename override to overrideCmd.
...
This fixes compilation on pre-C++11 compilers.
2013-01-26 14:43:21 +01:00
Johannes Schickel
2ef500ce81
Merge pull request #256 from lordhoto/thumbnail-pixelformat
...
GRAPHICS: Serialize PixelFormat for thumbnails and allow 4Bpp surfaces.
2013-01-26 05:37:32 -08:00
Johannes Schickel
59dde54519
Merge pull request #301 from lordhoto/c++11-playground
...
RFC: Allow use of override and nullptr. Also allow C++11 compilation.
2013-01-26 05:25:14 -08:00
Johannes Schickel
94edb3409f
Merge branch 'eriktorbjorn-fluidsynth-settings'
...
This is a manual merge of a slightly adapted pull request #296 .
The changes made are:
- Each time the theme format changes, the version was increased
- default.inc has been regenerated in the same commit as the theme changes
2013-01-26 14:00:04 +01:00
Torbjörn Andersson
e4a77aff06
GUI: Move the FluidSynth reset button from Misc tab to bottom
...
This should make it clearer that Reset applies to all of the
FluidSynth settings, not just the Misc tab.
2013-01-26 13:53:43 +01:00
Torbjörn Andersson
10724365aa
GUI: Misc FluidSynth-related cleanups.
2013-01-26 13:52:36 +01:00
Torbjörn Andersson
c780df5175
GUI: Add "Reset" button to FluidSynth settings dialog
...
This resets the FluidSynth settings to their default values.
2013-01-26 13:52:32 +01:00
Einar Johan Trøan Sømåen
3b77a97b40
WINTERMUTE: Don't cast bool to pointer.
2013-01-26 13:44:46 +01:00
Torbjörn Andersson
45c1296021
GUI: Swap Reverb and Chorus tabs in FluidSynth settings
...
Again, this is to be more like Qsynth.
2013-01-26 13:36:39 +01:00
Torbjörn Andersson
a188a43da6
GUI: Make the FluidSynth settings dialog a bit more like Qsynth
...
To help people familiar with Qsynth (I'm not, but it seems to be
one of the more polished FluidSynth front ends), use the same
presentation and terminology for the FluidSynth settings.
More to follow.
2013-01-26 13:36:39 +01:00
Torbjörn Andersson
bc33b5c0f1
BADA: Add completely untested layout changes to Bada theme
...
I've simply copied this from classic_layout.stx. It probably needs
a bit of tweaking.
2013-01-26 13:36:39 +01:00
Torbjörn Andersson
681f81211f
FLUIDSYNTH: Add separate dialog for FluidSynth settings
...
I don't really understand what these parameters do, or what the
sensible values are, so for now the sliders are limited only by
the allowed (or, in one case, "safe") values.
2013-01-26 13:36:37 +01:00
Filippos Karapetis
866961bde9
VIDEO: Hook some more of our ADPCM decoder variants to our AVI video decoder
...
Information for the AVI audio track format IDs has been taken from libav.
Thanks to clone2727 for his great help on this.
2013-01-26 03:43:15 +02:00
Johannes Schickel
fefa3bdd3f
Merge pull request #302 from clone2727/gl-linear-fix
...
OPENGL: Fix linear filtering when the texture size doesn't match the real size
2013-01-24 17:39:30 -08:00
Willem Jan Palenstijn
f5e43484a0
SCI: Fix kReadNumber sign/hex behaviour
...
Negative numbers now work, and hex overflow is handled like SSCI.
Thanks to waltervn for testing.
2013-01-25 00:57:50 +01:00
Filippos Karapetis
5691a40380
SCI: Update documentation on bug #3585189 and remove an invalid TODO
...
Thanks wjp for pointing out some extra parameters related to pathfinding in SCI
2013-01-24 23:23:48 +02:00
Willem Jan Palenstijn
498fe75dc5
SCI: Fix shadow warning
2013-01-24 22:12:15 +01:00
Willem Jan Palenstijn
89cd5e7416
SCI: Add GetAngle for SCI1 that matches SSCI
...
Thanks to waltervn for creating a scis test script to verify.
2013-01-24 22:10:20 +01:00
Filippos Karapetis
b0cfe968b0
SCI: Fix bug #3585189 - "SCI: QFG1VGA - game hangs in the tavern"
2013-01-24 22:25:09 +02:00
Einar Johan Trøan Sømåen
454542eba1
WINTERMUTE: Even more formatting fixes.
2013-01-24 20:27:03 +01:00
Einar Johan Trøan Sømåen
c239b868da
WINTERMUTE: More formatting fixes.
2013-01-24 20:17:17 +01:00
Einar Johan Trøan Sømåen
5d4d65d6d9
JANITORIAL: Fix ){ -> ) {
2013-01-24 20:15:13 +01:00
Matthew Hoops
fa9dd0f6c0
OPENGL: Fix linear filtering when the texture size doesn't match the real size
2013-01-24 12:49:21 -05:00
Einar Johan Trøan Sømåen
2507b5db8d
WINTERMUTE: Fix formatting in persistent.h
2013-01-24 18:46:32 +01:00
Einar Johan Trøan Sømåen
487539f102
WINTERMUTE: Remove commented out code.
2013-01-24 18:39:57 +01:00
Einar Johan Trøan Sømåen
1fee32ce45
WINTERMUTE: Return something from repeatLastDisplayOp
2013-01-24 18:24:47 +01:00
Einar Johan Trøan Sømåen
199425562e
WINTERMUTE: Fix a leak in sound-file loading.
2013-01-24 17:49:24 +01:00
Einar Johan Trøan Sømåen
58777682fe
GRAPHICS: Fix leak in PNG-decoder.
2013-01-24 17:39:16 +01:00
Einar Johan Trøan Sømåen
17809d0fb3
WINTERMUTE: Delete the _dirtyRect-field of BaseRenderOSystem in the destructor.
2013-01-24 17:27:50 +01:00
Einar Johan Trøan Sømåen
5453f7f7e6
WINTERMUTE: Delete the renderTickets when deleting BaseRenderOSystem
2013-01-24 17:24:31 +01:00
Einar Johan Trøan Sømåen
9d7bcd4aaa
WINTERMUTE: Initialize debugger-variables in WinterMuteEngine.
2013-01-24 17:18:42 +01:00
Einar Johan Trøan Sømåen
426dda70e1
WINTERMUTE: Don't scale 2Bpp images with code aimed at 4Bpp
2013-01-24 17:14:51 +01:00
Einar Johan Trøan Sømåen
a1a6354687
WINTERMUTE: Don't scroll as fast as the scripts actually ask for.
2013-01-24 16:12:35 +01:00
Einar Johan Trøan Sømåen
e829a57762
WINTERMUTE: Fix scrollspeed (and break character animation the same way WME Lite does)
2013-01-24 15:12:02 +01:00
Einar Johan Trøan Sømåen
2e8e3ae13e
WINTERMUTE: Don't draw tickets instantly.
2013-01-24 15:11:56 +01:00
Einar Johan Trøan Sømåen
519821b53b
WINTERMUTE: Further improve UITiledImage-drawing.
2013-01-24 15:11:28 +01:00
Filippos Karapetis
0143a5d938
SCI: Bugfix for commit 0968acc
: only filter out missing messages for the jar
...
This is to properly fix bug #3601090 without removing any functionality.
The additional check ensures that the look and hand icons work with the
jar. Many thanks to lskovlun for debugging this and providing a fix
2013-01-23 21:31:26 +02:00
Einar Johan Trøan Sømåen
5ba950c8a4
WINTERMUTE: Add the possibility of enabling/disabling FPS from Debugger.
2013-01-23 11:32:06 +01:00
Einar Johan Trøan Sømåen
efbe9bdae1
WINTERMUTE: Add in debugger-console, enabled by Ctrl-d
2013-01-23 11:18:44 +01:00
Filippos Karapetis
0968acccfd
SCI: Fix script bug #3601090 - "SCI: Pepper's Adventures in Time: Game becomes unsolvable"
...
Many thanks to lskovlun for debugging this problem and finding the
offending script code that caused it.
2013-01-23 03:17:10 +02:00
Filippos Karapetis
b1ff5ba247
SCI: Slight cleanup in kMessage()
2013-01-23 03:17:10 +02:00
Einar Johan Trøan Sømåen
6476ba33d2
WINTERMUTE: Fix double delete of TTFs.
2013-01-23 01:40:13 +01:00
Einar Johan Trøan Sømåen
53f0871b07
WINTERMUTE: Store savegame-thumbs in game-specific sizes too.
2013-01-23 01:32:51 +01:00
Einar Johan Trøan Sømåen
57bc6374f4
WINTERMUTE: Use FreeSans from ScummModern.zip if the requested font is unavailable.
...
Right now this is the ONLY replacement in place, but Arial is also the default font for WME, so it should cover most cases.
2013-01-23 00:34:04 +01:00
Einar Johan Trøan Sømåen
2c2fe9e941
WINTERMUTE: Correct a delete/delete[]-mismatch pointed out by valgrind
2013-01-22 23:38:00 +01:00
Filippos Karapetis
338c88e5c2
WINTERMUTE: Fix incorrect reversion of code in BaseRenderOSystem::drawLine()
2013-01-23 00:25:38 +02:00
Filippos Karapetis
03634d0833
WINTERMUTE: Fix invalid reads and crashes in BaseRenderOSystem::drawSurface()
2013-01-23 00:21:32 +02:00
Einar Johan Trøan Sømåen
d52ad7e0eb
WINTERMUTE: Use prefix-operators on iterators.
2013-01-22 23:00:47 +01:00
Einar Johan Trøan Sømåen
ff1e91226d
WINTERMUTE: Allow users to enable the FPS-counter in the GUI, and disable MT32-settings.
2013-01-22 22:05:20 +01:00
Einar Johan Trøan Sømåen
4095b76939
WINTERMUTE: Silence a warning.
2013-01-22 20:58:23 +01:00