Commit graph

40 commits

Author SHA1 Message Date
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
Pawel Kolodziejski
89aca4882d applied great fix :) (this part doesn't work as should be, commented out as it has only minor effect on formating which is not proper anyway) 2009-06-18 18:11:11 +00:00
Pawel Kolodziejski
abaa548181 synced with scummvm 2009-06-18 11:52:26 +00:00
Pawel Kolodziejski
0d3fbee180 shut up warnings 2009-06-01 19:09:09 +00:00
Torbjorn Andersson
e90ad4af30 warning() and error() add a ! to the string automatically. 2009-05-31 07:33:18 +00:00
Pawel Kolodziejski
f364f9a535 update headers 2009-05-26 14:13:08 +00:00
Pawel Kolodziejski
a4467bd1d0 convert residual into multi engine support (not all things done yet, WIP) 2009-05-25 19:21:58 +00:00
Pawel Kolodziejski
8b8e7e07d2 added namespace Grim 2009-05-25 06:49:57 +00:00
Pawel Kolodziejski
697af45d7a don't display when disabled 2009-05-24 19:44:47 +00:00
Pawel Kolodziejski
a34d883844 update path includes for recent directory changes 2009-05-24 19:13:58 +00:00
Pawel Kolodziejski
f58c073a0a move/rename engine into engines/grim 2009-05-24 18:55:19 +00:00
Renamed from engine/textobject.cpp (Browse further)