Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added New Platforms #37

Merged
merged 4 commits into from
Feb 22, 2024
Merged

Added New Platforms #37

merged 4 commits into from
Feb 22, 2024

Conversation

maxexcloo
Copy link

I've added quite a few new platforms, these are based off https://github.com/XargonWan/RetroDECK/blob/main/es-configs/es_systems.xml and No-Intro DATs.

@Gemba
Copy link
Owner

Gemba commented Feb 21, 2024

Thanks, can you please squash/rebase the commits to one?

@maxexcloo
Copy link
Author

Will try!

@maxexcloo
Copy link
Author

Is it okay now? Haven't done a squash before so do let me know and I'll try again :)

@Gemba
Copy link
Owner

Gemba commented Feb 21, 2024

Almost. I accidentally put the 3.10.0 tag on the branch before I merged in my repo, sorry. Thus your squash does not look as it should.

From the distance, I would vote for this approach:

  1. Update your fork 'master' in github with mine 'master (to catchup the 7 commits behind)
  2. Then pull the changes to your local repo on your PC, git pull origin master.
  3. Take your changes and save it locally to your PC as new_platforms.patch: https://github.com/Gemba/skyscraper/compare/master..ee73abaa61f9a6188a3ac8a803690a981e51e32a.diff
  4. Run a git reset --hard HEAD~2 to get rid of the 2 commits ahead of my master.
  5. Apply the patch git apply /path/to/new_platforms.patch, git add, git commit -m 'Added new systems'
  6. Push (most likely you will need --force) the changes to your origin.
  7. It should show up also in this PR with one commit and two changed files only.

If it is too much, leave it with me: I can put your changes in outside of this PR, too.

@maxexcloo
Copy link
Author

No that’s a really nice guide and I really appreciate the help - always grateful for someone who shows me how to do something properly so I can improve 🙏

I’ll have a go at that this morning!

@maxexcloo
Copy link
Author

I see there are still merges from your repo - is this okay?

@Gemba
Copy link
Owner

Gemba commented Feb 22, 2024

Thanks. These extra commits are ok. As instant feedback, below is what I get presented before the merge (1 commit and only your changes):

before_merge

@Gemba Gemba merged commit 6e575f7 into Gemba:master Feb 22, 2024
retrobit pushed a commit to retrobit/skyscraper that referenced this pull request Mar 4, 2024
Updated platforms_idmap.csv and peas.json
retrobit added a commit to retrobit/skyscraper that referenced this pull request Mar 4, 2024
Updated `aliasMap.csv` comments

platform psp: added *.chd

Dev Container support w/Dockerfile (Gemba#23)

Co-authored-by: retrobit <6226450+retrobit@users.noreply.github.com>

Rel 3.10.0 (Gemba#26)

* simplified bash completion with built-in/provided functions...

plus:
- qmake: user defined install path
- doc: minor enhancements

* Prevention of very unlikely arithmetic overflow: Multiplication result converted to larger type

Rel 3.10.0 (Gemba#27)

* simplified bash completion with built-in/provided functions...

plus:
- qmake: user defined install path
- doc: minor enhancements

* Prevention of very unlikely arithmetic overflow: Multiplication result converted to larger type

* Version 3.10.0

Fix issue 28 (Gemba#32)

* simplified code with predefined function

* Fix Gemba#28

Fix cont. integration workflo (Gemba#33)

* update package index before install

Being pedantic/consistent

Pedantic/clarifying/consistent

Removed file used for testing

Reverted ES Game List scraper - doesn't make sense to use `aliasMap.csv` with this scraper

Not sure why this keeps getting added... I avoid staging it purposefully. Removed.

Scummvm: Changes to generate a ROM folder.svm/ as <game/> launcher instead of folder. (Gemba#35)

* Scummvm: Changes to generate a ROM `folder.svm/` as `<game/>` launcher instead of folder.

update README

Update from RetroPie Project (2024-02-22)

cf. RetroPie/EmulationStation#866

Cpp Std 17

Add new platforms (Gemba#37)

Updated platforms_idmap.csv and peas.json

Update docs:

- Removed passages about creating a symlink on RetroPie (now part of the scriptmodule).
- Edit paragraph about bash_completion on RetroPie

Fix Gemba#38 (Gemba#43)

Plus cornercase solved: When default ES inputFolder is symlinked from
/home/pi/RetroPie/roms to /home/pi/roms f.i. and user provides from that symlink
downwards rom files on CLI.

Version 3.10.2
retrobit added a commit to retrobit/skyscraper that referenced this pull request Mar 4, 2024
Updated `aliasMap.csv` comments

platform psp: added *.chd

Dev Container support w/Dockerfile (Gemba#23)

Co-authored-by: retrobit <6226450+retrobit@users.noreply.github.com>

Rel 3.10.0 (Gemba#26)

* simplified bash completion with built-in/provided functions...

plus:
- qmake: user defined install path
- doc: minor enhancements

* Prevention of very unlikely arithmetic overflow: Multiplication result converted to larger type

Rel 3.10.0 (Gemba#27)

* simplified bash completion with built-in/provided functions...

plus:
- qmake: user defined install path
- doc: minor enhancements

* Prevention of very unlikely arithmetic overflow: Multiplication result converted to larger type

* Version 3.10.0

Fix issue 28 (Gemba#32)

* simplified code with predefined function

* Fix Gemba#28

Fix cont. integration workflo (Gemba#33)

* update package index before install

Being pedantic/consistent

Pedantic/clarifying/consistent

Removed file used for testing

Reverted ES Game List scraper - doesn't make sense to use `aliasMap.csv` with this scraper

Not sure why this keeps getting added... I avoid staging it purposefully. Removed.

Scummvm: Changes to generate a ROM folder.svm/ as <game/> launcher instead of folder. (Gemba#35)

* Scummvm: Changes to generate a ROM `folder.svm/` as `<game/>` launcher instead of folder.

update README

Update from RetroPie Project (2024-02-22)

cf. RetroPie/EmulationStation#866

Cpp Std 17

Add new platforms (Gemba#37)

Updated platforms_idmap.csv and peas.json

Update docs:

- Removed passages about creating a symlink on RetroPie (now part of the scriptmodule).
- Edit paragraph about bash_completion on RetroPie

Fix Gemba#38 (Gemba#43)

Plus cornercase solved: When default ES inputFolder is symlinked from
/home/pi/RetroPie/roms to /home/pi/roms f.i. and user provides from that symlink
downwards rom files on CLI.

Version 3.10.2
retrobit added a commit to retrobit/skyscraper that referenced this pull request Mar 4, 2024
Updated `aliasMap.csv` comments

platform psp: added *.chd

Dev Container support w/Dockerfile (Gemba#23)

Co-authored-by: retrobit <6226450+retrobit@users.noreply.github.com>

Rel 3.10.0 (Gemba#26)

* simplified bash completion with built-in/provided functions...

plus:
- qmake: user defined install path
- doc: minor enhancements

* Prevention of very unlikely arithmetic overflow: Multiplication result converted to larger type

Rel 3.10.0 (Gemba#27)

* simplified bash completion with built-in/provided functions...

plus:
- qmake: user defined install path
- doc: minor enhancements

* Prevention of very unlikely arithmetic overflow: Multiplication result converted to larger type

* Version 3.10.0

Fix issue 28 (Gemba#32)

* simplified code with predefined function

* Fix Gemba#28

Fix cont. integration workflo (Gemba#33)

* update package index before install

Being pedantic/consistent

Pedantic/clarifying/consistent

Removed file used for testing

Reverted ES Game List scraper - doesn't make sense to use `aliasMap.csv` with this scraper

Not sure why this keeps getting added... I avoid staging it purposefully. Removed.

Scummvm: Changes to generate a ROM folder.svm/ as <game/> launcher instead of folder. (Gemba#35)

* Scummvm: Changes to generate a ROM `folder.svm/` as `<game/>` launcher instead of folder.

update README

Update from RetroPie Project (2024-02-22)

cf. RetroPie/EmulationStation#866

Cpp Std 17

Add new platforms (Gemba#37)

Updated platforms_idmap.csv and peas.json

Update docs:

- Removed passages about creating a symlink on RetroPie (now part of the scriptmodule).
- Edit paragraph about bash_completion on RetroPie

Fix Gemba#38 (Gemba#43)

Plus cornercase solved: When default ES inputFolder is symlinked from
/home/pi/RetroPie/roms to /home/pi/roms f.i. and user provides from that symlink
downwards rom files on CLI.

Version 3.10.2
retrobit added a commit to retrobit/skyscraper that referenced this pull request Mar 4, 2024
Updated `aliasMap.csv` comments

platform psp: added *.chd

Dev Container support w/Dockerfile (Gemba#23)

Co-authored-by: retrobit <6226450+retrobit@users.noreply.github.com>

Rel 3.10.0 (Gemba#26)

* simplified bash completion with built-in/provided functions...

plus:
- qmake: user defined install path
- doc: minor enhancements

* Prevention of very unlikely arithmetic overflow: Multiplication result converted to larger type

Rel 3.10.0 (Gemba#27)

* simplified bash completion with built-in/provided functions...

plus:
- qmake: user defined install path
- doc: minor enhancements

* Prevention of very unlikely arithmetic overflow: Multiplication result converted to larger type

* Version 3.10.0

Fix issue 28 (Gemba#32)

* simplified code with predefined function

* Fix Gemba#28

Fix cont. integration workflo (Gemba#33)

* update package index before install

Being pedantic/consistent

Pedantic/clarifying/consistent

Removed file used for testing

Reverted ES Game List scraper - doesn't make sense to use `aliasMap.csv` with this scraper

Not sure why this keeps getting added... I avoid staging it purposefully. Removed.

Scummvm: Changes to generate a ROM folder.svm/ as <game/> launcher instead of folder. (Gemba#35)

* Scummvm: Changes to generate a ROM `folder.svm/` as `<game/>` launcher instead of folder.

update README

Update from RetroPie Project (2024-02-22)

cf. RetroPie/EmulationStation#866

Cpp Std 17

Add new platforms (Gemba#37)

Updated platforms_idmap.csv and peas.json

Update docs:

- Removed passages about creating a symlink on RetroPie (now part of the scriptmodule).
- Edit paragraph about bash_completion on RetroPie

Fix Gemba#38 (Gemba#43)

Plus cornercase solved: When default ES inputFolder is symlinked from
/home/pi/RetroPie/roms to /home/pi/roms f.i. and user provides from that symlink
downwards rom files on CLI.

Version 3.10.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants