Commit Graph
-
2b82e1ebMerge branch '101-extended-dialogue-actions' into 'staging' by 2017-02-28 19:04:34 +0000 -
a9080799Merge branch '93-duplicate-party-display' into 'staging' by 2017-02-28 18:52:22 +0000 -
cb222e5d(refs/merge-requests/55/head) Remove duplicate check in party UI template by 2017-02-28 09:56:45 -0800 -
64c637c9Fix incorrect arrow notation by 2017-02-28 09:55:52 -0800 -
e07ac736Clean up arrow notation by 2017-02-28 09:03:14 -0800 -
1bdab1a4Use destroyInvite() by 2017-02-27 22:59:12 -0800 -
553e28fbPrevent duplicate party members by 2017-02-27 18:54:29 -0800 -
55acff4cMerge branch '108-destroy-invite-fix' into 'staging' by 2017-02-28 08:25:51 +0000 -
ad464dd3(refs/merge-requests/56/head) Allow explicit destroyInvite() call with no event by 2017-02-27 22:18:35 -0800 -
c25e348c(refs/merge-requests/65/head, refs/merge-requests/54/head) Externalize pather color to variable by 2017-02-24 10:57:23 -0500 -
b8193b39Removed unused variable by 2017-02-24 10:56:53 -0500 -
2991a69d(refs/merge-requests/51/head) fix stashing correct way by 2017-02-27 20:27:08 +0100 -
ef421be8(refs/merge-requests/61/head) Fixes #88 by 2017-02-27 20:12:33 +0200 -
ba3ce0a4(refs/merge-requests/57/head) Removed test code by 2017-02-27 18:58:11 +0200 -
0823ee5aFixes #101 by 2017-02-27 18:52:58 +0200 -
0330cf7d(refs/merge-requests/59/head) Fixes #99 by 2017-02-27 16:12:05 +0200 -
ba6fdcaf(refs/merge-requests/60/head) Fixes #96 by 2017-02-27 15:38:05 +0200 -
c3606e4a(refs/merge-requests/58/head) Fixes #100 by 2017-02-27 14:46:48 +0200 -
53232a10(refs/merge-requests/62/head) Fixes #64 by 2017-02-27 14:04:05 +0200 -
00c86e94Merge branch '104-augment-message-fix' into 'staging' by 2017-02-27 08:26:11 +0000 -
afeeb8f2(refs/merge-requests/203/head) Added some reputation tests by 2017-02-27 10:23:29 +0200 -
4b0f5fd5(refs/merge-requests/53/head) Fix negative values in augment failure message by 2017-02-26 22:40:41 -0800 -
1b71d7a6(refs/merge-requests/52/head) Fix misspell that crashes server on startup by 2017-02-26 22:06:36 -0800 -
c830f576Removed old test code by 2017-02-26 22:29:44 +0200 -
1ea8a005First commit for testing by 2017-02-26 22:28:41 +0200 -
3105ca25fix stashed items reduced to one by 2017-02-26 19:29:49 +0100 -
9419890aMerge branch '76-augment-friendly-stat-names' into 'staging' by 2017-02-26 06:17:59 +0000 -
595bd04d(refs/merge-requests/50/head) Git didn't include the client part of Fix #76. Added it now by 2017-02-26 08:13:30 +0200 -
f3b4e59cMerge branch 'Fix-Issue-#54' into 'staging' by 2017-02-25 20:44:01 +0000 -
5dcd9c2dMerge branch 'Fix-Issue#63' into 'staging' by 2017-02-25 20:43:23 +0000 -
b759945aMerge branch 'issue-66' into 'staging' by 2017-02-25 20:34:32 +0000 -
e05491e5Merge branch 'issue-57' into 'staging' by 2017-02-25 20:34:13 +0000 -
75e7d3aeMerge branch 'issue-56' into 'staging' by 2017-02-25 20:33:27 +0000 -
48ec217dMerge branch 'issue-46' into 'staging' by 2017-02-25 20:31:45 +0000 -
fa8e37a9Merge branch 'issue-11' into 'staging' by 2017-02-25 20:24:26 +0000 -
96e93e80Merge branch '86-fix-browser-zoom-hack' into 'staging' by 2017-02-25 20:16:02 +0000 -
02ef9418Merge branch '83-quest-level-vs-player-level' into 'staging' by 2017-02-25 20:16:00 +0000 -
cb2f403bMerge branch '81-cancel-movement-help' into 'staging' by 2017-02-25 20:15:57 +0000 -
54398f40Merge branch '80-spell-tooltip-update-equip' into 'staging' by 2017-02-25 20:12:05 +0000 -
ba004c8cMerge branch '8-drop-item-notice-area' into 'staging' by 2017-02-25 20:11:48 +0000 -
71f14d08Merge branch '76-augment-friendly-stat-name' into 'staging' by 2017-02-25 20:10:58 +0000 -
9f1de7faMerge branch 'staging' into 'master' by 2017-02-25 20:02:33 +0000 -
62183c38(refs/merge-requests/39/head) Fixes #8 by 2017-02-25 18:54:36 +0200 -
cb2f6100(refs/merge-requests/38/head) Fixes 76 by 2017-02-25 18:22:56 +0200 -
a8ebd1e6(refs/merge-requests/41/head) Fixes #81 by 2017-02-25 17:49:25 +0200 -
4bc4abba(refs/merge-requests/42/head) Fixes #83 by 2017-02-25 10:24:47 +0200 -
32144041(refs/merge-requests/43/head) Fixes #86 by 2017-02-25 10:11:12 +0200 -
30b102ff(refs/merge-requests/40/head) Fixes #80 by 2017-02-25 10:04:43 +0200 -
9469c7a0(refs/merge-requests/47/head) Fixes #56 by 2017-02-24 13:16:24 +0200 -
53f27022(refs/merge-requests/45/head) Fixes #10 by 2017-02-24 12:23:34 +0200 -
97c06dd7(refs/merge-requests/37/head) Merge branch 'issue-36-ui-part' into 'staging' by 2017-02-23 19:59:53 +0000 -
5172c56a(refs/merge-requests/36/head) More work on Issue #36. forgot to include the client-side work last time by 2017-02-23 21:54:44 +0200 -
30614c36(refs/merge-requests/44/head) Removed inventory changes that belongs to another issue by 2017-02-23 21:49:14 +0200 -
757a462aFixes #11 by 2017-02-23 21:39:26 +0200 -
0bf3632d(refs/merge-requests/46/head) Added profanity check to character creation by 2017-02-23 20:21:08 +0200 -
95ba04d5The list was kind of ridiculous. Made it shorter by 2017-02-23 20:17:34 +0200 -
269ec4ffFixes #46 by 2017-02-23 19:53:07 +0200 -
6d86ca25(refs/merge-requests/48/head) Fixes #57 by 2017-02-23 19:14:53 +0200 -
b0beea31(refs/merge-requests/49/head) Fixes #66 by 2017-02-23 18:43:18 +0200 -
807ec4f9(refs/merge-requests/35/head) Fixed by 2017-02-24 01:54:46 +1100 -
c9d0ab28(refs/merge-requests/34/head) Add io back to global scope by 2017-02-23 13:49:44 +0100 -
247b08b2(refs/merge-requests/33/head) Fixed replace by 2017-02-23 23:11:29 +1100 -
541e2f99Fixed by 2017-02-23 23:05:17 +1100 -
e1e9dd9eFixed by 2017-02-23 23:02:47 +1100 -
4de9bb9cMerge remote-tracking branch 'upstream/staging' into staging by 2017-02-23 22:48:14 +1100 -
c4c0ddcaMerge branch 'issue-52' into 'staging' by 2017-02-23 07:27:35 +0000 -
37f684e0Merge branch 'removed-combat-test-code' into 'staging' by 2017-02-23 07:26:39 +0000 -
68bd2188(refs/merge-requests/32/head) Fixes #52 by 2017-02-23 09:23:51 +0200 -
1963f7c5(refs/merge-requests/31/head) Left in some test code that caused all damage to be multiplied by 10000 by 2017-02-23 09:23:08 +0200 -
a21435e8Merge branch 'issue-49' into 'staging' by 2017-02-23 07:20:03 +0000 -
e8f008d0(refs/merge-requests/30/head) Fixes #49 by 2017-02-23 09:18:13 +0200 -
d9c9282fInstallation is now on the wiki by 2017-02-22 22:17:45 +0100 -
ea8b9cf3Better installation guide by 2017-02-22 22:11:01 +0100 -
ca78be9fBackport readme from master by 2017-02-22 21:46:50 +0100 -
bc8e7087Merge branch '33-buyback-fix' into 'staging' by 2017-02-22 20:36:51 +0000 -
a2c35fab(refs/merge-requests/29/head) Only check canEquipItem for faction items by 2017-02-22 21:35:31 +0100 -
4df19392Max length should be, of course, 12 Trivial change, he said by 2017-02-22 19:10:13 +0000 -
f8fba590Merge branch '43-max-length' into 'staging' by 2017-02-22 19:07:42 +0000 -
f8cde323(refs/merge-requests/28/head) Add maxlength to char name input field by 2017-02-22 20:05:53 +0100 -
50e440f5Merge branch 'issue-36' into 'staging' by 2017-02-22 18:25:01 +0000 -
c8af5cd0(refs/merge-requests/27/head) Temporary fix for people having too many quest items by allowing you to destroy them by 2017-02-22 20:22:13 +0200 -
8eee7f4fTemporary fix for people having too many quest items by allowing you to destroy them by 2017-02-22 20:22:01 +0200 -
d4f00b9bMerge branch 'issue-41' into 'staging' by 2017-02-22 18:07:09 +0000 -
2eec41c6(refs/merge-requests/26/head) Fixes #41 by 2017-02-22 20:03:26 +0200 -
16fbd4a8Merge branch 'safari_fix' into 'staging' by 2017-02-22 17:39:00 +0000 -
83682d33Merge branch 'issue-42' into 'staging' by 2017-02-22 17:36:15 +0000 -
c3b56027(refs/merge-requests/25/head) Fixes #42 by 2017-02-22 19:35:03 +0200 -
a4fdbddc(refs/merge-requests/18/head) Fix input field selection on Safari by 2017-02-22 18:31:14 +0100 -
5a8b067dMerge branch 'issue-43' into 'staging' by 2017-02-22 17:26:02 +0000 -
329b03b3(refs/merge-requests/24/head) Reverted city.json back to original state by 2017-02-22 19:24:34 +0200 -
a3377409Fixes #43 by 2017-02-22 19:18:33 +0200 -
f3fec52dMerge branch '35-ignore-css' into 'staging' by 2017-02-22 14:12:53 +0000 -
e307315f(refs/merge-requests/23/head) Fixes #35 by 2017-02-22 14:42:43 +0100 -
82624f3aMerge branch 'issue-22' into 'staging' by 2017-02-22 08:17:15 +0000 -
b3ab5ccb(refs/merge-requests/22/head) Fixed #22 by 2017-02-22 10:13:16 +0200 -
e7e5f202Merge remote-tracking branch 'upstream/staging' into staging by 2017-02-22 19:11:10 +1100 -
e1056416Merge branch 'Fixed-Issue-#7' into 'staging' by 2017-02-22 06:42:17 +0000 -
0c224504Merge branch 'Fix-issue-#21' into 'staging' by 2017-02-22 06:41:27 +0000 -
4b6e63f1Merge branch 'issue-33' into 'staging' by 2017-02-22 06:40:50 +0000 -
94a76b08(refs/merge-requests/21/head) Fixed #33 by 2017-02-22 08:38:08 +0200