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 anos atrás |
Big Bad Waffle
|
5906ef2e1b
|
Merge branch '131-renderer-crash-charge' into 'staging'
Fixes #131
See merge request !80
|
7 anos atrás |
Big Bad Waffle
|
6f31f29d06
|
Merge branch '127-invisible-wall-city' into 'staging'
fixes #127
See merge request !79
|
7 anos atrás |
Big Bad Waffle
|
d31782286c
|
Merge branch '47-password-hashing' into 'staging'
Resolve "Passwords should be encrypted"
See merge request !78
|
7 anos atrás |
W01fw00d
|
5df771152f
|
#126 fix
|
7 anos atrás |
W01fw00d
|
dc4366d8a3
|
#126 PR improvements
|
7 anos atrás |
Big Bad Waffle
|
1e67063e49
|
Fixes #133
|
7 anos atrás |
Big Bad Waffle
|
3ae9f1c4fd
|
fixes #127
|
7 anos atrás |
Big Bad Waffle
|
908ff440be
|
Fixes #131
|
7 anos atrás |
Big Bad Waffle
|
bef6f799c0
|
Removed temp file
|
7 anos atrás |
Big Bad Waffle
|
d9d9aac593
|
Fixes #130
|
7 anos atrás |
W01fw00d
|
a70b6d730f
|
fix #126
|
7 anos atrás |
W01fw00d
|
ace14fdd3e
|
Merge branch 'revert-d6b96bc4' into 'master'
Revert "#126"
See merge request !1
|
7 anos atrás |
W01fw00d
|
feef9f1ada
|
Revert "#126"
This reverts commit d6b96bc417
|
7 anos atrás |
W01fw00d
|
d6b96bc417
|
#126
|
7 anos atrás |
Vildravn
|
21e9d82e00
|
Added hashing plaintext passwords after login
Also some code cleanup
|
7 anos atrás |
Vildravn
|
2cd8717bab
|
Add password hashing and comparing
With this, only newly created users can log in, as only new passwords are hashed
|
7 anos atrás |
Vildravn
|
ad5018d08b
|
Add bcrypt dependency to server
|
7 anos atrás |
Big Bad Waffle
|
b156b8aac8
|
Merge branch '124-move-tutorial-to-main-isle' into 'staging'
Fixes #124
See merge request !76
|
7 anos atrás |
Big Bad Waffle
|
aa77d3b78f
|
Fixes #124
|
7 anos atrás |
Big Bad Waffle
|
2633373a08
|
Merge branch '123-dynamic-rendering' into 'staging'
Resolve "Try out a new dynamic rendering method"
See merge request !75
|
7 anos atrás |
Big Bad Waffle
|
7405d44277
|
Removed test changes to city
|
7 anos atrás |
Big Bad Waffle
|
f24a025abe
|
Fixes #123
|
7 anos atrás |
Big Bad Waffle
|
4c310c99ef
|
Merge branch '118-trade-crash-server' into 'staging'
Fixes #118
See merge request !74
|
7 anos atrás |
Big Bad Waffle
|
c51131067d
|
Merge branch '119-titangrip-negative-stats' into 'staging'
Fixed #119
See merge request !73
|
7 anos atrás |
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 anos atrás |
Dave
|
16f03fdfc8
|
Killing mobs more than 10 levels in either direction now grants 0 xp
|
7 anos atrás |
Big Bad Waffle
|
9ce32103eb
|
Fixes #118
|
7 anos atrás |
Big Bad Waffle
|
177c5e3e99
|
Fixed #119
|
7 anos atrás |
Big Bad Waffle
|
962217c360
|
Merge branch 'staging' into 'master'
Staging
Closes #25, #69, #90, #73, #64, #88, #96, #99, #100, #101, #76, #54, #63, #66, #57, #56, #11, #86, #83, #81, #80, #8, #10, and #46
See merge request !71
|
7 anos atrás |
Big Bad Waffle
|
37630d3ddd
|
Merge branch '96-less-xp-level-range' into 'staging'
Fixed an issue with mob xp scaling
See merge request !70
|
7 anos atrás |
Big Bad Waffle
|
ab1b8d4fde
|
Fixed an issue with mob xp scaling
|
7 anos atrás |
Big Bad Waffle
|
cf6919239f
|
first ui work for events
|
7 anos atrás |
Shaun
|
b3f51877cf
|
Events can now remove components
|
7 anos atrás |
Shaun
|
ce4dc44588
|
Added more phase types
|
7 anos atrás |
Big Bad Waffle
|
4521f3af1b
|
first version of spawnMob phase
|
7 anos atrás |
Big Bad Waffle
|
12442323ec
|
Initial Commit
|
7 anos atrás |
Big Bad Waffle
|
26502043a8
|
Merge branch '25-link-items-chat' into 'staging'
Fixes #25
See merge request !69
|
7 anos atrás |
Big Bad Waffle
|
10438d8359
|
Merge branch '69-reputation-past-revered' into 'staging'
Fixes #69
See merge request !68
|
7 anos atrás |
Big Bad Waffle
|
a74341a3a9
|
Merge branch '90-instance-target-hp-update-rescale' into 'staging'
Fixes #90
See merge request !67
|
7 anos atrás |
Big Bad Waffle
|
813e9abf3f
|
Merge branch '73-ability-cooldown-redesign' into 'staging'
Fixes #73
See merge request !66
|
7 anos atrás |
Big Bad Waffle
|
17d0c62a0c
|
Merge branch 'pather-tweak' into 'staging'
Pather tweaks
See merge request !65
|
7 anos atrás |
Big Bad Waffle
|
cdb72ce158
|
Fixes #25
|
7 anos atrás |
Big Bad Waffle
|
6e0ff5f4a5
|
Fixes #69
|
7 anos atrás |
Big Bad Waffle
|
e140d44d02
|
Fixes #90
|
7 anos atrás |
Big Bad Waffle
|
5ee2b35647
|
Fixes #73
|
7 anos atrás |
Big Bad Waffle
|
ca39520848
|
Merge branch '74-stash-quanity' into 'staging'
fix stashing quantity = 1
See merge request !64
|
7 anos atrás |
Vladde Nordholm
|
fc184d77e4
|
fix stashing quantity = 1
|
7 anos atrás |
Big Bad Waffle
|
a702f0441d
|
Merge branch 'issue-10' into 'staging'
Issue 10
See merge request !63
|
7 anos atrás |
Big Bad Waffle
|
63b2f23ec1
|
Removed testing code that was left in
|
7 anos atrás |