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
61,292 Commits 45 Branches 139 Tags
7331a7cbefed7be415da170a32a2549b1c18fd12
Commit Graph
5295 Commits
Author SHA1 Message Date
Stephen Kennedy 0861fa4c00 Merged revisions 32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033,33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33185
 2008-07-22 00:15:13 +00:00
Christopher Page 09f4fd946e Merged revisions 33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33183
 2008-07-21 22:46:39 +00:00
Stephen Kennedy a58080bd58 Changed pushEvent to use a const& argument 
svn-id: r33175
 2008-07-21 18:53:55 +00:00
Stephen Kennedy 871adba671 Refactored KeymapManager to use Domain's of Keymaps rather than a single list. 
Further development of Keymapper interface: 
- switchKeymap method to change Keymaps
- initGame/deInitGame methods to control loading/unloading of game-specific maps

svn-id: r33173
 2008-07-21 15:55:25 +00:00
Stephen Kennedy 757ed1a094 Moved UserAction and HardwareKey classes into their own respective header files. 
Added HardwareKeySet class to manage a devices set of hardware keys.
Started implementing Keymapper class.

svn-id: r33157
 2008-07-21 00:11:25 +00:00
Marcus Comstedt e54ac15109 Solaris tr does not like character classes in some locales. Use "C" locale. 
svn-id: r33143
 2008-07-20 17:56:43 +00:00
Kostas Nakos 0d08240e45 a little more cleanup 
svn-id: r33142
 2008-07-20 17:04:27 +00:00
Kostas Nakos 90781369cb modified patch #1882942 - optimize and kill code for really old platforms 
svn-id: r33141
 2008-07-20 16:55:51 +00:00
Stephen Kennedy 4c730401fe WIP KeymapManager implementation, can only register/unregister keymaps. 
svn-id: r33131
 2008-07-20 15:42:52 +00:00
Kostas Nakos 8b5e175af4 workaround for bogus findfirstfile. kyra now starts up correctly 
svn-id: r33120
 2008-07-20 11:15:29 +00:00
Max Lingua 8c807529a7 Added "DEPDIR := .deps" in Makefile.ps2 
Thanks Max [the other one] for pointing it out!

svn-id: r33117
 2008-07-20 01:44:40 +00:00
Max Lingua 282cb3c0df 1. Re-added "rpckbd" as in 0.11.0 
2. Committed only its source, you will need to do a make inside its folder
   before being able to compile our beloved PlayStation2 backend.

Enjoy,
 -max

svn-id: r33115
 2008-07-20 01:30:47 +00:00
Stephen Kennedy 0b8203b0e5 More WIP development of Keymap class 
svn-id: r33113
 2008-07-19 19:12:49 +00:00
Lars Persson ec02171268 Enable support to turn off ALL variations. all variation is most often the one used 
svn-id: r33109
 2008-07-19 07:44:12 +00:00
Lars Persson 6cff2e8239 eof was not working properly with caching 
svn-id: r33108
 2008-07-19 07:08:37 +00:00
Stephen Kennedy 19345b5a62 Keymap class implemented. KeymapManager and Keymapper classes started 
svn-id: r33107
 2008-07-19 00:57:37 +00:00
Lars Persson 4657a52b07 Fixed typo in filehandling 
svn-id: r33104
 2008-07-18 22:07:52 +00:00
Lars Persson 0f03a7bcd8 Introduced cache for filereading to fix slowness in AGOS among others. 
svn-id: r33099
 2008-07-18 20:40:48 +00:00
Lars Persson 7b00db0312 Symbian soundsmixer update. (Compile fix) 
svn-id: r33098
 2008-07-18 19:02:40 +00:00
Paul Gilbert cb366384f7 In OSystem_SDL::closeMixer moved the call to SDL_CloseAudio to before the deletion of the _mixer variable in to fix an assert that was being generated in OSystem_SDL::mixCallback 
svn-id: r33095
 2008-07-18 09:36:49 +00:00
Max Horn 0f74124d78 Committing PS2 changes on behalf of the other Max ;) 
svn-id: r33089
 2008-07-17 15:56:24 +00:00
Christopher Page 7f480ac571 Quit and RTL code is more modular now. EVENT_RTL no longer sets _shouldQuit, shouldQuit is only set if there's an EVENT_QUIT. EVENT_RTL and EVENT_QUIT are completely separate from each other. Engine::quit() method now checks both _shouldQuit and _shouldRTL to determine if the engine should exit. There is no longer a need for resetQuit(), so it's removed 
svn-id: r33082
 2008-07-16 04:22:56 +00:00
Christopher Page 7ecd54a9da Reverted some incorrect changes and fixed sound settings issues for LURE. Fixed issues with quitting and calling GMM during intro sequences in LURE. Added a KEYCODE_MAINMENU in common/keyboard.h for the GMM. 
svn-id: r33081
 2008-07-15 22:54:39 +00:00
Max Horn 943b4c2036 Implemented audio double buffering (for now OSX only) 
svn-id: r33075
 2008-07-15 17:13:06 +00:00
Max Horn 0860df5d0e Fixed code formatting 
svn-id: r33056
 2008-07-14 07:54:18 +00:00
Christopher Page d2e8d4831e Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33051
 2008-07-14 00:10:09 +00:00
Christopher Page a6e1d6bd3d SKY works with the new GMM implementation, also updated gui/newgui.cpp and prevented pushEvent from pushing more than one EVENT_QUIT into the artificialEventQueue 
svn-id: r33041
 2008-07-13 20:41:39 +00:00
Stephen Kennedy 28cb417fb1 Added comments in virtual-keyboard-parser.h describing the file format. Added a delay functionality to the delivery of artificial events in DefaultEventManager, to get round events being ignored when delivered consecutively. 
svn-id: r33012
 2008-07-12 12:40:57 +00:00
Stephen Kennedy 8aa09cbb99 Better handling of virtual keyboard and gui being displayed at the same time. VK now also uses its own cursor. 
svn-id: r33008
 2008-07-11 20:10:14 +00:00
Christopher Page 67c8c39fdf Queen works with the new GMM implementation, and made a correction to a change in parallaction 
svn-id: r32999
 2008-07-11 00:49:01 +00:00
Bertrand Augereau f41ab55021 Fixed a few warnings 
svn-id: r32994
 2008-07-10 18:01:54 +00:00
Stephen Kennedy 48ed272c8d - added system delay to event loop, to reduce CPU usage 
svn-id: r32979
 2008-07-09 23:05:47 +00:00
Neil Millstone 9f96471f47 DS: Backend changes for new mixer code 
svn-id: r32978
 2008-07-09 16:50:23 +00:00
Stephen Kennedy 1f0b3ceb36 Added pushEvent to EventManager (from cpage88's branch) and changed VirtualKeyboard so that it uses this method to feed key presses its resulting key press events. 
svn-id: r32977
 2008-07-09 13:33:36 +00:00
Stephen Kennedy b035101732 - keyboard fully tested with multiple modes - key press events successfully passed back to engine, mode switching also works 
- added support to re-parse keyboard pack if overlay size changes (to find more suitable layouts)

svn-id: r32975
 2008-07-09 11:30:49 +00:00
Christopher Page e808cdf7a0 Reimplemented pushEvent() and artificialEventQueue to work with Events instead of EventTypes. Reimplemented Queue as a List instead of Array. Updated AGOS, AGI, CINE, GOB, and KYRA to work with the current implementation of the GMM 
svn-id: r32971
 2008-07-09 02:27:05 +00:00
Joost Peters a833c9dd86 set DEPDIR 
svn-id: r32969
 2008-07-08 17:46:26 +00:00
Joost Peters 65ddc23a6b Enable static engines -- time to start thinking about prx/plugin support! 
svn-id: r32968
 2008-07-08 17:41:09 +00:00
Joost Peters 926df065f4 changes for new Mixer API 
svn-id: r32967
 2008-07-08 17:20:26 +00:00
Stephen Kennedy d1bc01b1a9 - Virtual keyboard now can now be dragged, when the user clicks on any part of it that is not a special area. 
- Fixed non-virtual destructor warnings for Shape and Rect classes

svn-id: r32965
 2008-07-08 15:03:39 +00:00
Christopher Page a4f56de13a Implemented Common::EventManager::pushEvent() to insert fake events into the event queue. Quit and RTL events have been added, and are now tracked by the DefaultEventManager using shouldQuit() and shouldRTL(). AGOS is working with this new implementation, other engines to follow. 
svn-id: r32952
 2008-07-07 22:34:45 +00:00
Stephen Kennedy 641e3d752e MILESTONE: bitmap showing with key color transparency implemented! 
- SurfaceKeyColored class handles blitting of keycolor transparency data
- ImageMap tested - Rect and Polygon areas seem to be working as expected

svn-id: r32950
 2008-07-07 21:10:58 +00:00
Stephen Kennedy ee8d55375b - updates for GCC compilation - still having linker errors though :( 
svn-id: r32944
 2008-07-07 15:45:48 +00:00
Stephen Kennedy 275ffece2f - changed VirtualKeyboard classes to Common namespace 
- updated XMLParser from Tanoku's branch

svn-id: r32943
 2008-07-07 15:42:26 +00:00
Stephen Kennedy 5840c2480f - renaming of files 
svn-id: r32942
 2008-07-07 15:06:43 +00:00
Stephen Kennedy 7e3639e68b - moved VirtualKeyboard files into backends/common directory 
svn-id: r32941
 2008-07-07 14:52:30 +00:00
Stephen Kennedy 98f999f8e0 WIP: VirtualKeyboard updates: 
- got keyboard bitmap displaying (no transparency as yet)
- simple event loop for VK to capture mouse clicks done (and untested code to process the clicks)
- pollEvent() method to deliver the virtual key press events to EventManager

svn-id: r32939
 2008-07-07 14:30:11 +00:00
Sven Hesse 1f4ebd2f47 Don't let listSavefiles() search subdirectories. Files with the same name (in different directories) would cause duplicate entries for the same file. 
svn-id: r32938
 2008-07-07 13:01:54 +00:00
Andre Heider 95ca13246e adjustments to the recent mixer api changes 
svn-id: r32924
 2008-07-06 12:04:19 +00:00
Marcus Comstedt 32f653f2b1 Enable all engines. 
svn-id: r32923
 2008-07-05 22:53:17 +00:00