Big Bad Waffle
|
f6eeeb1a92
|
more cave work
|
7 years ago |
Big Bad Waffle
|
de21fcff97
|
More necro tweaking
|
7 years ago |
Big Bad Waffle
|
ea12a6e2e9
|
made map smaller and added water sections
|
7 years ago |
Big Bad Waffle
|
db90e016b6
|
Merge branch '168-char-select-clear-tiles' into 'v0.1.4'
Fixes #168
See merge request !124
|
7 years ago |
Big Bad Waffle
|
e9dde93223
|
Merge branch '163-context-menu-inventory-close' into 'v0.1.4'
Fixes #163
See merge request !123
|
7 years ago |
Big Bad Waffle
|
b823464fb4
|
Merge branch '129-tab-target-movement-pause' into 'v0.1.4'
Fixes #129
See merge request !122
|
7 years ago |
Big Bad Waffle
|
e6c2e80d3a
|
Merge branch 'cherry-pick-5095b5b8' into 'v0.1.4'
Merge branch '128-server-crash-faction-change' into 'milestone-v0.1.4'
See merge request !121
|
7 years ago |
Big Bad Waffle
|
75c6b96f83
|
Merge branch '128-server-crash-faction-change' into 'milestone-v0.1.4'
Resolve "When a player's faction tier changes, the server sometimes crashes."
See merge request !119
|
7 years ago |
Big Bad Waffle
|
cc6a157831
|
Merge branch 'cherry-pick-8d5228d2' into 'v0.1.4'
Merge branch 'patch-2' into 'milestone-v0.1.4'
See merge request !120
|
7 years ago |
Big Bad Waffle
|
7ceef34392
|
Merge branch 'patch-2' into 'milestone-v0.1.4'
[Closes #28] Read port and server-ready message from server/config/serverConfig.js
See merge request !111
|
7 years ago |
Shaun
|
f75b9c2d2e
|
more work on cave
|
7 years ago |
Shaun
|
a45df55b24
|
tweaked cultist sprites
|
7 years ago |
Shaun
|
c37c997907
|
initial commit
|
7 years ago |
Big Bad Waffle
|
9d412fe8b0
|
getitem and getgold commands
|
7 years ago |
Shaun
|
669bbbc415
|
Initial Commit
|
7 years ago |
Shaun
|
d00b2f3054
|
Fixes #168
|
7 years ago |
Shaun
|
2caf995e43
|
Fixes #163
|
7 years ago |
Shaun
|
4ab89d3580
|
Fixes #129
|
7 years ago |
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 years ago |
Shaun
|
d4f40aff30
|
Portraits can now be modded. Worked on Blood Barrier
|
7 years ago |
Big Bad Waffle
|
2b8218115b
|
Did some work on necro abilities
|
7 years ago |
Big Bad Waffle
|
ae1f09c9d5
|
Merge branch 'staging' into '136-necromancer'
Staging
See merge request !115
|
7 years ago |
Big Bad Waffle
|
1855eb053c
|
summon skeleton work
|
7 years ago |
Big Bad Waffle
|
10b8e8b912
|
Started putting everything together
|
7 years ago |
Big Bad Waffle
|
9ce316eddd
|
Merge branch '161-login-extra-buttons' into 'staging'
Fixes #161
See merge request !109
|
7 years ago |
Big Bad Waffle
|
c4b785361b
|
Merge branch '159-bcyrpt-nodejs' into 'staging'
Fixes #159
See merge request !108
|
7 years ago |
Big Bad Waffle
|
289206d54d
|
Fixes #161
|
7 years ago |
Big Bad Waffle
|
b3ed52e74b
|
Fixes #159
|
7 years ago |
Big Bad Waffle
|
dc5a6ddf24
|
Merge branch 'temp-redesign-login' into 'staging'
Temp redesign login
See merge request !103
|
7 years ago |
Big Bad Waffle
|
9c60975850
|
Fixes #158
|
7 years ago |
Shaun
|
7194c49c22
|
first bit of work on login
|
7 years ago |
Big Bad Waffle
|
67b7c37fcf
|
Merge branch '40-follower-mechanics' into 'staging'
Tweaked gaekatla critter lifespan
See merge request !101
|
7 years ago |
Big Bad Waffle
|
46ce3b0223
|
Tweaked gaekatla critter lifespan
|
7 years ago |
Big Bad Waffle
|
6440651e1e
|
Merge branch '40-follower-mechanics' into 'staging'
Fixes #40
See merge request !100
|
7 years ago |
Big Bad Waffle
|
416504e72c
|
Merge branch '132-charge-renderer-lags-behind' into 'staging'
Fixes #132
See merge request !99
|
7 years ago |
Big Bad Waffle
|
d8ab1fa77c
|
Merge branch '156-level-up-max-lvl-notice' into 'staging'
Fixes #156
See merge request !98
|
7 years ago |
Shaun
|
c02bab1068
|
Fixes #40
|
7 years ago |
Shaun
|
b72abb304e
|
Fixes #132
|
7 years ago |
Shaun
|
c534c2729d
|
Fixes #156
|
7 years ago |
Big Bad Waffle
|
c5cd27d751
|
Merge branch '153-map-location-by-level' into 'staging'
Fixed #153
See merge request !97
|
7 years ago |
Big Bad Waffle
|
742c099926
|
Fixed #153
|
7 years ago |
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 years ago |
Shaun
|
9fcd58888b
|
Tweaks to necro ability sprites
|
7 years ago |
Shaun
|
2112f3cc55
|
Ability sprites
|
7 years ago |
Shaun
|
09e31a212b
|
Ability sprites
|
7 years ago |
Big Bad Waffle
|
5df21a215c
|
Added sprite and first ability icon
|
7 years ago |
Big Bad Waffle
|
ebe7baf7c5
|
Merge branch '134-multiple-mods' into 'staging'
Resolve "Only one mod works"
See merge request !96
|
7 years ago |
Big Bad Waffle
|
b0b7bfdff8
|
Removed test code
|
7 years ago |
Big Bad Waffle
|
278bac7573
|
Removed test code
|
7 years ago |
Big Bad Waffle
|
12b2b04bc6
|
Fixes #134
|
7 years ago |