Big Bad Waffle
|
ba004c8cd3
|
Merge branch '8-drop-item-notice-area' into 'staging'
Fixes #8
See merge request !39
|
7 anni fa |
Big Bad Waffle
|
71f14d08ec
|
Merge branch '76-augment-friendly-stat-name' into 'staging'
Fixes 76
See merge request !38
|
7 anni fa |
Big Bad Waffle
|
9f1de7fa1a
|
Merge branch 'staging' into 'master'
Merging issues into master
Closes #52, #49, #41, #42, #43, #35, #22, #7, #33, #19, #29, #16, #4, #15, #9, #12, and #6
See merge request !37
|
7 anni fa |
Big Bad Waffle
|
62183c3874
|
Fixes #8
|
7 anni fa |
Big Bad Waffle
|
cb2f61002a
|
Fixes 76
|
7 anni fa |
Big Bad Waffle
|
a8ebd1e60f
|
Fixes #81
|
7 anni fa |
Big Bad Waffle
|
4bc4abbadc
|
Fixes #83
|
7 anni fa |
Big Bad Waffle
|
321440413f
|
Fixes #86
|
7 anni fa |
Big Bad Waffle
|
30b102ff7f
|
Fixes #80
|
7 anni fa |
bigbadwaffle
|
9469c7a090
|
Fixes #56
|
7 anni fa |
bigbadwaffle
|
53f2702273
|
Fixes #10
|
7 anni fa |
Big Bad Waffle
|
97c06dd7e1
|
Merge branch 'issue-36-ui-part' into 'staging'
More work on Issue #36. forgot to include the client-side work last time
See merge request !36
|
7 anni fa |
Big Bad Waffle
|
5172c56a5d
|
More work on Issue #36. forgot to include the client-side work last time
|
7 anni fa |
Big Bad Waffle
|
30614c36fc
|
Removed inventory changes that belongs to another issue
|
7 anni fa |
Big Bad Waffle
|
757a462a47
|
Fixes #11
|
7 anni fa |
Big Bad Waffle
|
0bf3632da4
|
Added profanity check to character creation
|
7 anni fa |
Big Bad Waffle
|
95ba04d506
|
The list was kind of ridiculous. Made it shorter
|
7 anni fa |
Big Bad Waffle
|
269ec4ffe7
|
Fixes #46
|
7 anni fa |
Big Bad Waffle
|
6d86ca25b7
|
Fixes #57
|
7 anni fa |
Big Bad Waffle
|
b0beea31f7
|
Fixes #66
|
7 anni fa |
Rylee George
|
807ec4f95a
|
Fixed
|
7 anni fa |
Rylee George
|
247b08b2d4
|
Fixed replace
|
7 anni fa |
Rylee George
|
541e2f9944
|
Fixed
|
7 anni fa |
Rylee George
|
e1e9dd9e8d
|
Fixed
|
7 anni fa |
Rylee George
|
4de9bb9c5f
|
Merge remote-tracking branch 'upstream/staging' into staging
|
7 anni fa |
Big Bad Waffle
|
c4c0ddcae9
|
Merge branch 'issue-52' into 'staging'
Fixes #52
See merge request !32
|
7 anni fa |
Big Bad Waffle
|
37f684e028
|
Merge branch 'removed-combat-test-code' into 'staging'
Left in some test code that caused all damage to be multiplied by 10000
See merge request !31
|
7 anni fa |
bigbadwaffle
|
68bd218840
|
Fixes #52
|
7 anni fa |
bigbadwaffle
|
1963f7c57d
|
Left in some test code that caused all damage to be multiplied by 10000
|
7 anni fa |
Big Bad Waffle
|
a21435e8b0
|
Merge branch 'issue-49' into 'staging'
Fixes #49
See merge request !30
|
7 anni fa |
bigbadwaffle
|
e8f008d0cb
|
Fixes #49
|
7 anni fa |
Vildravn
|
d9c9282f79
|
Installation is now on the wiki
|
7 anni fa |
Vildravn
|
ea8b9cf3ce
|
Better installation guide
|
7 anni fa |
Vildravn
|
ca78be9fe0
|
Backport readme from master
|
7 anni fa |
Vildravn
|
bc8e708748
|
Merge branch '33-buyback-fix' into 'staging'
Only check canEquipItem for faction items
See merge request !29
|
7 anni fa |
Vildravn
|
a2c35fabd9
|
Only check canEquipItem for faction items
|
7 anni fa |
Vildravn
|
4df193929c
|
Max length should be, of course, 12
Trivial change, he said
|
7 anni fa |
Vildravn
|
f8fba590d7
|
Merge branch '43-max-length' into 'staging'
Add maxlength to char name input field
See merge request !28
|
7 anni fa |
Vildravn
|
f8cde323ea
|
Add maxlength to char name input field
|
7 anni fa |
Big Bad Waffle
|
50e440f581
|
Merge branch 'issue-36' into 'staging'
Issue 36
See merge request !27
|
7 anni fa |
Big Bad Waffle
|
c8af5cd0ce
|
Temporary fix for people having too many quest items by allowing you to destroy them
|
7 anni fa |
Big Bad Waffle
|
8eee7f4f24
|
Temporary fix for people having too many quest items by allowing you to destroy them
|
7 anni fa |
Big Bad Waffle
|
d4f00b9bd9
|
Merge branch 'issue-41' into 'staging'
Fixes #41
See merge request !26
|
7 anni fa |
Big Bad Waffle
|
2eec41c666
|
Fixes #41
|
7 anni fa |
Big Bad Waffle
|
16fbd4a8f6
|
Merge branch 'safari_fix' into 'staging'
Fix input field selection on Safari
See merge request !18
|
7 anni fa |
Big Bad Waffle
|
83682d3300
|
Merge branch 'issue-42' into 'staging'
Fixes #42
See merge request !25
|
7 anni fa |
Big Bad Waffle
|
c3b5602718
|
Fixes #42
|
7 anni fa |
Francisco Requena
|
a4fdbddcf4
|
Fix input field selection on Safari
|
7 anni fa |
Big Bad Waffle
|
5a8b067d3b
|
Merge branch 'issue-43' into 'staging'
Issue 43
See merge request !24
|
7 anni fa |
Big Bad Waffle
|
329b03b393
|
Reverted city.json back to original state
|
7 anni fa |