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
Alexandre Fontoura dfd39bfc32 ASYLUM: Scene stuffs: New fields added. Renamed items to be accurate as original game. Still got work to do here. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@202 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:28 +02:00
Alexandre Fontoura d851b62f28 ASYLUM: Scene ActionList read first steps. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@200 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:28 +02:00
Filippos Karapetis b03e6eafbb ASYLUM: Some initial code for scene hotspots 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@198 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:28 +02:00
Filippos Karapetis 84ad75f451 ASYLUM: Prevent reloading a font with the same resource number as the currently loaded one 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@197 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:27 +02:00
Filippos Karapetis 18fd3a9588 ASYLUM: Some initial code for the "View cinematics" submenu 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@196 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:27 +02:00
Filippos Karapetis d22bc0cf51 ASYLUM: Silenced a warning, some cleanup 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@195 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:27 +02:00
Filippos Karapetis ffcd82b310 ASYLUM: Cleanup and styling 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@194 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:27 +02:00
Filippos Karapetis e0bce0c64d ASYLUM: Some WIP code for walking with the mouse 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@193 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:27 +02:00
Filippos Karapetis 95c2f1a201 ASYLUM: Removed one constructor of the GraphicResource class, so that the class can store the resource id of the loaded graphic 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@192 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:27 +02:00
Filippos Karapetis 824373cb85 ASYLUM: - Removed duplicate code 
- Added a console variable to toggle polygon visibility

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@191 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:27 +02:00
Alex Bevilacqua 9d75d9f3d1 ASYLUM: Minor formatting. See you guys in a couple weeks :) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@190 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:26 +02:00
Alexandre Fontoura 19c253bcae ASYLUM: Fixed and improve GamePolygons reading. Debug test to show polygons on screen. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@189 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:26 +02:00
Filippos Karapetis 762c5d0fa2 ASYLUM: Added a debug console, with a command to play any of the game's videos. Cleaned up the AsylumEngine class a bit 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@188 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:26 +02:00
Filippos Karapetis 209e9f33cc ASYLUM: Now the scene is deactivated/activated when the menu opens/closes 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@187 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:26 +02:00
Filippos Karapetis abd30b6154 ASYLUM: Added a flag to the Scene class to determine if the scene is active or not 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@186 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:26 +02:00
Filippos Karapetis 198afeaa80 ASYLUM: Cleanup 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@185 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:26 +02:00
Filippos Karapetis 8eef024f30 ASYLUM: - Finished up video subtitles. Multi-line subtitles are now displayed correctly 
- Simplified the video subtitle displaying code

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@184 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:25 +02:00
Filippos Karapetis 610917b968 ASYLUM: Added the text resources for all of the game's video subtitles. Only the vertical placement of some multi-line subtitles remains now 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@183 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:25 +02:00
Filippos Karapetis 1d4f3b236a ASYLUM: More work on video subtitles (tested videos 0-6) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@182 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:25 +02:00
Filippos Karapetis 27a8f4b8f0 ASYLUM: Now reading common scene resources in an endian-safe way 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@181 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:25 +02:00
Filippos Karapetis 30893ed56a ASYLUM: - Reverted back to Common::Point and Common::Rect 
- The actor definitions are now read in an endian-safe way, and the game's polygons are converted to ScummVM's polygon format
- Disabled the bounding box test (it was a bit annoying :P )

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@180 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:25 +02:00
Filippos Karapetis 8a7e3bfada ASYLUM: Fixed displaying of transparent actors, and added some more test animations 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@179 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:25 +02:00
Alexandre Fontoura 04fe773cd2 ASYLUM: Actor bounding box test. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@178 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:25 +02:00
Alexandre Fontoura 089d0c6b8f ASYLUM: Improve scenres ActorDefinitions structure and reading. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@177 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:24 +02:00
Filippos Karapetis 8d75c0e780 ASYLUM: Delete the scene object in the engine's destructor 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@176 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:24 +02:00
Filippos Karapetis 261b47d718 ASYLUM: Added a parameter to playVideo(), used to toggle subtitles 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@175 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:24 +02:00
Filippos Karapetis ffd1d02551 ASYLUM: Silenced a signed/unsigned mismatch warning 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@174 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:24 +02:00
Filippos Karapetis 232391f005 ASYLUM: Updated the MSVC project file 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@173 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:24 +02:00
Filippos Karapetis ef34899c44 ASYLUM: - Now reading subtitle information from vids.cap 
- Fixed video the font and font colors of video subtitles
- Fixed video the positioning of video subtitles
- Fixed positioning of multi-line subtitles
- The only thing left to do is to figure out where the index of the first subtitle is, per movie (right now the index of the first subtitle for movie 1 is hardcoded)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@172 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:24 +02:00
Filippos Karapetis 6da68f0895 ASYLUM: - Initial support for horizontally flipped actors 
- Removed the statue test animation
- Fixed the prisoner animation by proper screen updating
- Fixed copyToBackBufferClipped()

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@171 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:24 +02:00
Alexandre Fontoura f5c6295449 ASYLUM: Fixed previous commit. UpdateActor in wrong class. 
Fixed actor memory leak.
Actor still isn't update as it needs but it is already in the right position on screen.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@170 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:23 +02:00
Filippos Karapetis 6298d422ff ASYLUM: Some initial implementation for movie subtitles 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@169 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:23 +02:00
Alex Bevilacqua 207986455c ASYLUM: Draw an actor resource from the ActorDefinitions struct in the scene. There's still a lot to do here, as we're not processing the definition flags yet (assuming there's visible flag), or the associated sound resource flags. 
Also, when the screen pans, the resource shouldn't pan with it (x/y should adjust accordingly).

This change can be reverted if necessary as it's just a proof-of-concept, but i think this concept has already been proven :P

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@168 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:23 +02:00
Alexandre Fontoura 40f22daa40 ASYLUM: More Settings dialog menu actions. Only missing real configurations. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@167 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:23 +02:00
Alexandre Fontoura c94fb01b34 ASYLUM: Fixed some issues under Settings dialog menu. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@166 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:23 +02:00
Alexandre Fontoura 9e2a417c92 ASYLUM: Some more stuffs for Settings dialog menu. Still unfinished. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@165 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:23 +02:00
Alexandre Fontoura 6aa9c1f1ea ASYLUM: Take rid of textBlue object under menu (we don't need to double the text buffer twice only to change text colors). 
Fixed dialog options according with original.
Change member types from int to u/int32 to prevent unnecessary cast.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@164 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:23 +02:00
Alexandre Fontoura df5f6fc454 ASYLUM: Fixed correct music playing under Credits Menu Dialog. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@161 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:22 +02:00
Alex Bevilacqua df94a2aa43 ASYLUM: Started working on implementing the encounter variable store 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@160 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:22 +02:00
Filippos Karapetis ace1d05662 ASYLUM: - Fixed actor resource loading, using correct endianess 
- Some test code for the actor walking animation (where is the other half of the actor's actions?)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@158 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:22 +02:00
Alex Bevilacqua 070e8a1d86 ASYLUM: minor formatting 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@157 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:22 +02:00
Filippos Karapetis b6bb13a342 ASYLUM: Fixed SVN keywords 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@156 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:22 +02:00
Filippos Karapetis 022db19eec ASYLUM: Removed a hack in the animation drawing code. Animations are now drawn clipped, and the screen is only updated when necessary 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@155 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:22 +02:00
Filippos Karapetis eb7f6b3018 ASYLUM: Fixed a bug in copyToBackBuffer() 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@154 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:22 +02:00
Alex Bevilacqua e0ebbb0ab9 ASYLUM: fixed header (may need svn:keywords again ... not sure) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@153 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:21 +02:00
Filippos Karapetis 085607d8e8 ASYLUM: Moved actor drawing inside the actor class. Some cleanup 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@152 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:21 +02:00
Filippos Karapetis 150d50c43d ASYLUM: Cleanup, and added some mode music-related code 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@151 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:21 +02:00
Filippos Karapetis aabb519f31 ASYLUM: Some cleanup 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@150 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:21 +02:00
Filippos Karapetis 66454cf922 ASYLUM: Some renaming (the statue is a scene animation, not an actor) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@149 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:21 +02:00
Filippos Karapetis 7ba4c1c071 ASYLUM: Updated the MSVC project file 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@148 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:21 +02:00