Big Bad Waffle
|
30614c36fc
|
Removed inventory changes that belongs to another issue
|
7 роки тому |
Big Bad Waffle
|
757a462a47
|
Fixes #11
|
7 роки тому |
Big Bad Waffle
|
c4c0ddcae9
|
Merge branch 'issue-52' into 'staging'
Fixes #52
See merge request !32
|
7 роки тому |
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 роки тому |
bigbadwaffle
|
68bd218840
|
Fixes #52
|
7 роки тому |
bigbadwaffle
|
1963f7c57d
|
Left in some test code that caused all damage to be multiplied by 10000
|
7 роки тому |
Big Bad Waffle
|
a21435e8b0
|
Merge branch 'issue-49' into 'staging'
Fixes #49
See merge request !30
|
7 роки тому |
bigbadwaffle
|
e8f008d0cb
|
Fixes #49
|
7 роки тому |
Vildravn
|
bc8e708748
|
Merge branch '33-buyback-fix' into 'staging'
Only check canEquipItem for faction items
See merge request !29
|
7 роки тому |
Vildravn
|
a2c35fabd9
|
Only check canEquipItem for faction items
|
7 роки тому |
Vildravn
|
4df193929c
|
Max length should be, of course, 12
Trivial change, he said
|
7 роки тому |
Vildravn
|
f8fba590d7
|
Merge branch '43-max-length' into 'staging'
Add maxlength to char name input field
See merge request !28
|
7 роки тому |
Vildravn
|
f8cde323ea
|
Add maxlength to char name input field
|
7 роки тому |
Big Bad Waffle
|
50e440f581
|
Merge branch 'issue-36' into 'staging'
Issue 36
See merge request !27
|
7 роки тому |
Big Bad Waffle
|
c8af5cd0ce
|
Temporary fix for people having too many quest items by allowing you to destroy them
|
7 роки тому |
Big Bad Waffle
|
8eee7f4f24
|
Temporary fix for people having too many quest items by allowing you to destroy them
|
7 роки тому |
Big Bad Waffle
|
d4f00b9bd9
|
Merge branch 'issue-41' into 'staging'
Fixes #41
See merge request !26
|
7 роки тому |
Big Bad Waffle
|
2eec41c666
|
Fixes #41
|
7 роки тому |
Big Bad Waffle
|
16fbd4a8f6
|
Merge branch 'safari_fix' into 'staging'
Fix input field selection on Safari
See merge request !18
|
7 роки тому |
Big Bad Waffle
|
83682d3300
|
Merge branch 'issue-42' into 'staging'
Fixes #42
See merge request !25
|
7 роки тому |
Big Bad Waffle
|
c3b5602718
|
Fixes #42
|
7 роки тому |
Francisco Requena
|
a4fdbddcf4
|
Fix input field selection on Safari
|
7 роки тому |
Big Bad Waffle
|
5a8b067d3b
|
Merge branch 'issue-43' into 'staging'
Issue 43
See merge request !24
|
7 роки тому |
Big Bad Waffle
|
329b03b393
|
Reverted city.json back to original state
|
7 роки тому |
Big Bad Waffle
|
a3377409f5
|
Fixes #43
|
7 роки тому |
Big Bad Waffle
|
f3fec52d7e
|
Merge branch '35-ignore-css' into 'staging'
Ignore generated css files
See merge request !23
|
7 роки тому |
Francisco Requena
|
e307315ff4
|
Fixes #35
|
7 роки тому |
Big Bad Waffle
|
82624f3ae9
|
Merge branch 'issue-22' into 'staging'
Fixed #22
See merge request !22
|
7 роки тому |
bigbadwaffle
|
b3ab5ccb9b
|
Fixed #22
|
7 роки тому |
Big Bad Waffle
|
e1056416af
|
Merge branch 'Fixed-Issue-#7' into 'staging'
Fixed issue #7
See merge request !20
|
7 роки тому |
Big Bad Waffle
|
0c22450476
|
Merge branch 'Fix-issue-#21' into 'staging'
Removed console.log #21
See merge request !14
|
7 роки тому |
Big Bad Waffle
|
4b6e63f144
|
Merge branch 'issue-33' into 'staging'
Fixed #33
See merge request !21
|
7 роки тому |
bigbadwaffle
|
94a76b089a
|
Fixed #33
|
7 роки тому |
Rylee George
|
e4c1697679
|
Updated
|
7 роки тому |
Rylee George
|
95d2fdab6e
|
Added back logic
|
7 роки тому |
Rylee George
|
092e657e0a
|
Added back a log
|
7 роки тому |
Rylee George
|
d266ed74b5
|
Fixed crash if map properties is null
|
7 роки тому |
Rylee George
|
f2e803659c
|
Merge remote-tracking branch 'upstream/staging' into staging
|
7 роки тому |
Big Bad Waffle
|
19c8062c02
|
Merge branch 'bug-issue-19' into 'staging'
Fixes #19
See merge request !19
|
7 роки тому |
Big Bad Waffle
|
bec51f1558
|
Fixes #19
|
7 роки тому |
Big Bad Waffle
|
e405df0362
|
Merge branch 'bug-issue-29' into 'staging'
Removed test code
See merge request !17
|
7 роки тому |
Big Bad Waffle
|
0f805d038d
|
Removed test code
|
7 роки тому |
Big Bad Waffle
|
1e58d116d8
|
Merge branch 'bug-issue-29' into 'staging'
Fixes #29
See merge request !16
|
7 роки тому |
Big Bad Waffle
|
94a9b7e8d8
|
Fixes #29
|
7 роки тому |
Big Bad Waffle
|
cba629cb68
|
Merge branch 'bug-issue-16' into 'staging'
Fixes #16
See merge request !15
|
7 роки тому |
Big Bad Waffle
|
71636b9574
|
Fixes #16
|
7 роки тому |
Rylee George
|
bd8d33f20d
|
removed console.log
|
7 роки тому |
Rylee George
|
0b7029dbf8
|
Added back and removed console.log
|
7 роки тому |
Rylee George
|
89586c5db8
|
Removed console.log
|
7 роки тому |
Big Bad Waffle
|
802b679b0f
|
Merge branch 'Fixed-issue-#4' into 'staging'
Fixed issue #4
See merge request !13
|
7 роки тому |