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
6,866 Commits 45 Branches 139 Tags
5ab94de3181a2391a938cfa7afb76fedf218944a
Commit Graph
53 Commits
Author SHA1 Message Date
Joseph Jezak 1e6018dd1f EMI: Fix segfault when cancelling a save. 2014-08-14 10:49:25 -04:00
Joseph Jezak 3b34587096 EMI: Remove repositioning of text. 2014-08-04 11:14:28 -04:00
Joseph Jezak 2c563d41b4 EMI: Honor X and Y attributes to spoken lines, rebased from Botje. 2014-08-04 11:14:27 -04: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 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
Einar Johan Trøan Sømåen 245ba3aa06 GRIM: Reduce scope of some variables in ChangeTextObject 2014-01-07 11:46:15 +01:00
Joel Teichroeb b573f35e43 GRIM: Remove unneeded TextObject constructor 2013-10-24 17:52:28 -07:00
Joel Teichroeb 08d749e730 GRIM: Remove including savefile.h from savegame.h 2013-07-09 22:54:45 -07:00
Paweł Kołodziejski 175620b62a ALL: change license headers from LGPL to GPL, and few updates 2012-12-19 23:15:43 +01:00
Joel Teichroeb 115e3232b8 GRIM: Remove extra semicolons 2012-05-05 22:59:51 -07:00
Joel Teichroeb 77f4978a42 GRIM: Remove unneeded forbidden symbol exceptions 2012-05-05 22:19:45 -07:00
Joel Teichroeb 0dcfaf8fb1 GRIM: Do not include unneeded headers 2012-04-04 16:11:05 -07:00
Joel Teichroeb 63938ba499 GRIM: Clean up unneeded includes and fix some trailing whitespace 2012-03-26 20:12:00 -07:00
Giulio Camuffo 9fb0311925 GRIM: Improve the management of talking actors. 
This commit adds savegame changes waiting to be uncommented.
 2012-03-04 18:20:31 +01:00
Dries Harnie 14b485569b EMI: Always reposition from original coordinates 2012-02-18 22:18:34 +01:00
Joel Teichroeb 9a09114b5f EMI: Improve positioning of text 2012-01-24 08:34:34 -08:00
Paweł Kołodziejski e350c7f777 renames 2012-01-06 23:29:45 +01:00
Joel Teichroeb 9e792f7ff4 GRIM: Fix some issues with text objects. Fixes #440, #441 2011-12-21 12:16:11 -08:00
Giulio Camuffo 353c42effe GRIM: Use the new foreach macro. 
Modify a bit PoolObject::Pool to allow it to be used with foreach.
 2011-11-21 22:07:12 +01:00
Giulio Camuffo cbeccc9fa6 GRIM: Move some lua related code into LuaBase. 2011-10-13 20:25:50 +02:00
Giulio Camuffo 782bfdecf7 GRIM: Lua_L1 -> Lua_V1 and Lua_L2 -> Lua_V2. 2011-10-13 15:41:22 +02:00
Giulio Camuffo 5ca9cae83c GRIM: Incapsulate the lua opcodes in a class hierarchy. 2011-10-12 17:57:31 +02:00
Giulio Camuffo 1fbbd24aee GRIM: Port Actor, Bitmap, Color, Font, Primitive, ObjectState, Scene, TextObj to PoolObject. 
These are the classes that go into Lua, and so are kept in a pool,
indexed with an id.
 2011-09-07 23:08:59 +02:00
Giulio Camuffo 5906b0826d GRIM: Make the opcode InputDialog show a dialog instead of using the console. 2011-07-24 16:19:17 +02:00
Giulio Camuffo 39c6553e61 GRIM: Store the message id in TextObject::_textID, not the message itself. 
Fix #274
 2011-07-22 16:00:14 +02:00
Giulio Camuffo 0547cceee7 GRIM: Others explicit casts. 2011-07-21 11:58:51 +02:00
Pawel Kolodziejski cd8d8cb84e EMI: Stub more lua functions and fix some text stuff (pull request #232) 2011-07-03 10:53:57 +02:00
Joni Vähämäki 5ea33b4f7f GRIM: Allow SayLine messages of zero length. Fixes #199 2011-06-11 18:25:25 +03:00
Pawel Kolodziejski ba0af91198 Merge pull request #222 from klusark/stuff 
Fix TinyGL text rendering.
 2011-06-09 09:16:52 -07:00
Pawel Kolodziejski 7329a5d164 ALL: sync with scummvm 2011-06-09 11:17:15 +02:00
Joel Teichroeb 86c5751695 Fix TinyGL text rendering. 2011-06-07 09:22:12 -07:00
Joel Teichroeb 57e320ec89 Cleaned up some old code. 2011-06-06 13:11:04 -07:00
Joel Teichroeb f925f95fa9 Add checks to ensure that the text received is valid. 2011-06-06 13:07:36 -07:00
Joel Teichroeb a8724370c5 A bit of cleanup. 2011-06-06 13:07:35 -07:00
Joel Teichroeb 5fb97a647b Made fonts be rendered by opengl. 2011-06-06 13:03:46 -07:00
Pawel Kolodziejski 7a5148d73a GRIM: fix bad loop in L1_ChangeTextObject 2011-06-06 09:16:43 +02:00
Pawel Kolodziejski 15cda2a646 GRIM: fix compilation 2011-06-06 08:22:35 +02:00
Pawel Kolodziejski 6d31f42477 EMI: part of pull 214: disabled loadComponentEMI, and EMI case for load font in setTextObjectParams 2011-06-06 07:27:13 +02:00
Pawel Kolodziejski 403cd61c2a GRIM: fix warnings 2011-06-02 10:55:14 +02:00
Giulio Camuffo ca5a804079 GRIM: Check the text object passed before trying to delete it. Fix #192 2011-05-30 22:53:08 +02:00
Giulio Camuffo 0679f6323b GRIM: Actually delete the TextObjects passed to KillTextObject. 2011-05-26 18:02:29 +02:00
Joel Teichroeb 915fc302bd Add support for lua sending text to the background. 2011-05-24 12:55:22 -07:00
Giulio Camuffo 94885408fc GRIM: Implement duration of text objects. 2011-05-22 19:46:59 +02:00
Giulio Camuffo 65b074987e GRIM: Better implementation of IsMessageGoing() when no actor is passed. 2011-05-19 17:56:32 +02:00
Pawel Kolodziejski 356c9c8c07 sync with scummvm 2011-05-18 23:33:39 +02:00
Giulio Camuffo 556efa807e GRIM: Set the value of system.lastActorTalking. Fixes #119 2011-05-18 18:37:15 +02:00
Joel Teichroeb 3fd4945f6f Reducded duplicate code dealing with textobjects. 2011-05-18 16:47:16 +08:00
Pawel Kolodziejski 51953fb5a6 EMI: more opcodes 2011-05-15 13:54:13 +02:00
Pawel Kolodziejski 83de2e6600 refactor movie playback and game detection params 2011-05-14 12:11:53 +02:00