Commit Graph

  • *
  • | *
  • * |
  • |/
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • |\
  • * \
  • |\ \
  • * \ \
  • |\ \ \
  • | | * |
  • | | * |
  • | | * |
  • | | * |
  • | | |\ \
  • | | * | |
  • | | | * |
  • | | |/ /
  • | | * |
  • | | * |
  • | | * |
  • | | * |
  • | | |\ \
  • | | * \ \
  • | | |\ \ \
  • | | | | * |
  • | | | |/ /
  • | | |/| |
  • | | * | |
  • | | * | |
  • * | | | |
  • |\ \ \ \ \
  • * \ \ \ \ \
  • |\ \ \ \ \ \
  • | | * | | | |
  • | * | | | | |
  • * | | | | | |
  • |\ \ \ \ \ \ \
  • | | |/ / / / /
  • | |/| | | | |
  • | * | | | | |
  • * | | | | | |
  • |\ \ \ \ \ \ \
  • | * | | | | | |
  • | |/ / / / / /
  • * | | | | | |
  • |\ \ \ \ \ \ \
  • | | |/ / / / /
  • | |/| | | | |
  • | * | | | | |
  • | |/ / / / /
  • | | | * | |
  • | | * | | |
  • | | | * | |
  • * | | | | |
  • |\ \ \ \ \ \
  • * \ \ \ \ \ \
  • |\ \ \ \ \ \ \
  • * \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \
  • | * | | | | | | | |
  • |/ / / / / / / / /
  • * | | | | | | | |
  • |\ \ \ \ \ \ \ \ \
  • | |_|_|_|_|_|_|/ /
  • |/| | | | | | | |
  • | * | | | | | | |
  • |/ / / / / / / /
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | | *
  • | | | | | | |/
  • | | | | | | *
  • | | | | | |/
  • | | | | |/|
  • | | | * / |
  • | | | |/ /
  • | | * / /
  • | | |/ /
  • | * / /
  • | |/ /
  • | | | *
  • | | | *
  • | |_|/
  • |/| |
  • * | |
  • |\| |
  • | | | *
  • | | |/|
  • | |/| |
  • | | * |
  • | | * |
  • | | * |
  • | | |\ \
  • | | |/ /
  • | |/| |
  • | | * |
  • | | * |
  • | | | | *
  • | | | | *
  • | | | | *
  • | | | | *
  • | | | | *
  • | | | | *
  • | | | | *
  • | | | | *
  • | | | | *
  • | | | | *
  • | | | | *
  • | | | |/
  • | | | | *
  • | | |_|/
  • | |/| |
  • | | | | *
  • | | | | *
  • | | |_|/
  • | |/| |
  • | | | | *
  • | | | | *
  • | | | |/
  • | * | |
  • | |\ \ \
  • | * \ \ \
  • | |\ \ \ \
  • | | | * | |
  • | | |/ / /
  • | |/| | |
  • | | * | |
  • | |/ / /
  • | | | *
  • | | | |\
  • | | | | *
  • | | | |/
  • | | | *
  • | | | |\
  • | | | | *
  • | | | |/
  • | | | *
  • | | | |\
  • | | |_|/
  • | |/| |
  • | | | *
  • | | | |\
  • | | | | *
  • | | | |/
  • | * | |
  • | |\ \ \
  • | | * | |
  • | | * | |
  • | |/ / /
  • | * | |
  • | |\ \ \
  • | | * | |
  • | * | | |
  • | |\| | |
  • | * | | |
  • | |\ \ \ \
  • | * \ \ \ \
  • | |\ \ \ \ \
  • 4b6c96fc (refs/merge-requests/133/head) wall puzzle by Big Bad Waffle 2017-06-10 17:48:06 +0200
  • d1793301 (refs/merge-requests/134/head) Fixes #178 by Big Bad Waffle 2017-06-09 22:14:32 +0200
  • 3974f2b0 map work by Shaun 2017-06-09 15:32:42 +0200
  • 69b83943 Added big jewels by Big Bad Waffle 2017-06-08 23:11:20 +0200
  • 10672670 snailboss summon ability by Big Bad Waffle 2017-06-08 21:04:18 +0200
  • 419ba1cd Fixed big object attack animation offset when flipped by Shaun 2017-06-08 10:40:30 +0200
  • 2b4d7dc3 animated objects by Big Bad Waffle 2017-06-07 21:42:40 +0200
  • aae84c23 work on northern cave by Big Bad Waffle 2017-06-06 18:51:43 +0200
  • 9d4ae176 pixely light shafts by Shaun 2017-06-06 16:47:43 +0200
  • d8e74ae0 added missing files from cave-map by Big Bad Waffle 2017-06-05 22:04:10 +0200
  • f16b55ff work on the northern section by Shaun 2017-06-05 14:10:03 +0200
  • cb44ce81 Merged in admin commands by Big Bad Waffle 2017-06-04 20:46:36 +0200
  • 1e0cb219 merged in cave-map by Big Bad Waffle 2017-06-04 20:39:15 +0200
  • 170c27b4 Merge branch '136-necromancer' into 'v0.1.4' by Big Bad Waffle 2017-06-04 18:30:42 +0000
  • 4d629e89 (refs/merge-requests/131/head) Upgraded renderer by Big Bad Waffle 2017-06-04 20:24:25 +0200
  • 6596fd24 figured out overlay blending by Big Bad Waffle 2017-06-02 22:28:25 +0200
  • d1d9bf8f started upgrading to pixijs 4.5 by Shaun 2017-06-02 15:41:07 +0200
  • 5a903c1f new color snail by Big Bad Waffle 2017-06-01 22:59:44 +0200
  • bac7687c new fern sprite by Big Bad Waffle 2017-06-01 21:01:12 +0200
  • e9e02239 Fixes #174 by Big Bad Waffle 2017-06-01 20:53:11 +0200
  • 3b102690 fern sprite by Shaun 2017-06-01 16:42:12 +0200
  • 48cefe6e snailboss abilities by Big Bad Waffle 2017-05-31 22:09:02 +0200
  • 3add2815 redesigning snailboss room, by Shaun 2017-05-31 16:31:13 +0200
  • 98643d20 Merge branch 'cave-map' of gitlab.com:Isleward/isleward into cave-map by Shaun 2017-05-31 08:36:47 +0200
  • 01cb4c6e Merge gitlab.com:Isleward/isleward into cave-map by Shaun 2017-05-31 08:36:18 +0200
  • e8e9d8d1 new snail boss by Big Bad Waffle 2017-05-30 23:21:24 +0200
  • eafe19d4 Started working on boss snail room by Shaun 2017-05-30 16:54:50 +0200
  • 07944904 More work on new map by Shaun 2017-05-29 16:27:26 +0200
  • 7da88983 Merge branch '172-stat-crit-multiplier' into 'v0.1.4' by Big Bad Waffle 2017-05-28 17:02:37 +0000
  • c081454b Merge branch '171-stat-lvl-requirement' into 'v0.1.4' by Big Bad Waffle 2017-05-28 17:02:20 +0000
  • b039f4e2 (refs/merge-requests/129/head) Removed double of from crit mult items by Big Bad Waffle 2017-05-28 19:00:23 +0200
  • 13f6c3a8 (refs/merge-requests/128/head) Adds item names for lvlRequire items by Big Bad Waffle 2017-05-28 18:59:45 +0200
  • 6a186614 Merge branch '172-stat-crit-multiplier' into 'v0.1.4' by Big Bad Waffle 2017-05-28 16:53:38 +0000
  • cd9840fd (refs/merge-requests/127/head) Fixes #172 by Big Bad Waffle 2017-05-28 18:52:28 +0200
  • 664a32f2 Merge branch '166-page-title' into 'v0.1.4' by Big Bad Waffle 2017-05-28 16:02:14 +0000
  • d3731695 (refs/merge-requests/126/head) Fixes #166 by Big Bad Waffle 2017-05-28 18:01:27 +0200
  • a05940e7 Merge branch '171-stat-lvl-requirement' into 'v0.1.4' by Big Bad Waffle 2017-05-28 15:59:44 +0000
  • f04dd1cd (refs/merge-requests/125/head) Fixes #171 by Big Bad Waffle 2017-05-28 17:49:22 +0200
  • f6eeeb1a more cave work by Big Bad Waffle 2017-05-28 17:43:08 +0200
  • de21fcff (refs/merge-requests/130/head) More necro tweaking by Big Bad Waffle 2017-05-28 11:54:21 +0200
  • ea12a6e2 made map smaller and added water sections by Big Bad Waffle 2017-05-28 10:00:44 +0200
  • db90e016 Merge branch '168-char-select-clear-tiles' into 'v0.1.4' by Big Bad Waffle 2017-05-27 09:27:55 +0000
  • e9dde932 Merge branch '163-context-menu-inventory-close' into 'v0.1.4' by Big Bad Waffle 2017-05-27 09:26:37 +0000
  • b823464f Merge branch '129-tab-target-movement-pause' into 'v0.1.4' by Big Bad Waffle 2017-05-27 09:24:22 +0000
  • e6c2e80d Merge branch 'cherry-pick-5095b5b8' into 'v0.1.4' by Big Bad Waffle 2017-05-27 09:21:03 +0000
  • 75c6b96f (refs/merge-requests/121/head) Merge branch '128-server-crash-faction-change' into 'milestone-v0.1.4' by Big Bad Waffle 2017-05-27 09:11:08 +0000
  • cc6a1578 Merge branch 'cherry-pick-8d5228d2' into 'v0.1.4' by Big Bad Waffle 2017-05-27 09:20:24 +0000
  • 7ceef343 (refs/merge-requests/120/head) Merge branch 'patch-2' into 'milestone-v0.1.4' by Big Bad Waffle 2017-05-23 21:00:13 +0000
  • f75b9c2d more work on cave by Shaun 2017-05-26 14:50:55 +0200
  • a45df55b tweaked cultist sprites by Shaun 2017-05-26 13:08:29 +0200
  • c37c9979 initial commit by Shaun 2017-05-26 11:09:37 +0200
  • 9d412fe8 (refs/merge-requests/132/head) getitem and getgold commands by Big Bad Waffle 2017-05-25 21:39:49 +0200
  • 669bbbc4 Initial Commit by Shaun 2017-05-25 15:55:10 +0200
  • d00b2f30 (refs/merge-requests/124/head) Fixes #168 by Shaun 2017-05-24 13:28:20 +0200
  • 2caf995e (refs/merge-requests/123/head) Fixes #163 by Shaun 2017-05-24 13:09:50 +0200
  • 4ab89d35 (refs/merge-requests/122/head) Fixes #129 by Shaun 2017-05-24 13:05:52 +0200
  • ddb1077e (refs/merge-requests/119/head) Removed testing code by Shaun 2017-05-24 12:57:49 +0200
  • 11712682 Fixes #128 by Shaun 2017-05-24 12:56:07 +0200
  • 98c1f157 (tag: v0.1.3) Merge branch 'staging' into 'master' by Big Bad Waffle 2017-05-24 07:22:36 +0000
  • 87f0b198 (refs/merge-requests/116/head) Merge branch 'master' into 'staging' by Big Bad Waffle 2017-05-23 18:29:24 +0000
  • d4f40aff Portraits can now be modded. Worked on Blood Barrier by Shaun 2017-05-23 10:22:15 +0200
  • 2b821811 Did some work on necro abilities by Big Bad Waffle 2017-05-22 20:56:41 +0200
  • ae1f09c9 Merge branch 'staging' into '136-necromancer' by Big Bad Waffle 2017-05-22 15:54:38 +0000
  • 1855eb05 summon skeleton work by Big Bad Waffle 2017-05-21 22:21:11 +0200
  • 10b8e8b9 Started putting everything together by Big Bad Waffle 2017-05-21 21:49:51 +0200
  • 6c8e7333 (refs/merge-requests/113/head) missed a space by Punknoodles 2017-05-20 14:30:07 -0700
  • e284e842 fixed the spacing by Punknoodles 2017-05-20 14:26:37 -0700
  • 3e101d71 Update map.js by Punknoodles 2017-05-20 21:20:32 +0000
  • f76e94bf Update map.js by Punknoodles 2017-05-20 21:18:58 +0000
  • c392f174 Update map.js by Punknoodles 2017-05-20 21:18:10 +0000
  • b86f262f Update map.js by Punknoodles 2017-05-20 21:17:07 +0000
  • e308cdac Update map.js by Punknoodles 2017-05-20 21:16:08 +0000
  • 640afc2e Update map.js by Punknoodles 2017-05-20 21:11:41 +0000
  • 24b3a3b5 Update map.js by Punknoodles 2017-05-20 21:04:49 +0000
  • b023a540 Update map.js by Punknoodles 2017-05-20 21:02:41 +0000
  • ff9bce7e start doing console spacing by Punknoodles 2017-05-20 21:00:25 +0000
  • ca3f28fa (refs/merge-requests/112/head) attempt to implement #50 by Punknoodles 2017-05-20 16:32:51 +0000
  • dfef809d (refs/merge-requests/111/head) Add serverConfig.js w/ port and on-ready message by Punknoodles 2017-05-20 16:06:21 +0000
  • c20e0c41 hook into config/serverconfig.js by Punknoodles 2017-05-20 16:00:58 +0000
  • e06e81ae (refs/merge-requests/110/head) read port and startup message from config/serverConfig.js by Punknoodles 2017-05-20 14:57:52 +0000
  • 83c09097 create serverConfig.js (for issue 28) by Punknoodles 2017-05-20 14:53:34 +0000
  • 9ce316ed (refs/merge-requests/118/head, refs/merge-requests/117/head, refs/merge-requests/115/head) Merge branch '161-login-extra-buttons' into 'staging' by Big Bad Waffle 2017-05-20 05:26:27 +0000
  • c4b78536 Merge branch '159-bcyrpt-nodejs' into 'staging' by Big Bad Waffle 2017-05-20 05:23:46 +0000
  • 289206d5 (refs/merge-requests/109/head) Fixes #161 by Big Bad Waffle 2017-05-20 07:22:29 +0200
  • b3ed52e7 (refs/merge-requests/108/head) Fixes #159 by Big Bad Waffle 2017-05-20 07:19:46 +0200
  • 2bf4140c Merge branch 'revert-0ad04579' into 'master' by Big Bad Waffle 2017-05-19 16:26:08 +0000
  • d8d73bc3 (refs/merge-requests/107/head) Revert "Merge branch 'deployer' into 'master'" by Big Bad Waffle 2017-05-19 16:25:41 +0000
  • 7d6580d5 Merge branch 'revert-504ab9e8' into 'master' by Big Bad Waffle 2017-05-19 16:23:57 +0000
  • 16a62c8a (refs/merge-requests/106/head) Revert "Merge branch 'staging' into 'master'" by Big Bad Waffle 2017-05-19 16:23:04 +0000
  • 504ab9e8 Merge branch 'staging' into 'master' by Big Bad Waffle 2017-05-19 15:58:14 +0000
  • 0ad04579 Merge branch 'deployer' into 'master' by Big Bad Waffle 2017-05-19 15:49:47 +0000
  • 34530efd (refs/merge-requests/104/head) PTR v013 by Big Bad Waffle 2017-05-19 17:46:37 +0200
  • dc5a6ddf (refs/merge-requests/105/head) Merge branch 'temp-redesign-login' into 'staging' by Big Bad Waffle 2017-05-19 15:23:21 +0000
  • 9c609758 (refs/merge-requests/103/head) Fixes #158 by Big Bad Waffle 2017-05-19 17:19:13 +0200
  • 7194c49c first bit of work on login by Shaun 2017-05-19 14:54:54 +0200
  • 67b7c37f Merge branch '40-follower-mechanics' into 'staging' by Big Bad Waffle 2017-05-17 16:39:22 +0000
  • 46ce3b02 (refs/merge-requests/101/head) Tweaked gaekatla critter lifespan by Big Bad Waffle 2017-05-17 18:37:08 +0200
  • 6440651e Merge branch '40-follower-mechanics' into 'staging' by Big Bad Waffle 2017-05-17 15:56:14 +0000
  • 416504e7 Merge branch '132-charge-renderer-lags-behind' into 'staging' by Big Bad Waffle 2017-05-17 15:52:23 +0000
  • d8ab1fa7 Merge branch '156-level-up-max-lvl-notice' into 'staging' by Big Bad Waffle 2017-05-17 15:48:29 +0000