Big Bad Waffle
17d0c62a0c
Merge branch 'pather-tweak' into 'staging'
Pather tweaks
See merge request !65
7 år sedan
Big Bad Waffle
cdb72ce158
Fixes #25
7 år sedan
Big Bad Waffle
6e0ff5f4a5
Fixes #69
7 år sedan
Big Bad Waffle
e140d44d02
Fixes #90
7 år sedan
Big Bad Waffle
5ee2b35647
Fixes #73
7 år sedan
Big Bad Waffle
ca39520848
Merge branch '74-stash-quanity' into 'staging'
fix stashing quantity = 1
See merge request !64
7 år sedan
Vladde Nordholm
fc184d77e4
fix stashing quantity = 1
7 år sedan
Big Bad Waffle
a702f0441d
Merge branch 'issue-10' into 'staging'
Issue 10
See merge request !63
7 år sedan
Big Bad Waffle
63b2f23ec1
Removed testing code that was left in
7 år sedan
Big Bad Waffle
2a7e9f0fd1
Merge branch '64-chat-vanish-mob-die' into 'staging'
Fixes #64
See merge request !62
7 år sedan
Big Bad Waffle
113209165a
Merge branch '88-item-grid-shop-stash' into 'staging'
Fixes #88
See merge request !61
7 år sedan
Big Bad Waffle
7123f7ca13
Merge branch '96-less-xp-lower-obs' into 'staging'
Fixes #96
See merge request !60
7 år sedan
Big Bad Waffle
5317b63452
Merge branch '99-heal-fail-collider' into 'staging'
Fixes #99
See merge request !59
7 år sedan
Big Bad Waffle
c83374209a
Merge branch '100-quest-gen-fail-low-level' into 'staging'
Fixes #100
See merge request !58
7 år sedan
Big Bad Waffle
2b82e1eb23
Merge branch '101-extended-dialogue-actions' into 'staging'
Resolve "Dialogue options should be able to call methods on other objects' components"
See merge request !57
7 år sedan
Big Bad Waffle
a9080799a8
Merge branch '93-duplicate-party-display' into 'staging'
Prevent duplicate party members
See merge request !55
7 år sedan
Paul Holden
cb222e5db1
Remove duplicate check in party UI template
- The server should not send a party that contains duplicate member IDs.
7 år sedan
Paul Holden
64c637c9a2
Fix incorrect arrow notation
7 år sedan
Paul Holden
e07ac73608
Clean up arrow notation
7 år sedan
Paul Holden
1bdab1a449
Use destroyInvite()
7 år sedan
Paul Holden
553e28fb5b
Prevent duplicate party members
- Addresses the issue in the client and server.
- Keep track of which players (by name) are added to the party UI in
`onGetParty()' to prevent duplicate frames for a player.
- On the server side, don't add a player ID to the party if already
present.
7 år sedan
Big Bad Waffle
55acff4c5e
Merge branch '108-destroy-invite-fix' into 'staging'
Allow explicit destroyInvite() call with no event
See merge request !56
7 år sedan
Paul Holden
ad464dd352
Allow explicit destroyInvite() call with no event
7 år sedan
Shatterbrain
c25e348c4a
Externalize pather color to variable
7 år sedan
Shatterbrain
b8193b39dc
Removed unused variable
7 år sedan
Big Bad Waffle
ef421be80a
Fixes #88
7 år sedan
Big Bad Waffle
ba3ce0a427
Removed test code
7 år sedan
Big Bad Waffle
0823ee5a75
Fixes #101
7 år sedan
bigbadwaffle
0330cf7ddf
Fixes #99
7 år sedan
bigbadwaffle
ba6fdcaf19
Fixes #96
7 år sedan
bigbadwaffle
c3606e4ad4
Fixes #100
7 år sedan
bigbadwaffle
53232a103f
Fixes #64
7 år sedan
Big Bad Waffle
00c86e9412
Merge branch '104-augment-message-fix' into 'staging'
Fix negative values in augment failure message
See merge request !53
7 år sedan
bigbadwaffle
afeeb8f2a4
Added some reputation tests
7 år sedan
Paul Holden
4b0f5fd5f7
Fix negative values in augment failure message
7 år sedan
Big Bad Waffle
c830f5762b
Removed old test code
7 år sedan
Big Bad Waffle
1ea8a005ef
First commit for testing
7 år sedan
Big Bad Waffle
9419890a77
Merge branch '76-augment-friendly-stat-names' into 'staging'
Git didn't include the client part of Fix #76 . Added it now
See merge request !50
7 år sedan
Big Bad Waffle
595bd04d97
Git didn't include the client part of Fix #76 . Added it now
7 år sedan
Big Bad Waffle
f3b4e59ce4
Merge branch 'Fix-Issue-#54' into 'staging'
Fix issue #54
See merge request !33
7 år sedan
Big Bad Waffle
5dcd9c2d48
Merge branch 'Fix-Issue#63' into 'staging'
Fix issue #63
See merge request !35
7 år sedan
Big Bad Waffle
b759945ae4
Merge branch 'issue-66' into 'staging'
Fixes #66
See merge request !49
7 år sedan
Big Bad Waffle
e05491e52f
Merge branch 'issue-57' into 'staging'
Fixes #57
See merge request !48
7 år sedan
Big Bad Waffle
75e7d3ae49
Merge branch 'issue-56' into 'staging'
Fixes #56
See merge request !47
7 år sedan
Big Bad Waffle
48ec217d35
Merge branch 'issue-46' into 'staging'
Issue 46
See merge request !46
7 år sedan
Big Bad Waffle
fa8e37a9da
Merge branch 'issue-11' into 'staging'
Fixes #11
See merge request !44
7 år sedan
Big Bad Waffle
96e93e80d9
Merge branch '86-fix-browser-zoom-hack' into 'staging'
Fixes #86
See merge request !43
7 år sedan
Big Bad Waffle
02ef9418cb
Merge branch '83-quest-level-vs-player-level' into 'staging'
Fixes #83
See merge request !42
7 år sedan
Big Bad Waffle
cb2f403bae
Merge branch '81-cancel-movement-help' into 'staging'
Fixes #81
See merge request !41
7 år sedan
Big Bad Waffle
54398f407f
Merge branch '80-spell-tooltip-update-equip' into 'staging'
Fixes #80
See merge request !40
7 år sedan