search

asamy / forgottenmapeditor

Map editor written in lua for Open Tibia. Written with OtClient's framework.
Other
46 stars 20 forks source link

Fixes on save and new creature spawn add #12

Closed comedinha closed 11 years ago

comedinha commented 11 years ago

Ok, here is the fix and tested. Read the readme

asamy commented 11 years ago

Hi Bruno,

Sorry, I can't pull your tree for the following reasons:

  1. You pulled my tree into yours very wrong.
  2. You have done some useless changes that shouldn't be done in there places, such as updating README for some "bug fixes" that should've been made as issues instead.

I would suggest deleting your tree completely and reforking my repo then adding the appropriate changes and notifying me again.

I only need this change:

And the other "changes" that are supposed to be issues, please post them as issues not commit them in the tree. Thanks!

On Mon, Aug 5, 2013 at 9:31 PM, BrunoDCC notifications@github.com wrote:

Ok, here is the fix and tested. Read the readme

You can merge this Pull Request by running

git pull https://github.com/BrunoDCC/forgottenmapeditor master

Or view, comment on, or merge it at:

https://github.com/allanference/forgottenmapeditor/pull/12 Commit Summary

  • 10.10 support and removed minimap (have bugs)
  • Removed OTCLient, use last
  • Removed OTCLient, use last
  • Edit Readme
  • Fixed all bugs, re added map and added new functions. Full compatible with last otclient
  • Oops, added missing files
  • Updated with last
  • Added missing files...
  • last
  • 10.10 support
  • Test to Fixes
  • Read-me up
  • Fixed save house and spawn files and others
  • back uieditablemap, it was just a test... I forgot to reverse in commit :s
  • Save houses and spawns fixes for new maps, new change on uieditablemap added (perfect), updated makefiles
  • Updated readme
  • Update read-me²

File Changes

  • M README.mdhttps://github.com/allanference/forgottenmapeditor/pull/12/files#diff-0(5)
  • M modules/mapeditor_filebrowser/filebrowser.luahttps://github.com/allanference/forgottenmapeditor/pull/12/files#diff-1(21)
  • M modules/mapeditor_interface/uieditablemap.luahttps://github.com/allanference/forgottenmapeditor/pull/12/files#diff-2(9)
  • M modules/mapeditor_startup/startup.luahttps://github.com/allanference/forgottenmapeditor/pull/12/files#diff-3(7)

Patch Links:

Allan