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
137,148 Commits 45 Branches 139 Tags
de151ea3fddd6a2d36a41400a55366bd2a6a94de
Commit Graph
54 Commits
Author SHA1 Message Date
Paweł Kołodziejski 06902574b4 GRIM: Janitorial 2022-06-08 01:12:00 +02:00
Paweł Kołodziejski 20cb0ae228 ALL: Cleanup ResidualVM -> ScummVM 2021-12-26 21:19:38 +01:00
Eugene Sandulenko abea37c9bb ALL: Update ScummVM project license to GPLv3+ 2021-12-26 18:48:43 +01:00
Eugene Sandulenko 5e7fe2dc57 JANITORIAL: Replace spaces in indentation with tabs 2021-04-15 21:20:36 +02:00
Joel Teichroeb 08dc8b3422 Load coords from text objects 2015-02-03 19:49:47 -08:00
Joel Teichroeb 6df76c20df Load and render ttf fonts 2015-02-01 15:36:56 -08:00
Joseph Jezak 3b34587096 EMI: Remove repositioning of text. 2014-08-04 11:14:28 -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
Pawel Kolodziejski 8759900b6a ALL: synced with ScummVM 2014-04-05 18:18:42 +02:00
Joel Teichroeb 91f4e2681b GRIM: Add a vertex buffer object for blast text drawing 
This makes it so that we don't have to destroy the VBO
that a blast text object uses. This fixes what is probably
a driver bug with the windows nvidia drivers.
 2014-01-17 09:48:09 -08:00
Ingo van Lil 5d2e2240b7 EMI: Rework text stack handling 
The text stack in EMI must be saved and restored in save games because
the game will call PopText after returning from the menu. Instead of
managing separate lists for each text stack level this patch adds a
_stackLevel field that is incremented for PushText and decremented for
PopText. Only text objects from the stack top (level 0) are rendered.
 2013-12-01 23:45:07 +01:00
Christian Krause f3c81da634 EMI: Fix color of menu entries 
The highlighted menu entry is sometimes not correctly colored.
There are multiple textObjects per string (one for each color) and
residualvm draws them in an unspecified order.

To ensure that the correct textObject is drawn on top, each
object gets a layer attribute assigned by the lua code.

The patch adds the layer attribute to the runtime engine and orders the
textObjects by layer before drawing them.
 2013-11-27 22:07:25 +01:00
Joel Teichroeb 92c48e6637 GRIM: const more paramiters 2013-10-25 07:48:27 -07:00
Joel Teichroeb bd70520832 GRIM: Fix typo (speach -> speech) 2013-10-25 06:41:29 -07:00
Joel Teichroeb b573f35e43 GRIM: Remove unneeded TextObject constructor 2013-10-24 17:52:28 -07:00
Joel Teichroeb 767291a8d6 GRIM: Initialize everything in TextObject 2013-07-10 12:09:06 -07:00
Joel Teichroeb 7658e8825d GRIM: Reorder TextObject data to reduce size in memory by 4 bytes 2013-07-07 21:07:23 -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 13a9e6fd3e GRIM: Make TextObject use const where appropriate 2012-05-05 18:20:54 -07:00
Joel Teichroeb 94aeca9663 GRIM: Remove tag from the pool template 2012-04-05 15:20:30 -07:00
Joel Teichroeb 63938ba499 GRIM: Clean up unneeded includes and fix some trailing whitespace 2012-03-26 20:12:00 -07:00
Dries Harnie 14b485569b EMI: Always reposition from original coordinates 2012-02-18 22:18:34 +01:00
Joel Teichroeb aa814e3334 GRIM: Enhance the way that colors are given to lua. 2012-01-27 11:47:28 -08:00
Joel Teichroeb 9a09114b5f EMI: Improve positioning of text 2012-01-24 08:34:34 -08:00
Joel Teichroeb ca90fd30bd GRIM: Remove the disabled paramiter from textobject as it is not needed 2012-01-12 15:19:17 -08:00
Paweł Kołodziejski e350c7f777 renames 2012-01-06 23:29:45 +01:00
Joel Teichroeb ee81d2bbb3 GRIM: Cleaned some dependancies between files 2011-12-17 21:48:17 -08: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 54e1478e85 GRIM: Calculate the bounding box of the meshes only if necessary. 2011-07-25 23:42:07 +02:00
Giulio Camuffo a270ca866b GRIM: Make TextObject::_textID a String. 2011-07-25 17:06:24 +02:00
Giulio Camuffo 692ce7685f GRIM: Some header cleanups. 2011-07-22 22:40:49 +02:00
Joel Teichroeb 86c5751695 Fix TinyGL text rendering. 2011-06-07 09:22:12 -07:00
Joel Teichroeb 16061be03e Cleaned up some code and improved the tinygl creation and rendering. 2011-06-06 13:07:35 -07:00
Joel Teichroeb 4725e4fbe5 Make the graphics systems draw the TextObject instead of just the text. 2011-06-06 13:07:32 -07:00
Joel Teichroeb 3e8baa9657 Removed a large amount of now unused code and slightly improved font stuff. 2011-06-06 13:07:29 -07:00
Giulio Camuffo 698ca807d4 GRIM: Save duration of text objects. 2011-05-23 16:28:05 +02:00
Giulio Camuffo 94885408fc GRIM: Implement duration of text objects. 2011-05-22 19:46:59 +02:00
Pawel Kolodziejski 356c9c8c07 sync with scummvm 2011-05-18 23:33:39 +02:00
Joel Teichroeb 3fd4945f6f Reducded duplicate code dealing with textobjects. 2011-05-18 16:47:16 +08:00
Joel Teichroeb 4751516279 Cleaned up dependencies between files. 2011-05-13 17:55:14 -07:00
Giulio Camuffo 6609720f66 GRIM: Rename TextObject's getters. 2011-05-05 11:52:44 +02:00
Giulio Camuffo 1e868dd359 GRIM: Store ids instead of the pointers as lua's userdata objects. 
Removed ObjectManager as it became useless.
 2011-05-01 18:54:29 +02:00
Pawel Kolodziejski b18b857558 cleanup headers - grim part 2011-04-16 14:12:44 +02:00
Matthew Hoops 00ee0554be GRIM: Remove global constructor usage and silence warnings 2011-04-12 20:51:55 +08:00
Giulio Camuffo cff70f9fad Cleanings. Mostly indent fixes. 2011-03-21 17:18:04 +01:00
Giulio Camuffo 59dcece9ae Working savegame support. 
Implemented also the movement of Manny's head when looking at usable items.
This commit also introduces a new Object class with a ObjectPtr used for
caching the resources loaded by ResourceLoader. This fixes also the lipsync
regression.
 2011-03-21 05:41:30 +08:00
Pawel Kolodziejski 37196b649a applied patch #2898517 2009-11-16 18:09:51 +00:00
Pawel Kolodziejski d375e093b3 fix warnings 2009-10-17 13:25:12 +00:00
Pawel Kolodziejski d6dcf90eb6 added save font, textobject 2009-06-23 05:15:20 +00:00
Pawel Kolodziejski f364f9a535 update headers 2009-05-26 14:13:08 +00:00