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
Filippos Karapetis 02c7d575ab ASYLUM: Rewrote the resource loading code and simplified menu handling a bit in the process. The newly-added text code has been disabled for now, till it works with the new system 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@94 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:14 +02:00
Alex Bevilacqua eaf5f2a80d ASYLUM: load the proper main menu background 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@93 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:14 +02:00
Alexandre Fontoura b353ca5b56 ASYLUM: First character display test under menu state. Next comes text display. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@92 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:14 +02:00
Alexandre Fontoura bb3358839f ASYLUM: Text skeleton to handle screen text display. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@91 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:14 +02:00
Filippos Karapetis 6268e32726 ASYLUM: Moved the cursor and video related code outside the soon-to-be replaced resource manager 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@90 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:13 +02:00
Filippos Karapetis 6a8ee75809 ASYLUM: Moved sound-related functions to sound.* and graphic-related functions to screen.* 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@89 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:13 +02:00
Alexandre Fontoura 9eb13a1db4 ASYLUM: Fixed scene actor action definitions array push_back. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@88 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:13 +02:00
Alexandre Fontoura a24df04941 ASYLUM: Scene Polygons and Actor Action content read. This should be enough to start displaying scenes. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@87 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:13 +02:00
Filippos Karapetis 3437287e26 ASYLUM: Moved sound effect loading to the new resource managing class, and removed the loadGraphic() wrapper function 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@86 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:13 +02:00
Filippos Karapetis 8af0f388bd ASYLUM: Moved animation hack above the code which gets the actual animation frame :) (oops) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@85 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:13 +02:00
Filippos Karapetis d8f633a8b1 ASYLUM: Removed loadPalette() (the code needs to be placed to a new graphics-related class) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@84 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:13 +02:00
Filippos Karapetis b99f2967ae ASYLUM: Fixed some regressions with rev. 77 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@83 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:12 +02:00
Filippos Karapetis 520efe73f8 ASYLUM: Started rewriting the resource loader/manager 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@82 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:12 +02:00
Alexandre Fontoura 574c094d9a ASYLUM: More scene data read. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@81 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:12 +02:00
Alex Bevilacqua b7c5ee06c6 ASYLUM: fixed headers 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@80 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:12 +02:00
Alex Bevilacqua dfb146a5c1 ASYLUM: the state event handler was only firing if an event was polled. This resulted in busted animation and the "eyes" being removed 
my bad...

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@79 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:12 +02:00
Alex Bevilacqua 36a0fce496 ASYLUM: cleanup and comments 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@78 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:12 +02:00
Alex Bevilacqua d57d8a3323 ASYLUM: took bluegr's menu code and abstracted it into a state class. This state class can likely be used with the scene code for managing screen updates and such. 
There's still a bug here where if you stop moving the cursor, the "eyes" are removed, but i think that's because the background is continually copied ot the screen in the main loop :P

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@77 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:12 +02:00
Filippos Karapetis f0d4f87d9e ASYLUM: - Tweaked frame delay a bit again (now it should match the original) 
- Fixed a crash which could occur sometimes when hovering over the credits icon

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@76 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:12 +02:00
Filippos Karapetis 076d26cf4f ASYLUM: Changed palette brightness adjustment so that it doesn't modify the palette colors 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@75 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:11 +02:00
Filippos Karapetis 05492b5d7b ASYLUM: Added cursor animation 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@74 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:11 +02:00
Filippos Karapetis abc272106c ASYLUM: - Added a waitForTimer() function, which can be used to properly do screen updates and changed frame delay. Game speed should be correct now 
- Moved event checking to a separate function

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@73 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:11 +02:00
Filippos Karapetis 7fa648f9a3 ASYLUM: Added a hack to stop the crashing with the credits icon animation (a limitation of the current resource manager) and moved the menu update code to a separate function 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@72 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:11 +02:00
Filippos Karapetis f077b4f1e7 ASYLUM: - Partially reverted rev. 58 for now to fix graphic animations 
- Implemented the "following eyes" menu animation
- Implemented menu icon animations (cycled very quickly - we need to fix frame delay)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@71 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:11 +02:00
Alexandre Fontoura 5e1d9608f8 ASYLUM: Fixed scene destructor. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@70 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:11 +02:00
Alexandre Fontoura d4e53ab421 ASYLUM: More scene stuffs (loading content for World Stats) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@69 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:11 +02:00
Alexandre Fontoura 61c8211cb8 ASYLUM: Scene file manipulation skeleton added. Load scene function in go() method for testing. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@68 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:10 +02:00
Filippos Karapetis f19c847c74 ASYLUM: Now featuring: creepy voice in menu! 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@67 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:10 +02:00
Alex Bevilacqua 9408749814 ASYLUM: delay updateScreen a bit to make mouse movement smoother. If this is the wrong way to do this, please correct me :) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@66 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:10 +02:00
Filippos Karapetis 0bce224571 ASYLUM: Added highlighting for the bottom row 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@65 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:10 +02:00
Filippos Karapetis ce37ad7248 ASYLUM: Added a back buffer again. The icons in the top row should be highlighted properly now 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@64 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:10 +02:00
Filippos Karapetis f6ab0ab24f ASYLUM: Highlighting of the top row of icons sort of works now 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@63 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:10 +02:00
Eugene Sandulenko e9049237f2 ASYLUM: Fix compilation 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@62 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:10 +02:00
Filippos Karapetis 36ffff9b98 ASYLUM: Fixed compilation 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@61 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:10 +02:00
Filippos Karapetis 9c764452b1 ASYLUM: Removed the screen stuff, and replaced it with ScummVM's screen handling functions 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@60 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:09 +02:00
Filippos Karapetis d4e25a7723 ASYLUM: Added a FIXME for the semantic meaning of getEntry. Currently, it doesn't make sense 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@59 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:09 +02:00
Filippos Karapetis ec2f45e612 ASYLUM: Stop preloading all the graphics from a bundle when it's opened 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@58 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:09 +02:00
Alex Bevilacqua 5e72158dc5 ASYLUM: moved the music player into the resource manager. This is WIP as it still doesn't do anything but load the hardcoded file ... but it's a start 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@57 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:09 +02:00
Alex Bevilacqua c98b39142b ASYLUM: * better resource abstraction using resman 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@56 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:09 +02:00
Filippos Karapetis dacb2034ca ASYLUM: Cleanup. No need to parse the whole AsylumEngine class to the video player 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@55 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:09 +02:00
Alex Bevilacqua a85179ebca ASYLUM: * silenced unused variable warning (lastRefresh) 
* updated headers
* fixed *nix compilation

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@54 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:09 +02:00
Filippos Karapetis 4cb21fcc47 ASYLUM: Shifted some more files around 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@51 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:08 +02:00
Filippos Karapetis 00c0efeae6 ASYLUM: Shifted some files around, and moved all the resource-related classes into resource.h 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@50 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:08 +02:00
Filippos Karapetis fe791aaae2 ASYLUM: Set some SVN properties 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@49 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:08 +02:00
Filippos Karapetis 38f2218543 ASYLUM: Simplified the palette reading code 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@48 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:08 +02:00
Filippos Karapetis b0bcfd7f2b ASYLUM: Properly quit the game, and remove the forceRefresh weirdness 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@47 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:08 +02:00
Filippos Karapetis 2a5dc43ef9 ASYLUM: Some WIP code for playing music (which is just regular WAVE files) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@46 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:08 +02:00
Filippos Karapetis e7818726cf ASYLUM: Added a FIXME concerning memory usage of graphic bundles 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@45 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:08 +02:00
Filippos Karapetis de86b0003d ASYLUM: Added a FIXME concerning the cursor palette (the mouse cursor seems to be displayed correctly now) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@44 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:08 +02:00
Filippos Karapetis 5c41806088 ASYLUM: Added convenience wrapper function to play videos 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@43 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:07 +02:00