Emulation/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2025-04-02 10:52:32 -04:00
Code Issues Projects Releases Packages Wiki Activity
123393 commits 42 branches 133 tags 2.1 GiB
Commit graph

151 commits

Author SHA1 Message Date
Orgad Shaneh
a05e54f00c JANITORIAL: Remove trailing whitespaces 2021-05-04 11:46:30 +03:00
Eugene Sandulenko
5e7fe2dc57
JANITORIAL: Replace spaces in indentation with tabs 2021-04-15 21:20:36 +02:00
Paweł Kołodziejski
15f1f86bfe GRIM: Remove end lines from warning() messages 2020-11-12 10:51:13 +01:00
Pawel Kolodziejski
f8570d332f GRIM: Fixed smush compilation 2020-10-07 20:33:50 +02:00
Pawel Kolodziejski
1e26030a51 GRIM: Attempt to fix travis builds 2020-10-07 20:09:42 +02:00
Paweł Kołodziejski
6e619ca714 GRIM: Merge branch 'remastered' 2020-10-07 18:26:49 +02:00
Dries Harnie
f393929c6f EMI: Always enable subtitles for the demo 
Fixes #1161.
Tested on the German and Spanish demo.
 2020-05-17 13:49:54 +02:00
Dries Harnie
49a4de702f GRIM/EMI: Draw movie subtitles while holding frame lock 
This prevents a crash that occurs if the movie player deletes the
active subtitle while the main loop is still in the process of drawing
it.
 2020-05-17 13:48:24 +02:00
Bastien Bouclet
84e62b6c8d ALL: Sync with ScummVM - rev. 87ebc7140c 2017-09-02 15:04:07 +02:00
Bastien Bouclet
9853d26344 GRIM: Fix playing bink videos in the demo version of EMI 
The OpenGL renderers would choke because the pixel format of the screen
was being used instead of the expected one.
 2017-08-25 21:24:16 +02:00
Bastien Bouclet
7c60a59c81 GRIM: Account for the alignment when seeking smush movies 2017-05-08 10:54:04 +02:00
Dries Harnie
fb3bd8139a JANITORIAL: Fix Coverity warnings 
Fixes coverity warnings 1267220, 1256936, 1229470, 1224097, 1219766,
1054364, 1009896.
 2015-05-12 08:49:19 +02:00
Christian Krause
a8c1f05eb7 GRIM: Fix compile warnings in codec48.cpp 2015-02-02 21:20:58 +01:00
Einar Johan Trøan Sømåen
1e5f5d6947 HACK: Add support for playing Theora-videos from the SmushPlayer, when playback of SMUSH-fails, this should perhaps result in a new class for handling codecs dynamically (so that we can resolve both the Aspyr-logo and Theora/Smush-juggling in a consistent way). Also hack the scaling for 1080p-videos for now. 2015-02-01 16:06:15 +01:00
Bastien Bouclet
067dda8b02 GRIM: Play the audio track for demo smush files 2015-01-24 08:02:48 +01:00
Pawel Kolodziejski
15eeacc7be CREDITS: update credits 2015-01-20 22:42:48 +01:00
Pawel Kolodziejski
d1673ddbf5 GRIM: added codec48 for German Grim demo video 2015-01-20 21:59:52 +01:00
Pawel Kolodziejski
2ff9b59e8f GRIM: allow skip unimplemented codec 48 2015-01-18 17:03:57 +01:00
Pawel Kolodziejski
b832fd43c1 EMI: precise ps2 mpeg output format to avoid use various pixel formats based on screen format 2015-01-13 20:08:14 +01:00
Pawel Kolodziejski
7bdd1af0d7 EMI: precise bink output format to avoid use various pixel formats based on screen format 2015-01-13 18:59:09 +01:00
Pawel Kolodziejski
dd02af967e GRIM: Fixed crash/invalid reads in Blocky16 #909 2014-12-27 14:31:53 +01:00
Einar Johan Trøan Sømåen
223c81b144 EMI: Add code for one-shot playing the Aspyr logo on EMI Mac 
This needs to be separate from the other videos, since the logo
is encoded as QuickTime. This solution replicates logic from
mainLoop to avoid adding any further special cases in engine code.
 2014-12-02 17:01:39 +01:00
Joseph Jezak
94543abdb7 EMI: Skip setting up the text when it will be repositioned later. 2014-07-22 18:23:34 -04:00
Joel Teichroeb
21ca0acedc GRIM: Add override to overriden functions 2014-05-30 17:45:22 -07:00
Joel Teichroeb
0f3da43694 GRIM: Change NULL to nullptr. 2014-05-30 17:43:08 -07:00
Pawel Kolodziejski
8759900b6a ALL: synced with ScummVM 2014-04-05 18:18:42 +02:00
Ingo van Lil
4a87ea3962 EMI: Hide subtitle when stopping movie playback 2014-03-22 10:37:31 -07:00
Pawel Kolodziejski
2dd5c24ab1 GRIM: shut up compiler warnings 2014-02-16 08:43:33 +01:00
Einar Johan Trøan Sømåen
cc2cc0fdf8 GRIM: Fix broken overriding functions play and loadFile in NullPlayer 2014-02-02 04:12:48 +01:00
Einar Johan Trøan Sømåen
c28426600e GRIM: Reduce scope of variable "version" in SmushDecoder 2014-01-07 18:33:56 +01:00
Einar Johan Trøan Sømåen
0e67c0191a GRIM: Initialize members in Blocky16's constructor. 2014-01-07 12:26:17 +01:00
Einar Johan Trøan Sømåen
e0348758f2 GRIM: Initialize members in Blocky8's constructor 2014-01-07 12:19:47 +01:00
Christian Krause
19b08f6fb3 EMI: implement subtitle support for SMUSH videos 2014-01-05 12:58:41 +01:00
Christian Krause
ff930b84de EMI: use enableSubtitles parameter of StartMovie lua function 2014-01-05 12:58:19 +01:00
Christian Krause
a5fb089bee EMI: Fix various movies 
- several movies (e.g. at the boulder puzzle on vista point)
  were not played

- enhance search for BINK header (some movie files don't have a
  SMUSH header and for others the movies starts at a higher position in
  the stream)
 2013-12-22 20:38:03 +01:00
Joel Teichroeb
e06677d2e8 GRIM: Silence a comparison between signed and unsigned warning 2013-12-02 22:47:51 -08:00
Giulio Camuffo
e2c36b4b34 GRIM/smush: Fix an assert happening in some cases when seeking 2013-10-30 15:41:08 +01:00
Giulio Camuffo
3fc3ed1caa GRIM: Fix Smush seeking 2013-10-30 14:55:20 +01:00
Joel Teichroeb
2e00bdffe3 GRIM: Remove _deltaSize from the blocky classes as it is only used locally 2013-10-24 18:59:48 -07:00
Pawel Kolodziejski
790db038c0 ALL: sync with scummvm 2013-10-13 11:30:34 +02:00
Einar Johan Trøan Sømåen
fe3883cecd GRIM: Reformat code to be closer to convention. 2013-07-09 21:12:55 +02:00
Joel Teichroeb
0b53a959c4 GRIM: Missed making one string a const reference causing functions to not be virtualized correctly 2013-07-08 11:17:36 -07:00
Joel Teichroeb
4eb508cb61 GRIM: Use const references for strings 2013-07-07 20:56:24 -07:00
Einar Johan Trøan Sømåen
83292448de GRIM: Initialize all variables in the SmushDecoder-classes. 2013-04-21 15:44:45 +02:00
Einar Johan Trøan Sømåen
e236b2ea8f GRIM/SMUSH: Avoid leaking _queueStream. 2013-04-21 15:27:49 +02:00
Giulio Camuffo
2132228314 GRIM/Movie: When seeking start decoding blocky16 from the keyframe. 2013-01-17 22:48:54 +01:00
Giulio Camuffo
c35a88657d GRIM/Movie: Fix some delete/delete[]/free mismatches. 2013-01-17 21:54:38 +01:00
Giulio Camuffo
66ba0f4c95 GRIM/Movies: Cleanup outdated comments. 2013-01-14 23:23:47 +01:00
Giulio Camuffo
e92ef642cd GRIM:/Movie: Remove two warnings. 2013-01-14 23:07:24 +01:00
Giulio Camuffo
0cb18dd3fa GRIM/Movie: Init the frames only when needed. 2013-01-14 23:06:34 +01:00