-
Notifications
You must be signed in to change notification settings - Fork 21
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
GSoC project: Tiled compatibility support RGM #228
base: master
Are you sure you want to change the base?
GSoC project: Tiled compatibility support RGM #228
Conversation
@KartikShrivastava I'm not sure what you did but the last three commits here look very broken. In 93cda62 you deleted I would suggest you reset your branch back to 4022009 and then either rebase it on / merge it with |
Oh yup @bjorn actually that was a disaster. I was trying to pull with rebase the co-authored commits to my local branch and there occured merge conflicts which spoiled the commits history and on top of that same thing happened again when I tried to pull with rebase the changes of master in my local branch. Now I lost co-authored commits and commit history looks ugly. I guess my git workflow was terrible. |
@KartikShrivastava Indeed. If you need any help fixing this up, just ping me on Discord. |
37f26d8
to
45f4993
Compare
Co-authored-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
4cd3972
to
39cee30
Compare
…ize updates to room editor
In A Nutshell - This project implements two importers: .tmx/.tsx file importers in RadialGM and .egm file importer in Tiled
My GSoC project spans into three PRs in three different projects of two separate organizations. The two organizations involved are Enigma-dev and Tiled. fundies and Josh are my mentors from Enigma-dev and bjorn is my mentor from Tiled.
Requirement: You have to use Arch linux OS specifically, as Enigma-dev's RadialGM only compiles in Arch linux at the time of writing these steps. Compiling RadialGM can be tough, so feel free to ping in enigma-dev discord server.
Steps to test the project:
Short demo video of the final outcome: https://www.youtube.com/watch?v=ZUJd5VhqQo8
Weekly project work logs: https://kartikshrivastava.github.io/