New needed commit on Github development

Avatar

By josepharaoh99 1 Apr 2016 22:34

Champion · 295 comments

Okay, I have accumulated most of the files needed to be added to Tuxemon on Github. Since I can't get my Github page going right, I put the fixed files on my dropbox page: https://www.dropbox.com/sh/7s3i39khz8ya … _w3na?dl=0 I was wondering if someone else could add them for me? There are a lot of people who deserve to have their data in the game by now, but it's not in yet. Most of the files on the page are ones that need to be added (just make sure they're not in the game yet smile )
Thanks guys! There are 8 creatures waiting to be added!
I will be glad with whoever could add these files!

Last edited by josepharaoh99 (1 Apr 2016 22:38)


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By josepharaoh99 2 Apr 2016 17:18

Champion · 295 comments

The new data is in the following folders:

db/technique
animations/technique
gfx/sprites/player
gfx/items
db/monster
gfx/sprites/battle
gfx/tilesets
resources/sprites


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By josepharaoh99 2 Apr 2016 17:29

Champion · 295 comments

Credits are as following:

tamashihoshi:

- Tumbleworm   JMjAMWS.png                     
- Tumblecoon eJQcXuI.png
- Following items: 1Nxxv8E.png
Whirlwind Attack: 3iKU4Ww.gif
Updated Sumobug: bxBxxe4.png

Last edited by josepharaoh99 (2 Apr 2016 17:29)


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By josepharaoh99 2 Apr 2016 17:31

Champion · 295 comments

Kelvin:
gems
sprGems.png


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By josepharaoh99 2 Apr 2016 17:38

Champion · 295 comments

josepharaoh99:

Onaclov (done with Leo)
p7WXvSC.png
Hydrone
cMH5X6P.png
Dandylion (done with Leo; ProfessorGreen's concept)
dandylion2_zpsjhrrhd7k.png
Sludgehog
zQuxGWL.png

- boss NPC (made from modified NPC)
- girl1 NPC (made from modified NPC)
- knight (made from modified NPC from https://github.com/sparklinlabs/superpowers-asset-packs kit under CC 0 license)

Apple (made with Sanglorian; light potion effect)
Orange (made with Sanglorian; light potion effect)
Banana (made with Sanglorian; light potion effect)
Cherry (light potion effect)
Berry (light potion effect)

Mountain Tileset (made from mofied terrain tileset)

Last edited by josepharaoh99 (2 Apr 2016 17:41)


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By josepharaoh99 2 Apr 2016 17:47

Champion · 295 comments

Sanglorian:

Nudiflot: Nudiflot_take_2.png
(I resized, flipped, and adjusted shading on this sprite, but don't bother putting my name in credits


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By josepharaoh99 2 Apr 2016 17:49

Champion · 295 comments

Leo:

simba (i created 2nd menu sprite; no attribution needed)
l_f_zps84cwjbtr.png
ENFORCER sprite_enforcer_zpszedivzyc.png
professor sprite_prof_zpsim6bqaf2.png

Last edited by josepharaoh99 (2 Apr 2016 17:50)


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By josepharaoh99 2 Apr 2016 17:51

Champion · 295 comments

all sprites should be transparent pngs. If not, tell me. Also, if I missed any of your sprites in this, please tell me!


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By Hugop 5 Apr 2016 16:50

Member · 19 comments
josepharaoh99 wrote

all sprites should be transparent pngs. If not, tell me. Also, if I missed any of your sprites in this, please tell me!

Enforcer and professor have white background, is that supposed?

Avatar

By josepharaoh99 5 Apr 2016 21:53

Champion · 295 comments
Hugop wrote

Enforcer and professor have white background, is that supposed?

As showed here, they do. But in the link I gave, I have changed some files to fit in with the game. The enforcer and professor in my link have transparent backgrounds smile


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By josepharaoh99 5 Apr 2016 22:16

Champion · 295 comments

Just added the ninja npc to Tuxemon, from the SuperPowers pack (formerly Public Domain). I modified it to make him slightly taller.
GeKLEaq.png
Thought he'd go good in the DOJO OF THE FIVE ELEMENTS.

Last edited by josepharaoh99 (5 Apr 2016 22:17)


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By ShadowApex 7 Apr 2016 03:11

Lead Developer · 374 comments

Thanks for compiling this list! I was meaning to spend some time going through some recent art contributions and adding all the new assets. I've added all the resources listed here in the latest commit to the development branch. If anything was misattributed, please let me know and I can correct it in the CREDITS.md file.

I had to actually hunt down the original postings for all these assets to give proper credit in the CREDITS file, so it did take me a while to get these all in. Thanks for getting these together!


Avatar

By josepharaoh99 3 May 2016 20:42

Champion · 295 comments

Hey, guys. I've really been trying to get some maps together lately, and I've finally got my github page somewhat working. I've pushed some data on it, but when I ran tuxemon.py, it crashed, so I'm not going to put a pull request. The link is https://github.com/josepharaoh99/Tuxemon.git.
The files that need to be added are in the tileset and map folders and npc sprite folder (and probably later battle sprites folder). Not sure why the game is crashing, but it shouldn't be because of the maps.


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By ShadowApex 6 May 2016 20:34

Lead Developer · 374 comments

Hey josepharaoh,

Your GitHub fork has a lot of differences from the main repository (many files deleted, moved around, extra unneeded files, etc.). If you want to do pull requests, you'll want to ensure that your repository resembles the main Tuxemon repository, but with just the changes you want to include in your pull request.

The easiest way to do that would be to copy out all your changes (things in the resources/ folder, etc.) and completely delete your existing repository. You can delete your fork by logging in to GitHub and going to your repository's settings page. After you delete your fork you can re-fork the main Tuxemon project and clone your fork to your local computer. Then you can copy back your changes, commit, and push those changes to your fork. Once that's done, you should be able to open a pull request to Tuxemon to have your changes accepted into the project.

If you're new to GitHub/Git, you should check out some tutorials online to get you more familiar with it:

Video Tutorials
https://www.youtube.com/watch?v=81uKcXZoQ2A (Forking around 8:00 in)
https://www.youtube.com/watch?v=0fKg7e37bQE

Interactive Tutorials
http://gitimmersion.com/
https://www.codecademy.com/learn/learn-git


Avatar

By josepharaoh99 10 May 2016 22:12

Champion · 295 comments

Okay, I'm trying to get things working. How are things looking now? https://github.com/josepharaoh99/Tuxemon.git
I think it has a problem with that extra folder at the beginning or something.

Last edited by josepharaoh99 (10 May 2016 22:13)


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By tamashihoshi 11 May 2016 16:19

Champion · 251 comments
josepharaoh99 wrote

Okay, I'm trying to get things working. How are things looking now? https://github.com/josepharaoh99/Tuxemon.git
I think it has a problem with that extra folder at the beginning or something.

your master branch: "This branch is even with Tuxemon:master"
<- that's perfect.

your development branch: "This branch is 8 commits ahead of Tuxemon:development"
<- one of those commits you did was moving all tuxemon files into a "tuxemon" folder. not sure how and why you did that big_smile

take a look at this:
Your fork: https://github.com/josepharaoh99/Tuxemo … evelopment
Original fork: https://github.com/Tuxemon/Tuxemon/tree/development
Your fork; tuxemon folder: https://github.com/josepharaoh99/Tuxemo … nt/Tuxemon

you might notice: your fork looks different than the original fork. all your files are in a "tuxemon" folder. but what does that mean?
when you do a commit to the original tuxemon repository, you "tell" github to move all files into a "tuxemon" folder... that folder is not needed though.

not sure if i explain and understand it correctly.. but it seems to me that at some point you move your files into a folder which is not needed. tuxemon is already in a "tuxemon" folder smile


We'll meet again, don't know where, don't know when. But I know we'll meet again some sunny day!

Avatar

By josepharaoh99 11 May 2016 17:56

Champion · 295 comments

Thanks tamashihoshi! I think everybody knows it by now, but I am a total newb with Github, so that explains why I don't know anything about it (and I don't really have much time to take Github courses).
  But, I kinda fixed my fork, so tell me how it looks now: https://github.com/josepharaoh99/Tuxemon.git

Last edited by josepharaoh99 (11 May 2016 17:56)


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By tamashihoshi 13 May 2016 17:57

Champion · 251 comments
josepharaoh99 wrote

But, I kinda fixed my fork, so tell me how it looks now: https://github.com/josepharaoh99/Tuxemon.git

it looks okay now...
Now, Im a github noob myself, but if Im not mistaken:
you moved all files in the tuxemon folder -> 1 commit
then you moved all files out of the folder -> 1 commit
--> your branch is 2 commits ahead

now if you do a pull request, although nothing changed, github will move all files into the tuxemon folder and out again yikes

I don't know how to "reset" the unnecessary commits though sad


We'll meet again, don't know where, don't know when. But I know we'll meet again some sunny day!

Avatar

By benneti 13 May 2016 19:15

Member · 38 comments

i think you can "stash" them wich goes back to an older verion and then readd only the changes, or if you have more commits you can join them to one: https://git-scm.com/book/en/v2/Git-Tool … ng-History (rebase, pick and squash)

I hope that helps a bit big_smile

Avatar

By josepharaoh99 14 May 2016 20:11

Champion · 295 comments

Ugh... Had to chase this crazy cow all over my property trying to get him back in his pen. Cows are SO STUBBORN...

Anyway...

Okay I will check things out but right now I was wondering if anyone could add my added files to their CORRECTLY ( big_smile ) operating fork (so they won't take 5 years or so to be added), and then make a pull request for the main fork.


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By tamashihoshi 14 May 2016 21:43

Champion · 251 comments
josepharaoh99 wrote

Ugh... Had to chase this crazy cow all over my property trying to get him back in his pen. Cows are SO STUBBORN...

I didn't meet any cows in reallife, but cowsay was okay so far. As far as I recall it didn't try to leave the terminal and it always does what I tell it to...

josepharaoh99 wrote

Anyway...

Okay I will check things out but right now I was wondering if anyone could add my added files to their CORRECTLY ( big_smile ) operating fork (so they won't take 5 years or so to be added), and then make a pull request for the main fork.

Which files do you mean? ShadowApex added all Tuxemon and others sprites, if im not mistaken:

ShadowApex wrote

Thanks for compiling this list! I was meaning to spend some time going through some recent art contributions and adding all the new assets. I've added all the resources listed here in the latest commit to the development branch. If anything was misattributed, please let me know and I can correct it in the CREDITS.md file.


We'll meet again, don't know where, don't know when. But I know we'll meet again some sunny day!

Avatar

By josepharaoh99 17 May 2016 17:41

Champion · 295 comments

Which files do you mean? ShadowApex added all Tuxemon and others sprites, if im not mistaken:

I have now added some new files in the following folders:
- maps
- db/monster
- resources/sprites
- sprites/battle
- gfx/tilesets
And I think that's it.


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By tamashihoshi 20 May 2016 14:00

Champion · 251 comments
josepharaoh99 wrote

I have now added some new files in the following folders:
- maps
- db/monster
- resources/sprites
- sprites/battle
- gfx/tilesets
And I think that's it.

I'm gonna take a look and try to create a PR smile (but no promises, im not good in using github tongue)

Edit: Here it is https://github.com/Tuxemon/Tuxemon/pull/135

Last edited by tamashihoshi (20 May 2016 14:40)


We'll meet again, don't know where, don't know when. But I know we'll meet again some sunny day!

Avatar

By josepharaoh99 21 May 2016 16:59

Champion · 295 comments

Dude thanks so much!!!
Oh, and the "building.png" and "vehicles.png" tilesets came from this page: http://thatssowitty.deviantart.com/art/ … -281342410 under the CC BY 3.0 license.
Your page is looking good!

Last edited by josepharaoh99 (21 May 2016 17:03)


Multiple Media Producer
Jesus is God! http://www.upci.org/search

Avatar

By tamashihoshi 21 May 2016 17:44

Champion · 251 comments
josepharaoh99 wrote

Oh, and the "building.png" and "vehicles.png" tilesets came from this page: http://thatssowitty.deviantart.com/art/ … -281342410 under the CC BY 3.0 license.

Glad to help smile I've added a link to your message on github, so shadowapex can give the right credits when merging the PR


We'll meet again, don't know where, don't know when. But I know we'll meet again some sunny day!