ACCESS: Work on Martian Memorandum #602
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…to takePicture (not yet implemented)
|
Do you want me to fix up the merge commits? |
|
If you could, that would be great, thanks! |
|
@wjp I've made you a collaborator in that branch. So, you could either work on the branch itself, or make a fork, whatever suits you better. Thanks again! :) |
Conflicts: engines/access/access.cpp engines/access/asurface.h engines/access/bubble_box.cpp engines/access/bubble_box.h engines/access/martian/martian_game.cpp engines/access/player.cpp engines/access/player.h engines/access/resources.cpp engines/access/screen.cpp engines/access/screen.h engines/access/sound.cpp engines/access/sound.h
|
Force-pushed an update:
|
|
Thanks for that |
|
Thanks for your help wjp! After discussing this through, it's good to be merged in its current state. Further work can be done in-tree. Merging |
bluegr
added a commit
that referenced
this pull request
Jul 23, 2015
ACCESS: Work on Martian Memorandum
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Access engine, created by @dreammaster and @Strangerke , based on work by @johndoe123, has been merged into master with pull request #548, on the 19th of December, 2014. The initial pull request was to add support for one of the games that used this engine, Amazon: Guardians of Eden.
Overall, the engine was used by the following games:
After the merge date, a lot of work has been done on the engine by Strangerke in order to support another game using that engine, Martian Memorandum. The idea was to get that branch merged once work on supporting Martian Memorandum was completed.
However, the two branches have got out of sync, so the idea here is to merge these commits into master, before the differences become too big to bridge. Since the engine is still WIP, merging the two codebases is probably the best option.
The original branch can be found in dreammaster's github:
https://github.com/dreammaster/scummvm/tree/mm/
This branch has been created by merging the master branch on it. I have then fixed any conflicts I found in the merge commit, i.e. 96db3bd. Subsequent fixes after the merge have been made in commit 0c3b486.
Commit ee9143d introduced unwanted changes outside the engine, which have been reverted with commit 5fb934c.
Any comments are welcome.