Shaun
|
d00b2f3054
|
Fixes #168
|
7 年之前 |
Shaun
|
2caf995e43
|
Fixes #163
|
7 年之前 |
Shaun
|
4ab89d3580
|
Fixes #129
|
7 年之前 |
Big Bad Waffle
|
98c1f1579f
|
Merge branch 'staging' into 'master'
Staging
Closes #161, #159, #158, #40, #132, #156, #153, #134, #148, #115, #151, #137, #116, #146, #147, #144, #135, #133, #131, #127, #130, #126, #124, #123, #118, and #119
See merge request !118
|
7 年之前 |
Shaun
|
d4f40aff30
|
Portraits can now be modded. Worked on Blood Barrier
|
7 年之前 |
Big Bad Waffle
|
2b8218115b
|
Did some work on necro abilities
|
7 年之前 |
Big Bad Waffle
|
ae1f09c9d5
|
Merge branch 'staging' into '136-necromancer'
Staging
See merge request !115
|
7 年之前 |
Big Bad Waffle
|
1855eb053c
|
summon skeleton work
|
7 年之前 |
Big Bad Waffle
|
10b8e8b912
|
Started putting everything together
|
7 年之前 |
Big Bad Waffle
|
9ce316eddd
|
Merge branch '161-login-extra-buttons' into 'staging'
Fixes #161
See merge request !109
|
7 年之前 |
Big Bad Waffle
|
c4b785361b
|
Merge branch '159-bcyrpt-nodejs' into 'staging'
Fixes #159
See merge request !108
|
7 年之前 |
Big Bad Waffle
|
289206d54d
|
Fixes #161
|
7 年之前 |
Big Bad Waffle
|
b3ed52e74b
|
Fixes #159
|
7 年之前 |
Big Bad Waffle
|
dc5a6ddf24
|
Merge branch 'temp-redesign-login' into 'staging'
Temp redesign login
See merge request !103
|
7 年之前 |
Big Bad Waffle
|
9c60975850
|
Fixes #158
|
7 年之前 |
Shaun
|
7194c49c22
|
first bit of work on login
|
7 年之前 |
Big Bad Waffle
|
67b7c37fcf
|
Merge branch '40-follower-mechanics' into 'staging'
Tweaked gaekatla critter lifespan
See merge request !101
|
7 年之前 |
Big Bad Waffle
|
46ce3b0223
|
Tweaked gaekatla critter lifespan
|
7 年之前 |
Big Bad Waffle
|
6440651e1e
|
Merge branch '40-follower-mechanics' into 'staging'
Fixes #40
See merge request !100
|
7 年之前 |
Big Bad Waffle
|
416504e72c
|
Merge branch '132-charge-renderer-lags-behind' into 'staging'
Fixes #132
See merge request !99
|
7 年之前 |
Big Bad Waffle
|
d8ab1fa77c
|
Merge branch '156-level-up-max-lvl-notice' into 'staging'
Fixes #156
See merge request !98
|
7 年之前 |
Shaun
|
c02bab1068
|
Fixes #40
|
7 年之前 |
Shaun
|
b72abb304e
|
Fixes #132
|
7 年之前 |
Shaun
|
c534c2729d
|
Fixes #156
|
7 年之前 |
Big Bad Waffle
|
c5cd27d751
|
Merge branch '153-map-location-by-level' into 'staging'
Fixed #153
See merge request !97
|
7 年之前 |
Big Bad Waffle
|
742c099926
|
Fixed #153
|
7 年之前 |
Big Bad Waffle
|
fed983ed3f
|
Merge branch '$126-shift-tab-select-enemy' into 'staging'
#126 [shift] + [tab] should select previous enemy
See merge request !77
|
7 年之前 |
Shaun
|
9fcd58888b
|
Tweaks to necro ability sprites
|
7 年之前 |
Shaun
|
2112f3cc55
|
Ability sprites
|
7 年之前 |
Shaun
|
09e31a212b
|
Ability sprites
|
7 年之前 |
Big Bad Waffle
|
5df21a215c
|
Added sprite and first ability icon
|
7 年之前 |
Big Bad Waffle
|
ebe7baf7c5
|
Merge branch '134-multiple-mods' into 'staging'
Resolve "Only one mod works"
See merge request !96
|
7 年之前 |
Big Bad Waffle
|
b0b7bfdff8
|
Removed test code
|
7 年之前 |
Big Bad Waffle
|
278bac7573
|
Removed test code
|
7 年之前 |
Big Bad Waffle
|
12b2b04bc6
|
Fixes #134
|
7 年之前 |
Big Bad Waffle
|
5c9c243377
|
Merge branch '148-inventory-compare-window-blur' into 'staging'
Fixes #148
See merge request !95
|
7 年之前 |
Big Bad Waffle
|
e4ac706a0d
|
Fixes #148
|
7 年之前 |
Big Bad Waffle
|
b63bb5a206
|
Merge branch '115-charge-through-obstacle' into 'staging'
Fixes #115
See merge request !94
|
7 年之前 |
Big Bad Waffle
|
c47c8a1fde
|
Fixes #115
|
7 年之前 |
Big Bad Waffle
|
e9c1b189fb
|
Merge branch '151-uppercase-profanities' into 'staging'
Fixes #151
See merge request !93
|
7 年之前 |
Big Bad Waffle
|
14ce145381
|
Fixes #151
|
7 年之前 |
Big Bad Waffle
|
6a8201245a
|
Merge branch '137-mob-move-origin' into 'staging'
Fixes #137
See merge request !92
|
7 年之前 |
Big Bad Waffle
|
5f994aade5
|
Fixes #137
|
7 年之前 |
Big Bad Waffle
|
61b90cc5e5
|
Merge branch '116-invite-pending-posiiton' into 'staging'
Fixes #116
See merge request !91
|
7 年之前 |
Big Bad Waffle
|
b68d3d31b6
|
Fixes #116
|
7 年之前 |
Big Bad Waffle
|
7a70e9007a
|
Merge branch '145-help-text-misleading' into 'staging'
Fixes 145
See merge request !90
|
7 年之前 |
Big Bad Waffle
|
04cade6e64
|
Fixes 145
|
7 年之前 |
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 年之前 |
Big Bad Waffle
|
9f3e45cf2c
|
Removed test code
|
7 年之前 |
Big Bad Waffle
|
5161468693
|
Fixes #146
|
7 年之前 |