Commit Graph
-
c02bab10(refs/merge-requests/100/head) Fixes #40 by 2017-05-17 15:21:57 +0200 -
b72abb30(refs/merge-requests/99/head) Fixes #132 by 2017-05-17 12:51:55 +0200 -
c534c272(refs/merge-requests/98/head) Fixes #156 by 2017-05-17 09:25:40 +0200 -
c5cd27d7Merge branch '153-map-location-by-level' into 'staging' by 2017-05-16 20:53:05 +0000 -
742c0999(refs/merge-requests/97/head) Fixed #153 by 2017-05-16 22:49:52 +0200 -
fed983edMerge branch '$126-shift-tab-select-enemy' into 'staging' by 2017-05-16 16:30:59 +0000 -
9fcd5888Tweaks to necro ability sprites by 2017-05-16 12:32:47 +0200 -
2112f3ccAbility sprites by 2017-05-15 16:47:39 +0200 -
09e31a21Ability sprites by 2017-05-15 16:46:02 +0200 -
5df21a21Added sprite and first ability icon by 2017-05-14 21:43:09 +0200 -
ebe7baf7Merge branch '134-multiple-mods' into 'staging' by 2017-05-14 16:25:02 +0000 -
b0b7bfdf(refs/merge-requests/96/head) Removed test code by 2017-05-14 18:23:14 +0200 -
278bac75Removed test code by 2017-05-14 18:20:49 +0200 -
12b2b04bFixes #134 by 2017-05-14 18:20:27 +0200 -
5c9c2433Merge branch '148-inventory-compare-window-blur' into 'staging' by 2017-05-14 12:48:42 +0000 -
e4ac706a(refs/merge-requests/95/head) Fixes #148 by 2017-05-14 14:47:26 +0200 -
b63bb5a2Merge branch '115-charge-through-obstacle' into 'staging' by 2017-05-14 12:34:30 +0000 -
c47c8a1f(refs/merge-requests/94/head) Fixes #115 by 2017-05-14 14:33:15 +0200 -
e9c1b189Merge branch '151-uppercase-profanities' into 'staging' by 2017-05-14 12:18:34 +0000 -
14ce1453(refs/merge-requests/93/head) Fixes #151 by 2017-05-14 14:16:42 +0200 -
6a820124Merge branch '137-mob-move-origin' into 'staging' by 2017-05-12 20:08:11 +0000 -
5f994aad(refs/merge-requests/92/head) Fixes #137 by 2017-05-12 22:06:46 +0200 -
61b90cc5Merge branch '116-invite-pending-posiiton' into 'staging' by 2017-05-12 20:00:29 +0000 -
b68d3d31(refs/merge-requests/91/head) Fixes #116 by 2017-05-12 21:59:02 +0200 -
7a70e900Merge branch '145-help-text-misleading' into 'staging' by 2017-05-12 19:45:19 +0000 -
04cade6e(refs/merge-requests/90/head) Fixes 145 by 2017-05-12 21:34:13 +0200 -
35bf8425Merge branch '146-faction-effect-apply-login' into 'staging' by 2017-05-12 19:08:51 +0000 -
9f3e45cf(refs/merge-requests/89/head) Removed test code by 2017-05-12 21:07:05 +0200 -
51614686Fixes #146 by 2017-05-12 21:02:58 +0200 -
e661effaMerge branch '144-yellow-bag' into 'staging' by 2017-05-12 16:22:31 +0000 -
2a442f41(refs/merge-requests/88/head) Made the common bag white/gray and tweaked particles a bit by 2017-05-12 18:20:04 +0200 -
9b92ee49Merge branch '147-faction-item-purchase' into 'staging' by 2017-05-12 15:41:22 +0000 -
9a7e2d16(refs/merge-requests/87/head) Fixes #147 by 2017-05-12 17:36:48 +0200 -
fc0d3723Merge branch '144-yellow-bag' into 'staging' by 2017-05-11 17:54:11 +0000 -
439be433(refs/merge-requests/86/head) Fixes #144 by 2017-05-11 19:52:02 +0200 -
b0b60a1f(refs/merge-requests/85/head, refs/merge-requests/84/head) Removed walkTrail code that accidentally made it into the branch by 2017-05-11 19:43:06 +0200 -
85551909Removed walkTrail code that accidentally made it into the branch by 2017-05-11 19:41:52 +0200 -
bb022af0Fixes #144 by 2017-05-11 19:39:37 +0200 -
aefe09faFixes #144 by 2017-05-11 19:34:24 +0200 -
8255a16fFixes #144 by 2017-05-11 19:32:25 +0200 -
101e4984Fixes #144 by 2017-05-11 19:30:03 +0200 -
e8f9d32ffirst commit by 2017-05-08 22:27:18 +0200 -
a21f8ed8Merge branch '135-spears-ignore-los' into 'staging' by 2017-05-08 18:19:46 +0000 -
b4a21859(refs/merge-requests/83/head) Fixes #135 by 2017-05-08 20:12:48 +0200 -
ad651c6eMerge branch '133-firefox-css' into 'staging' by 2017-05-08 17:43:36 +0000 -
4dec75ccMerge branch '130-no-sort-inventory' into 'staging' by 2017-05-06 10:43:56 +0000 -
5906ef2eMerge branch '131-renderer-crash-charge' into 'staging' by 2017-05-06 10:41:18 +0000 -
6f31f29dMerge branch '127-invisible-wall-city' into 'staging' by 2017-05-06 10:33:00 +0000 -
d3178228Merge branch '47-password-hashing' into 'staging' by 2017-05-06 10:29:15 +0000 -
5df77115(refs/merge-requests/77/head) #126 fix by 2017-04-29 15:53:23 +0200 -
dc4366d8#126 PR improvements by 2017-04-29 15:50:55 +0200 -
1e67063e(refs/merge-requests/82/head) Fixes #133 by 2017-04-26 19:44:18 +0200 -
3ae9f1c4(refs/merge-requests/79/head) fixes #127 by 2017-04-24 18:25:28 +0200 -
908ff440(refs/merge-requests/80/head) Fixes #131 by 2017-04-24 18:17:48 +0200 -
bef6f799(refs/merge-requests/81/head) Removed temp file by 2017-04-24 18:08:54 +0200 -
d9d9aac5Fixes #130 by 2017-04-24 18:07:08 +0200 -
a70b6d73fix #126 by 2017-04-23 12:10:43 +0200 -
ace14fddMerge branch 'revert-d6b96bc4' into 'master' by 2017-04-23 10:01:28 +0000 -
feef9f1aRevert "#126" by 2017-04-23 10:00:03 +0000 -
d6b96bc4#126 by 2017-04-23 11:50:57 +0200 -
21e9d82e(refs/merge-requests/78/head) Added hashing plaintext passwords after login Also some code cleanup by 2017-03-28 01:08:36 +0200 -
2cd8717bAdd password hashing and comparing With this, only newly created users can log in, as only new passwords are hashed by 2017-03-27 18:54:11 +0200 -
ad5018d0Add bcrypt dependency to server by 2017-03-27 18:41:57 +0200 -
b156b8aaMerge branch '124-move-tutorial-to-main-isle' into 'staging' by 2017-03-21 14:12:40 +0000 -
aa77d3b7(refs/merge-requests/76/head) Fixes #124 by 2017-03-21 16:09:24 +0200 -
2633373aMerge branch '123-dynamic-rendering' into 'staging' by 2017-03-21 11:34:43 +0000 -
7405d442(refs/merge-requests/75/head) Removed test changes to city by 2017-03-21 13:32:51 +0200 -
f24a025aFixes #123 by 2017-03-21 13:25:55 +0200 -
4c310c99Merge branch '118-trade-crash-server' into 'staging' by 2017-03-15 19:10:37 +0000 -
c5113106Merge branch '119-titangrip-negative-stats' into 'staging' by 2017-03-15 19:09:17 +0000 -
0ec38807Merge branch '117-high-level-delta-xp-limits' into 'staging' by 2017-03-14 19:55:05 +0000 -
16f03fdf(refs/merge-requests/72/head) Killing mobs more than 10 levels in either direction now grants 0 xp by 2017-03-14 10:28:43 -0700 -
9ce32103(refs/merge-requests/74/head) Fixes #118 by 2017-03-12 21:01:25 +0200 -
177c5e3e(refs/merge-requests/73/head) Fixed #119 by 2017-03-12 20:57:20 +0200 -
962217c3(tag: v0.1.2, refs/merge-requests/102/head) Merge branch 'staging' into 'master' by 2017-03-11 11:53:53 +0000 -
37630d3d(refs/merge-requests/71/head) Merge branch '96-less-xp-level-range' into 'staging' by 2017-03-11 10:58:08 +0000 -
ab1b8d4f(refs/merge-requests/70/head) Fixed an issue with mob xp scaling by 2017-03-11 12:50:36 +0200 -
cf691923first ui work for events by 2017-03-03 19:43:49 +0200 -
b3f51877Events can now remove components by 2017-03-03 15:57:33 +0200 -
ce4dc445Added more phase types by 2017-03-03 11:40:52 +0200 -
4521f3affirst version of spawnMob phase by 2017-03-02 22:02:54 +0200 -
12442323Initial Commit by 2017-03-02 19:54:45 +0200 -
26502043Merge branch '25-link-items-chat' into 'staging' by 2017-03-02 15:58:04 +0000 -
10438d83Merge branch '69-reputation-past-revered' into 'staging' by 2017-03-02 07:33:57 +0000 -
a74341a3Merge branch '90-instance-target-hp-update-rescale' into 'staging' by 2017-03-02 04:49:01 +0000 -
813e9abfMerge branch '73-ability-cooldown-redesign' into 'staging' by 2017-03-02 04:47:28 +0000 -
17d0c62aMerge branch 'pather-tweak' into 'staging' by 2017-03-02 04:31:53 +0000 -
cdb72ce1(refs/merge-requests/69/head) Fixes #25 by 2017-03-01 20:45:01 +0200 -
6e0ff5f4(refs/merge-requests/68/head) Fixes #69 by 2017-03-01 19:40:28 +0200 -
e140d44d(refs/merge-requests/67/head) Fixes #90 by 2017-03-01 19:30:17 +0200 -
5ee2b356(refs/merge-requests/66/head) Fixes #73 by 2017-03-01 19:01:40 +0200 -
ca395208Merge branch '74-stash-quanity' into 'staging' by 2017-02-28 20:00:26 +0000 -
fc184d77(refs/merge-requests/64/head) fix stashing quantity = 1 by 2017-02-28 20:56:44 +0100 -
a702f044Merge branch 'issue-10' into 'staging' by 2017-02-28 19:23:49 +0000 -
63b2f23e(refs/merge-requests/63/head) Removed testing code that was left in by 2017-02-28 21:20:36 +0200 -
2a7e9f0fMerge branch '64-chat-vanish-mob-die' into 'staging' by 2017-02-28 19:15:05 +0000 -
11320916Merge branch '88-item-grid-shop-stash' into 'staging' by 2017-02-28 19:12:05 +0000 -
7123f7caMerge branch '96-less-xp-lower-obs' into 'staging' by 2017-02-28 19:09:50 +0000 -
5317b634Merge branch '99-heal-fail-collider' into 'staging' by 2017-02-28 19:08:08 +0000 -
c8337420Merge branch '100-quest-gen-fail-low-level' into 'staging' by 2017-02-28 19:06:35 +0000