Code

Merge version 1.3 into master#14

Code

Merged

ufdada merged 78 commits intogh-pagesufdada/wfto-mapeditor:gh-pagesfrom minorufdada/wfto-mapeditor:minorCopy head branch name to clipboardMar 25, 2015

+2,452-4,638

Commits

Commits on Mar 25, 2015

• calculate background-position without helper element

  ufdada

  committed
  4ab5be3

  Copy full SHA for 4ab5be3

• update readme

  ufdada

  committed
  c59b560

  Copy full SHA for c59b560

• update readme

  ufdada

  committed
  1b59ba9

  Copy full SHA for 1b59ba9

• remove position data from imported csv map data

  ufdada

  committed
  4ef88cc

  Copy full SHA for 4ef88cc

• remove position data from exported map data

  ufdada

  committed
  24255a5

  Copy full SHA for 24255a5

• update map version

  ufdada

  committed
  8c4d82d

  Copy full SHA for 8c4d82d

• remove position data from mirroring

  ufdada

  committed
  41fe6c5

  Copy full SHA for 41fe6c5

• fix positioning of tiles while on mouseover (displaying the room)

  ufdada

  committed
  70c2c15

  Copy full SHA for 70c2c15

• add mapname input and versioning checkbox

  ufdada

  committed
  0228575

  Copy full SHA for 0228575

• update readme

  ufdada

  committed
  d388db3

  Copy full SHA for d388db3

• fix vars for elements and further improvments

  Show description for bcace6e
  ufdada

  committed
  bcace6e

  Copy full SHA for bcace6e

• better escape regex

  ufdada

  committed
  748568a

  Copy full SHA for 748568a

• fix logic mistake

  ufdada

  committed
  875af36

  Copy full SHA for 875af36

• check for correct filename

  ufdada

  committed
  992cb44

  Copy full SHA for 992cb44

• make version identification more stable

  ufdada

  committed
  876da6c

  Copy full SHA for 876da6c

• fix regex for maps with versioning

  ufdada

  committed
  fe645ac

  Copy full SHA for fe645ac

• bugfix for having a dot in filename (not before the extension). Also uncheck the versioning if the imported mapfile has no versioning.

  ufdada

  committed
  abf87b3

  Copy full SHA for abf87b3

• add rotate option (not functional right now)

  ufdada

  committed
  8e2625b

  Copy full SHA for 8e2625b

• refactor enabling/disabling of checkboxes

  ufdada

  committed
  3840500

  Copy full SHA for 3840500

• Check for correct mapsize (otherwise it wouldn't make sense to rotate it)

  ufdada

  committed
  6ff449c

  Copy full SHA for 6ff449c

• Make rotation option functional

  ufdada

  committed
  b0778ee

  Copy full SHA for b0778ee

• fix breaking rooms if these are on the mirror line

  ufdada

  committed
  c7960d4

  Copy full SHA for c7960d4

• fix rotate breaking not extended mirror options

  ufdada

  committed
  9592d0e

  Copy full SHA for 9592d0e

• adding a first prototype of dalek tests

  ufdada

  committed
  f627f4a

  Copy full SHA for f627f4a

• improve tests

  ufdada

  committed
  ef84cb8

  Copy full SHA for ef84cb8

• remove chrome webdriver, as it doesn't like relative path

  ufdada

  committed
  c067253

  Copy full SHA for c067253

• make converter more reliable

  ufdada

  committed
  e8d115e

  Copy full SHA for e8d115e

• add test for new map

  ufdada

  committed
  f3832c9

  Copy full SHA for f3832c9

• update for continues integration

  ufdada

  committed
  9b14e7c

  Copy full SHA for 9b14e7c

• a little beautify

  ufdada

  committed
  b3e67e7

  Copy full SHA for b3e67e7

• add mirror1Map test

  ufdada

  committed
  5433050

  Copy full SHA for 5433050

• update tests and improve converting of asserts

  ufdada

  committed
  e07d9cf

  Copy full SHA for e07d9cf

• workarround for PhantomJS confirm/alert messages

  ufdada

  committed
  ea26e2c

  Copy full SHA for ea26e2c

• change notifications

  ufdada

  committed
  15a7079

  Copy full SHA for 15a7079

• bugfix for converting tests

  ufdada

  committed
  0111137

  Copy full SHA for 0111137

• add extended to mirror 1 test

  ufdada

  committed
  22d994c

  Copy full SHA for 22d994c

• bugfix for new map (we want to set the whole value instead of just typing after the value)

  ufdada

  committed
  48dc6c1

  Copy full SHA for 48dc6c1

• add new mirror option test to suite

  ufdada

  committed
  81e6212

  Copy full SHA for 81e6212

• Fix convert (error in chaining)

  ufdada

  committed
  df3ba9e

  Copy full SHA for df3ba9e

• update gitignore to ignore test screenshots

  ufdada

  committed
  c0cf6df

  Copy full SHA for c0cf6df

• add mirror 2 test

  ufdada

  committed
  2131ea0

  Copy full SHA for 2131ea0

• cache test map (reduces overall test time)

  ufdada

  committed
  74b9537

  Copy full SHA for 74b9537

• fix assertions and make taking screenshots switching easier

  ufdada

  committed
  3506b89

  Copy full SHA for 3506b89

• update nodejs

  ufdada

  committed
  506c6c7

  Copy full SHA for 506c6c7

• remove selenium tests

  ufdada

  committed
  803ba9b

  Copy full SHA for 803ba9b

• add mirror 3 test

  ufdada

  committed
  b67e814

  Copy full SHA for b67e814

• add test messages and some asserts

  ufdada

  committed
  514f946

  Copy full SHA for 514f946

• make tests a little more colorful

  ufdada

  committed
  cd59d9e

  Copy full SHA for cd59d9e

• fix map export

  ufdada

  committed
  2cf08e8

  Copy full SHA for 2cf08e8

• add test for importing map

  ufdada

  committed
  b16947a

  Copy full SHA for b16947a

• additional testing and cleanup

  Show description for 274a3b5
  ufdada

  committed
  274a3b5

  Copy full SHA for 274a3b5

• travis doesn't like relative path in file upload, so we give it an absolute path

  ufdada

  committed
  c1d2170

  Copy full SHA for c1d2170

• assert the correct map sizes

  ufdada

  committed
  0932b8c

  Copy full SHA for 0932b8c

• refactor helperfunctions for easier integration

  ufdada

  committed
  57f6cea

  Copy full SHA for 57f6cea

• add some more assert

  ufdada

  committed
  d4877f9

  Copy full SHA for d4877f9

• add ticket test

  ufdada

  committed
  a5a0010

  Copy full SHA for a5a0010

• check for uncomplete rooms

  ufdada

  committed
  a2fe345

  Copy full SHA for a2fe345

• oops remove debug assert

  ufdada

  committed
  7e3fcd8

  Copy full SHA for 7e3fcd8

• implement ticket test in general testing. Fixes #12

  ufdada

  committed
  6c09c2c

  Copy full SHA for 6c09c2c

• quick fix

  ufdada

  committed
  c7b93bf

  Copy full SHA for c7b93bf

• Update readme

  ufdada

  committed
  9655a77

  Copy full SHA for 9655a77

• Update readme

  ufdada

  committed
  3fc1dfe

  Copy full SHA for 3fc1dfe

• even it shouldn't happen, rooms can theoretically be larger than in the defintion, remove them also

  ufdada

  committed
  5ac3ada

  Copy full SHA for 5ac3ada

• Update readme

  ufdada

  committed
  e8ebe12

  Copy full SHA for e8ebe12

• update readme (link build status)

  ufdada

  committed
  0cc53e6

  Copy full SHA for 0cc53e6

• add cli for changing the map size dynamicly

  ufdada

  committed
  749b684

  Copy full SHA for 749b684

• fix linting errors

  ufdada

  committed
  e455eed

  Copy full SHA for e455eed

• add gui

  ufdada

  committed
  6dd8304

  Copy full SHA for 6dd8304

• add check that the mapsize doesn't exceed

  ufdada

  committed
  ccd5586

  Copy full SHA for ccd5586

• add resize test prototype

  ufdada

  committed
  d856fc5

  Copy full SHA for d856fc5

• finish resize tests

  ufdada

  committed
  f8be005

  Copy full SHA for f8be005

• refactor determination of tileid in map format

  ufdada

  committed
  6c810c0

  Copy full SHA for 6c810c0

• resizer size should fit to tilesize

  ufdada

  committed
  83d0fe1

  Copy full SHA for 83d0fe1

• try to fix travis

  ufdada

  committed
  8888499

  Copy full SHA for 8888499

• move resizing to an extra file

  ufdada

  committed
  b1fc865

  Copy full SHA for b1fc865

• disable the other tests

  ufdada

  committed
  fa1c0ce

  Copy full SHA for fa1c0ce

• Merge pull request #13 from ufdada/resize-map

  Show description for c92bd8a
  ufdada

  committed
  c92bd8a

  Copy full SHA for c92bd8a

• update readme

  ufdada

  committed
  bcbc789

  Copy full SHA for bcbc789