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.

Sign up for GitHub

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

Jump to bottom

Added Splash StartUp #108

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Added Splash StartUp #108

wants to merge 14 commits into from

Conversation

MasQchips
Copy link
Contributor

No description provided.

MasQchips added 8 commits May 24, 2016 20:39
@MasQchips
Added GUI Languages
fc64835 
- Added GUI Languages
- Improved GUI
- Extra Icons
- Update Languages
@MasQchips
Added Swedish Language
6d5bd01
@MasQchips
Added Splash StartUp
8c33673
@MasQchips
Small Fixeds
d934de7
@MasQchips
Fixed select the menu settings with small icon
29eaf31 
Fixed a bug that occurs when you press multiple times the small icon
selection of settings, disabling access to the selected menu.
@MasQchips
added sa
f5e003e
@MasQchips
Revert "added sa"
acefe4e 
This reverts commit f5e003e.
@MasQchips
Changes added StartUp splash
da360a1 
- Change image Splash
- Added GuiParticleImage in StartUp
- Update language Spanish
@djskual
Copy link

djskual commented Jul 10, 2016

any progress?

@MasQchips
Update dibas, Maschell
f148ae1 
-Travis: Add meta data for HBL to nightly builds.
-Now using the newest controller patcher.
-Added the missing gamepad button remapping
@MasQchips
Copy link
Contributor Author

in brief. I return after finishing a project .

MasQchips and others added 5 commits August 21, 2016 06:49
@MasQchips
Added Download Languages
b358fe4 
- Update files languages.
- Added Japanese translation.
- Added Portuguese translation.
- Added Greek translation.
- Added some graphical improvements.
@MasQchips
Added Message Box
01ce431
@MasQchips
Update languages
95da953
@MasQchips
- Now load the list of games in subfolders within the folder game
8c17b59 
Gets the list of games within any folder inside game
@Draky50110 @MasQchips
Trad FR + " problems (#2)
b2beb5d 
Updated french translation + missing "
@Maschell
Copy link
Collaborator

Thanks for you work on loadiine. Could you resolve the conflicts?
In my opinion the easiest way to merge and get an overview of the actual changes, is to create of new branch with a fork of the current of the dimok789:master. There you can add your changes in a few commits (One commit for each major changes?)

@MasQchips
Copy link
Contributor Author

They are already resolved conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MasQchips @djskual @Maschell @Draky50110