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
137148 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Templier b0248c93fd ASYLUM: Remove obsolete methods from Scene class 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@620 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:30 +02:00
Julien Templier 151e417b72 ASYLUM: Wait 10ms when handling events (reduces CPU usage a lot) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@619 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:30 +02:00
Julien Templier fde7a99ece ASYLUM: Properly clip coordinates and adjust drawing width/height 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@618 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:29 +02:00
Julien Templier e75170cc14 ASYLUM: Implement proper blitting methods in Screen class 
- Convert Text class to use Screen draw methods
- Update screen queue to use draw methods instead of direct copy
- Properly read additional graphic resource data

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@617 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:29 +02:00
Julien Templier ee682f8458 ASYLUM: Reduce SceneTitle progress total time 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@616 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:29 +02:00
Julien Templier 787546f83d ASYLUM: Finish implementing Object::playSounds 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@615 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:29 +02:00
Julien Templier 15421b6b79 ASYLUM: Fix GCC warnings in Menu 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@614 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:29 +02:00
Julien Templier 818f241530 ASYLUM: Implement Scene::update(). Scene now draw again! 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@613 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:29 +02:00
Julien Templier fbe5ee0614 ASYLUM: Fix SceneTitle spinner not moving 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@612 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:29 +02:00
Julien Templier 814ac99ac4 ASYLUM: Update scene event handling and preload 
- Implement Scene init and activate events
- Add stubs for other events
- Update SceneTitle to use proper resource ids and draw methods
- Remove some unused variables from Scene class

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@611 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:28 +02:00
Julien Templier e1d12045d0 ASYLUM: Refactor parts of Scene class 
- Add stubs for event handlers
- Change WorldStats to take an engine pointer like all other classes
- Move copyToBackBufferClipped to screen class

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@610 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:28 +02:00
Julien Templier 2172d82d2e ASYLUM: Implement rest of game startup 
- Add stubs for game loading & setup
- Add stub for sin/cos table initialization

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@609 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:28 +02:00
Julien Templier 7de833af20 ASYLUM: Finish keyboard handling for shortcuts configuration 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@608 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:28 +02:00
Julien Templier 30423dae12 ASYLUM: Implement menu music and main settings click handling 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@607 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:28 +02:00
Julien Templier 7479a0f487 ASYLUM: Implement MainMenu::adjustTextVolume 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@606 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:28 +02:00
Julien Templier a326b61533 ASYLUM: Implement more menu click handling 
- Add click handling to audio and keyboard settings
- Add proper sound sync between mixer and in-game values

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@605 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:28 +02:00
Julien Templier eaea0cd79d ASYLUM: Implement MainMenu update handlers for text, audio, setting and keyboard config 
- Add missing keyboard shortcuts to the list of config keys

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@604 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:27 +02:00
Julien Templier 1286a8bdc4 ASYLUM: Add back Menu credits, new game, quit and return to game 
- Fix text flickering
- Remove obsolete methods in Screen and Text classes

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@603 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:27 +02:00
Julien Templier 912e3131a3 ASYLUM: Implement MainMenu::click() 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@602 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:27 +02:00
Julien Templier 3d7b00db63 ASYLUM: Implement some menu helper functions 
- Switch last two rects (the icons are "inversed")
- Remove now useles EyesAnimation enumeration

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@601 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:27 +02:00
Julien Templier 8a6d76b65e ASYLUM: Overhaul event handling 
- Cleanup game initialization
- Update event loop to use the defined handler
- Menu is now the default event handler
- Implement eye direction update using existing Actor helper method
- Add stubs for all menu update & click event handlers

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@600 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:27 +02:00
Julien Templier 0047d10a67 ASYLUM: Add Savegame class 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@599 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:27 +02:00
Julien Templier f4b1d284b1 ASYLUM: Convert MainMenu to implement EventHandler 
- access to menu is disabled until the main event loop is converted
- update/key/mouse functions have not been converted yet

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@598 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:26 +02:00
Julien Templier f8b4d22f7b ASYLUM: Move coordinate adjustement to Screen::drawGraphicsInQueue 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@597 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:26 +02:00
Julien Templier 9d195216a3 ASYLUM: Cleanup use of adjustCoordinates 
Also add FIXME since the original doesn't add the frame coordinates
(we are missing code in the Screen class that would do it at drawing time)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@596 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:26 +02:00
Julien Templier 12057a04d2 ASYLUM: Use subtitle config option when playing movies 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@595 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:26 +02:00
Julien Templier fff878e1c0 ASYLUM: Cleanup some screen methods 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@594 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:26 +02:00
Julien Templier 98a98a8486 ASYLUM: Fix GCC compilation and warnings 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@593 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:26 +02:00
Alexandre Fontoura ce04e57184 ASYLUM: Revert previous commit!! Commented WorldStats xLeft and yTop from Scene::adjustCoordinates to correct actors and objects Scene scrolling positions. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@592 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:25 +02:00
Alexandre Fontoura a6178aa903 ASYLUM: Fixed Actors and Objects positions according with Scene screen scrolling. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@591 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:25 +02:00
Julien Templier 4c07c73e00 ASYLUM: Add loading of transparency tables 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@590 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:25 +02:00
Julien Templier 98ee55b9f3 ASYLUM: Update Text class 
- Add missing text output methods
- Fix displaying of subtitles
- Add comments for obsolete methods (to be removed later)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@589 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:25 +02:00
Julien Templier 32c6bcc631 ASYLUM: Implement two more Actor process methods 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@588 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:25 +02:00
Julien Templier 46d6833e3e ASYLUM: Implement some speech-related encounter helper methods 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@587 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:25 +02:00
Julien Templier 4ddf064c3f ASYLUM: Implement Encounter init methods 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@586 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:24 +02:00
Julien Templier 10615c7aed ASYLUM: Init puzzle on first use (the background id is scene-dependent) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@585 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:24 +02:00
Julien Templier 11a6152eae ASYLUM: Update event handling 
- Add initPuzzle to initialize the list of puzzle instances
- Update switchEventHandler to take a class instance (implementing EventHandler)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@584 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:24 +02:00
Julien Templier a02af8db05 ASYLUM: Implement Encounter::init and update Encounter::messageHandler 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@583 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:24 +02:00
Julien Templier 7c179d025e ASYLUM: Enhance actions debug command slightly 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@582 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:24 +02:00
Julien Templier d2c8b7e83f ASYLUM: Move VCR puzzle to a separate file 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@581 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:24 +02:00
Julien Templier df58690e9c ASYLUM: Move puzzle class to a separate puzzles directory 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@580 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:23 +02:00
Julien Templier 4534e7fbda ASYLUM: Move data.h to resources folder 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@579 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:23 +02:00
Julien Templier b808ab3e2a ASYLUM: Move two encounter flags from shared data to Encounter class 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@578 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:23 +02:00
Julien Templier e23232ddec ASYLUM: Add Encounter::isSpeaking() helper method 
- Expose Speech tick

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@577 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:23 +02:00
Julien Templier 01b0ea4915 ASYLUM: Implement Encounter::messageHandler() 
- Add Sound::getMusicVolume()
- Update AsylumEvent
- Add stubs for mouse, key, update and init events handlers

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@576 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:23 +02:00
Julien Templier a07548e605 ASYLUM: Implement Encounter::findKeyword() 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@575 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:23 +02:00
Julien Templier c8a9d4cc0a ASYLUM: Implement Encounter::runScript() 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@574 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:23 +02:00
Julien Templier 4cd87eaee2 ASYLUM: Implement AsylumEngine::switchMessageHandler() 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@573 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:23 +02:00
Julien Templier 377438ef7a ASYLUM: Update Encounter class 
- Add error handling to load() method
- Implement getVariable & getVariableInv
- Add script init and entry loading

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@572 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:22 +02:00
Julien Templier 15e46d466a ASYLUM: Update event handling + encounter progress 
- Add custom asylum event
- Implement parts of Encounter::run
- Correct parameters passed to encounter debug command

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@571 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:22 +02:00