Filippos Karapetis
223a30e939
ASYLUM: Cleanup
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@134 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:19 +02:00
Filippos Karapetis
8b7c13b26f
ASYLUM: Renamed GameState to Scene
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@133 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:19 +02:00
Filippos Karapetis
519e4bd28e
ASYLUM: - Moved the game state outside the game menu
...
- Now we start at the first scene instead of the main menu
- The menu can be opened/closed now with the esc key, and "Return to game" works
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@130 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:18 +02:00
Alexandre Fontoura
689a7484be
ASYLUM: Add GameState to handle scenes. Clean some stuffs. Changed scene constructor.
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@110 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:16 +02:00
Filippos Karapetis
bebce6c593
ASYLUM: Minimized dependencies and class visibility
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@103 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:15 +02:00
Filippos Karapetis
46da88fe15
ASYLUM: Renamed some leftover variables (state -> mainMenu)
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@97 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:14 +02:00
Filippos Karapetis
c2fe7353bf
ASYLUM: - Merged the State and MenuState classes into the MainMenu Class
...
- Renamed state.* to menu.*
- Added resource loader wrappers which take a resource pack and a resource entry as parameters
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@96 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:14 +02:00
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
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
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
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
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
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
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
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
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
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
Filippos Karapetis
bbf75e1cd4
ASYLUM: Added video player. The game introduction is played now
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@42 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:07 +02:00
Alex Bevilacqua
f44f07099a
ASYLUM: smoother cursor movement
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@40 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:07 +02:00
Alex Bevilacqua
5bb9fe1f0c
ASYLUM: fixed compilation due to stub wip code (cursor palette not right yet)
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@38 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:07 +02:00
Alex Bevilacqua
c950bfab5e
ASYLUM: * rename resourcemanager to resman
...
* more reorganization
* moved paletteresource to palette bundle because that's technically where it belongs
* initial cursor support (VERY initial)
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@36 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:07 +02:00
Alex Bevilacqua
7560a70090
ASYLUM: removed traces of menu class
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@34 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:06 +02:00
Alex Bevilacqua
16463121a0
ASYLUM: cleanup
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@33 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:06 +02:00
Alex Bevilacqua
a42bf545fc
ASYLUM: overhaul of the resource management system
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@31 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:06 +02:00
Alexandre Fontoura
a179512aca
ASYLUM: First testes displaying Main Menu background image with still wrong palette.
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@25 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:05 +02:00
Alexandre Fontoura
9e7d8f1dc6
ASYLUM: Include new Menu class. Add some TODO comments we need to do initially.
...
Add a new load Resource function indexed by resource index (filename generated automatically)
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@24 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:05 +02:00
Alex Bevilacqua
9220cbd381
ASYLUM: Added the main control loop so we can test graphic drawing without the screen disappearing on us ;)
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@18 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:04 +02:00
Alex Bevilacqua
4f83667803
ASYLUM: Fixed a major logic error in the graphic asset parsing. NOW it works properly
...
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@16 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
2021-05-17 15:35:04 +02:00
