Big Bad Waffle
|
5c9c243377
|
Merge branch '148-inventory-compare-window-blur' into 'staging'
Fixes #148
See merge request !95
|
7 years ago |
Big Bad Waffle
|
e4ac706a0d
|
Fixes #148
|
7 years ago |
Big Bad Waffle
|
b63bb5a206
|
Merge branch '115-charge-through-obstacle' into 'staging'
Fixes #115
See merge request !94
|
7 years ago |
Big Bad Waffle
|
c47c8a1fde
|
Fixes #115
|
7 years ago |
Big Bad Waffle
|
e9c1b189fb
|
Merge branch '151-uppercase-profanities' into 'staging'
Fixes #151
See merge request !93
|
7 years ago |
Big Bad Waffle
|
14ce145381
|
Fixes #151
|
7 years ago |
Big Bad Waffle
|
6a8201245a
|
Merge branch '137-mob-move-origin' into 'staging'
Fixes #137
See merge request !92
|
7 years ago |
Big Bad Waffle
|
5f994aade5
|
Fixes #137
|
7 years ago |
Big Bad Waffle
|
61b90cc5e5
|
Merge branch '116-invite-pending-posiiton' into 'staging'
Fixes #116
See merge request !91
|
7 years ago |
Big Bad Waffle
|
b68d3d31b6
|
Fixes #116
|
7 years ago |
Big Bad Waffle
|
7a70e9007a
|
Merge branch '145-help-text-misleading' into 'staging'
Fixes 145
See merge request !90
|
7 years ago |
Big Bad Waffle
|
04cade6e64
|
Fixes 145
|
7 years ago |
Big Bad Waffle
|
35bf84251d
|
Merge branch '146-faction-effect-apply-login' into 'staging'
Resolve "When logging in with a gaekatla item in your inventory, the effect gets applied"
See merge request !89
|
7 years ago |
Big Bad Waffle
|
9f3e45cf2c
|
Removed test code
|
7 years ago |
Big Bad Waffle
|
5161468693
|
Fixes #146
|
7 years ago |
Big Bad Waffle
|
e661effa9a
|
Merge branch '144-yellow-bag' into 'staging'
Made the common bag white/gray and tweaked particles a bit
See merge request !88
|
7 years ago |
Big Bad Waffle
|
2a442f4174
|
Made the common bag white/gray and tweaked particles a bit
|
7 years ago |
Big Bad Waffle
|
9b92ee4974
|
Merge branch '147-faction-item-purchase' into 'staging'
Fixes #147
See merge request !87
|
7 years ago |
Big Bad Waffle
|
9a7e2d16ef
|
Fixes #147
|
7 years ago |
Big Bad Waffle
|
fc0d372336
|
Merge branch '144-yellow-bag' into 'staging'
Fixes #144
See merge request !86
|
7 years ago |
Big Bad Waffle
|
439be433df
|
Fixes #144
|
7 years ago |
Big Bad Waffle
|
a21f8ed8a5
|
Merge branch '135-spears-ignore-los' into 'staging'
Fixes #135
See merge request !83
|
7 years ago |
Big Bad Waffle
|
b4a21859a6
|
Fixes #135
|
7 years ago |
Big Bad Waffle
|
ad651c6e82
|
Merge branch '133-firefox-css' into 'staging'
Fixes #133
See merge request !82
|
7 years ago |
Big Bad Waffle
|
4dec75cceb
|
Merge branch '130-no-sort-inventory' into 'staging'
Resolve "The player inventory should not be automatically sorted"
See merge request !81
|
7 years ago |
Big Bad Waffle
|
5906ef2e1b
|
Merge branch '131-renderer-crash-charge' into 'staging'
Fixes #131
See merge request !80
|
7 years ago |
Big Bad Waffle
|
6f31f29d06
|
Merge branch '127-invisible-wall-city' into 'staging'
fixes #127
See merge request !79
|
7 years ago |
Big Bad Waffle
|
d31782286c
|
Merge branch '47-password-hashing' into 'staging'
Resolve "Passwords should be encrypted"
See merge request !78
|
7 years ago |
W01fw00d
|
5df771152f
|
#126 fix
|
7 years ago |
W01fw00d
|
dc4366d8a3
|
#126 PR improvements
|
7 years ago |
Big Bad Waffle
|
1e67063e49
|
Fixes #133
|
7 years ago |
Big Bad Waffle
|
3ae9f1c4fd
|
fixes #127
|
7 years ago |
Big Bad Waffle
|
908ff440be
|
Fixes #131
|
7 years ago |
Big Bad Waffle
|
bef6f799c0
|
Removed temp file
|
7 years ago |
Big Bad Waffle
|
d9d9aac593
|
Fixes #130
|
7 years ago |
W01fw00d
|
a70b6d730f
|
fix #126
|
7 years ago |
W01fw00d
|
ace14fdd3e
|
Merge branch 'revert-d6b96bc4' into 'master'
Revert "#126"
See merge request !1
|
7 years ago |
W01fw00d
|
feef9f1ada
|
Revert "#126"
This reverts commit d6b96bc417
|
7 years ago |
W01fw00d
|
d6b96bc417
|
#126
|
7 years ago |
Vildravn
|
21e9d82e00
|
Added hashing plaintext passwords after login
Also some code cleanup
|
7 years ago |
Vildravn
|
2cd8717bab
|
Add password hashing and comparing
With this, only newly created users can log in, as only new passwords are hashed
|
7 years ago |
Vildravn
|
ad5018d08b
|
Add bcrypt dependency to server
|
7 years ago |
Big Bad Waffle
|
b156b8aac8
|
Merge branch '124-move-tutorial-to-main-isle' into 'staging'
Fixes #124
See merge request !76
|
7 years ago |
Big Bad Waffle
|
aa77d3b78f
|
Fixes #124
|
7 years ago |
Big Bad Waffle
|
2633373a08
|
Merge branch '123-dynamic-rendering' into 'staging'
Resolve "Try out a new dynamic rendering method"
See merge request !75
|
7 years ago |
Big Bad Waffle
|
7405d44277
|
Removed test changes to city
|
7 years ago |
Big Bad Waffle
|
f24a025abe
|
Fixes #123
|
7 years ago |
Big Bad Waffle
|
4c310c99ef
|
Merge branch '118-trade-crash-server' into 'staging'
Fixes #118
See merge request !74
|
7 years ago |
Big Bad Waffle
|
c51131067d
|
Merge branch '119-titangrip-negative-stats' into 'staging'
Fixed #119
See merge request !73
|
7 years ago |
Big Bad Waffle
|
0ec38807f0
|
Merge branch '117-high-level-delta-xp-limits' into 'staging'
Resolve "Mobs that are more than 10 levels lower or higher than the player give incorrect xp"
See merge request !72
|
7 years ago |