project-navigation
Personal tools

Author Topic: new tile for +oriental  (Read 13562 times)

Offline H-Hour

  • Administrator
  • PHALANX Commander
  • *****
  • Posts: 1923
    • View Profile
Re: new tile for +oriental
« Reply #30 on: November 13, 2011, 07:10:33 pm »
As you may have noticed, we've all been pretty busy lately. I haven't had a chance to check out your changes but I'm sure you've done a solid job like you did with +forest. Thanks again for all your work.

Offline tilli

  • Rookie
  • ***
  • Posts: 72
    • View Profile
Re: new tile for +oriental
« Reply #31 on: November 13, 2011, 07:55:05 pm »
Quote
I haven't had a chance to check out your changes but I'm sure you've done a solid job like you did with +forest. Thanks again for all your work.

No thanks needed. If anything comes up, just say so and I will see what I can do about it.

On to the next maps to work on.

Offline MCR

  • PHALANX veteran
  • ******
  • Posts: 1244
    • View Profile
Re: new tile for +oriental
« Reply #32 on: November 14, 2011, 03:42:55 pm »
tilli, please always "git pull" first before you work on any map changes, otherwise you are reverting other peoples work and bring back already fixed bugs.

Look at your commit here for example:

http://ufoai.git.sourceforge.net/git/gitweb.cgi?p=ufoai/ufoai;a=commitdiff;h=cae9f8e101ad3d035e9f4f8cb62620667a8b4100

Look at the diff - you should notice that it is a lot bigger than what your commit message says...  :P
You reverted a lot of fixes with this commit.  >:(

Offline geever

  • Project Coder
  • PHALANX Commander
  • ***
  • Posts: 2561
    • View Profile
Re: new tile for +oriental
« Reply #33 on: November 14, 2011, 04:18:12 pm »
tilli, please always "git pull" first before you work on any map changes, otherwise you are reverting other peoples work and bring back already fixed bugs.

"git pull --rebase" please (to avoid merge commits too). Or if you're lazy like me, set up an alias:

Code: [Select]
git config alias.up "pull --rebase"

so you can simply git up like in SVN.

-geever

Offline tilli

  • Rookie
  • ***
  • Posts: 72
    • View Profile
Re: new tile for +oriental
« Reply #34 on: November 16, 2011, 10:53:01 am »
MCR: Big sorry!!!!!!  :-[
Will try to do better the next time, honest!

Offline MCR

  • PHALANX veteran
  • ******
  • Posts: 1244
    • View Profile
Re: new tile for +oriental
« Reply #35 on: November 16, 2011, 11:51:05 am »
No problem, tilli, I've already calmed down (& re-fixed some of the issues) ;).

Where humans work, human error happens unfortunately...

Just take care of updating before changing stuff from now on please, so this will not be repeated...

BTW, I've also noticed that your UFORadiant version might be a bit outdated, maybe you should recompile the editor also... :)