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
Alex Bevilacqua 48e7ea7cda ASYLUM: Finished enumerating the MainActor's actions. Still have to read the char name[255] from the end, but it's not really important at this second :P 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@147 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:21 +02:00
Alex Bevilacqua 604a54a099 ASYLUM: formatting 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@146 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:21 +02:00
Alex Bevilacqua adb7d3ef73 ASYLUM: * preliminary support for drawing the main actor 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@145 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:20 +02:00
Filippos Karapetis aa55a7a24d ASYLUM: Added some sample code for animation testing (the statue, scroll right to see it) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@144 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:20 +02:00
Filippos Karapetis 78c6c0f619 ASYLUM: Added more sound methods. Menu sounds and music now stop when exiting the menu 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@143 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:20 +02:00
Filippos Karapetis bb6b791349 ASYLUM: Fixed screen updates and scrolling in the game scene screen. Also, the cursor is now set from the scene cursor resources 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@142 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:20 +02:00
Filippos Karapetis 23b86917dd ASYLUM: Fixed OOB access 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@141 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:20 +02:00
Filippos Karapetis a99b2d603f ASYLUM: Proof of concept code for screen scrolling 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@140 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:20 +02:00
Filippos Karapetis becd14e2cf ASYLUM: Added the pitch parameter to screen updating calls and removed a hack in copyToBackBuffer() 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@139 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:20 +02:00
Filippos Karapetis e60812a50a ASYLUM: Fixed compilation and updated the MSVC project file 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@138 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:19 +02:00
Alex Bevilacqua 8c0b64ea1f ASYLUM: * fixed include 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@137 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:19 +02:00
Filippos Karapetis 42688a144d ASYLUM: Initialize the menu properly when it's re-opened 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@136 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:19 +02:00
Alex Bevilacqua 9f08842406 ASYLUM: * renaming of a couple classes 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@135 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:19 +02:00
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 68a33a5b7c ASYLUM: Renamed Scene to SceneResource 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@132 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:19 +02:00
Filippos Karapetis 7e3c90422b ASYLUM: Added mouse cursor in the main scene 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@131 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:18 +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
Filippos Karapetis 2d935b3b2d ASYLUM: Simplified GameState destructor (again, it's perfectly safe to pass null pointers to delete) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@128 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:18 +02:00
Filippos Karapetis 634ad59ff0 ASYLUM: - Fixed memory leaks with the credits resources (note: it's perfectly safe to pass null pointers to delete) 
- Merged getResourceFromId into getResource
- Fixed credits palette
- Styling

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@127 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:18 +02:00
Alexandre Fontoura fc3917429b ASYLUM: Small fix at menu destructor. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@126 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:18 +02:00
Alexandre Fontoura 9d6ee2950b ASYLUM: Added credits dialog fade background. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@125 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:18 +02:00
Alexandre Fontoura 70d6e937ce ASYLUM: First implementation of Credits dialog menu. Still got things to fix. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@124 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:18 +02:00
Alexandre Fontoura 3289264714 ASYLUM: Implemented new game dialog 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@123 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:18 +02:00
Alexandre Fontoura 1e498cf70f ASYLUM: GameState displaying bgImage. Workaround at Screen::copyBackBufferToScreen to properly display bigger images. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@122 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:17 +02:00
Filippos Karapetis 9f2cf80717 ASYLUM: Implemented quit confirmation dialog 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@121 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:17 +02:00
Filippos Karapetis f5d34ca501 ASYLUM: Fixed mouse pointer hotspot 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@120 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:17 +02:00
Filippos Karapetis c607365321 ASYLUM: Formatting 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@119 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:17 +02:00
Filippos Karapetis 55df668606 ASYLUM: Formatting 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@118 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:17 +02:00
Eugene Sandulenko 05fd73b36c ASYLUM: Fix warning 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@117 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:17 +02:00
Alex Bevilacqua aa8d6ec8de ASYLUM: fixed compilation (linux) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@114 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:17 +02:00
Filippos Karapetis 9a5ffcb06e ASYLUM: Some work on submenus. Fixed menu music 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@113 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:16 +02:00
Alexandre Fontoura 3a62702751 ASYLUM: Fixed menu icon text X positions. Add GameState into menu to trigger new game in future. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@112 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:16 +02:00
Alexandre Fontoura 356c787b8e ASYLUM: Few GameState things. Clean up. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@111 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:16 +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 51f3e182fd ASYLUM: Added some more stubs for menu item selection 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@109 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:16 +02:00
Filippos Karapetis bf9f1be994 ASYLUM: Started working on menu items. The "Quit game" option quits the game now (though without confirmation yet) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@108 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:16 +02:00
Filippos Karapetis ac7c2742c8 ASYLUM: Added wrapper functions to create new resource packs by number instead of supplying the full file name 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@107 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:16 +02:00
Alexandre Fontoura a239438173 ASYLUM: Show menu icon text. Not perfect yet, but original isn't perfect as well. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@106 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:16 +02:00
Alexandre Fontoura 3a9b2c5ebb ASYLUM: Drawing text from resources. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@105 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:15 +02:00
Filippos Karapetis bac6bf1816 ASYLUM: Moved the text resource pack inside Text(), as it's the only resource pack which has texts. Disabled the test text for now till we implement the text class completely 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@104 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:15 +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 06dc623e9c ASYLUM: Some wording and renaming 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@102 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:15 +02:00
Filippos Karapetis a68f32552b ASYLUM: - Implemented and renamed some text functions based on johndoe's code 
- The menu texts are now displayed (although their positioning is still wrong)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@101 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:15 +02:00
Alexandre Fontoura 0cc8b33028 ASYLUM: Fixed text Y alignment. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@100 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:15 +02:00
Filippos Karapetis 6a9a613168 ASYLUM: Fixed drawChar() and drawText() and changed the character output test to text output 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@99 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:15 +02:00
Filippos Karapetis 33e9e4d6b7 ASYLUM: - Added methods for obtaining resources from resource IDs 
- Re-enabled the text display test
- Cleaned up the text display class

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@98 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:14 +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 316d5c2da2 ASYLUM: Synced with r.93, and removed some hardcoded values 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@95 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:14 +02:00