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
111,291 Commits 45 Branches 139 Tags
fb3f2dad63c8ae7b671fedaeb052d692be07fca4
Commit Graph
110 Commits
Author SHA1 Message Date
Giulio Camuffo a270ca866b GRIM: Make TextObject::_textID a String. 2011-07-25 17:06:24 +02:00
Giulio Camuffo 5f59fff5b3 GRIM: Move the debug levels enum in a separate header. 2011-07-23 15:37:14 +02:00
Giulio Camuffo b0efe91506 GRIM: Initialize textObject::_maxLineWidth. 2011-07-22 22:42:26 +02:00
Giulio Camuffo 692ce7685f GRIM: Some header cleanups. 2011-07-22 22:40:49 +02:00
Pawel Kolodziejski 60611723ff Merge branch 'master' of git://github.com/residual/residual 2011-07-20 06:28:17 +02:00
Giulio Camuffo d6436fbee8 GRIM: Fix the in-word wrapping of subtitles. Fix #244 2011-07-12 12:20:53 +02:00
Giulio Camuffo 994c2ef52f GRIM: Shut up a warning. 2011-07-04 12:13:48 +02:00
Giulio Camuffo 73bd50a96f GRIM: Init TextObject::_lines to NULL in TextObject(). 2011-07-04 12:09:44 +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
Giulio Camuffo e585759a32 GRIM: Don't set a TextObject's _disabled to true if the text is none. Fix #227 2011-06-24 15:22:31 +02:00
Joel Teichroeb 7e453c1bbc Destroy the old textobject graphics data when text is changed. Fixes #240 2011-06-11 22:33:55 -07:00
Giulio Camuffo 1c6e03f08d GRIM: Don't save TextObject::_created. 2011-06-10 19:03:08 +02:00
Pawel Kolodziejski ba0af91198 Merge pull request #222 from klusark/stuff 
Fix TinyGL text rendering.
 2011-06-09 09:16:52 -07:00
Giulio Camuffo 8e91515595 GRIM: Fix restore of TextObjects. Fix #220 2011-06-07 18:25:37 +02:00
Joel Teichroeb 86c5751695 Fix TinyGL text rendering. 2011-06-07 09:22:12 -07:00
Joel Teichroeb 722ab01405 Fixed incorrect symbols being shown. 2011-06-06 13:07:38 -07:00
Joel Teichroeb a208b3c9b0 Kind of fix it. 2011-06-06 13:07:37 -07:00
Joel Teichroeb de9bfa0a52 Added some more data checking. 2011-06-06 13:07:37 -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 16061be03e Cleaned up some code and improved the tinygl creation and rendering. 2011-06-06 13:07:35 -07:00
Joel Teichroeb c69322d78b Improved the tinygl font rendering. 2011-06-06 13:07:32 -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 65eb5d8ea2 Fix improper merge 2011-06-06 13:07:31 -07:00
Joel Teichroeb b94fcbd554 Finished new font stuff 2011-06-06 13:07:30 -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
Joel Teichroeb 5fb97a647b Made fonts be rendered by opengl. 2011-06-06 13:03:46 -07:00
Giulio Camuffo 5efbdf0a1b GRIM: If duration == 0 the text object won't expire. 2011-05-23 16:35:10 +02:00
Giulio Camuffo 2ba81d9c13 GRIM: Default TextObjectCommon::_duration to 0. 2011-05-23 16:34:38 +02: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 7e3e63dbbd GRIM: Rename GrimEngine's getters. 2011-05-05 11:25:08 +02:00
Matthew Hoops 938800e170 GRIM: Silence a ton of warnings 2011-05-02 03:56:42 +08: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 a7449f24ff shutup warning 2011-04-17 12:34:22 +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
Pawel Kolodziejski 55415ee174 fix compilation using msvc 2011-04-10 11:24:03 +02:00
Giulio Camuffo 66bba94bcf Fixed some warnings. Patch by Torbjorn Andersson. 2011-04-05 21:45:20 +02:00
Giulio Camuffo ca8985862c Paint the TextObjects after restore. Bumped savegame version to 3. 2011-03-22 17:51:34 +01: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
Torbjorn Andersson 66fc2be7a8 TextObject: Use specified width if available, instead of 640. 
This is based on pure guesswork, but it does seem to fix the word
wrapping on Dom's computer.
 2010-08-09 13:18:43 +00: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 788713d3b4 fix warnings 2009-10-17 12:48:23 +00:00
Pawel Kolodziejski 567c4e945d apply patch #2829879 2009-08-04 14:44:48 +00:00
Pawel Kolodziejski d6dcf90eb6 added save font, textobject 2009-06-23 05:15:20 +00:00