Commit Graph

359 Commits (3ccdb43683c00cbd41920df7f2dd5a194428977e)

Author SHA1 Message Date
Nuno 3ccdb43683
Player can't exchanges jewels with allegories
Nuno aad1a6edd0
Merge branch 'ark'
Nuno 9b475fde60
Merge branch 'outpost_refactoring'
Nuno 4401db3dc7
Merge branch 'feature/bonusmalus-timers'
Nuno ca543ce9b6
Merge branch 'outpost_refactoring'
Nuno 73fc8e09ef
Merge branch 'outpost_refactoring'
Nuno c2fa3133b9
Merge branch 'outpost_refactoring'
Nuno 796582e235
Merge branch 'new_features'
Nuno 1c57ac7b8f
Merge branch 'ark'
Nuno 0f74f62640
Merge branch 'ark'
Nuno d5c03115d9
Remove useless variable
Nuno fe9b7aea89
Remove bad commit
Nuno c4fc834e67
Updated shard.screen.rc
Nuno 729deabd7a
Update install rocketchat
Nuno 0479a5ba8e
Merge branch 'allegories'
Nuno c4115ae2a4
Updated tools
Nuno 46ad8bcf5d
Merge branch 'new_features'
Nuno af4f4a1de6
Merge branch 'fixes'
Nuno c0129de5ed
Fixes for getNPCNameFromAlias
Nuno 5761a4a638
Merge remote-tracking branch 'origin/fixes'
Nuno 8d180bd38b
Merge branch 'ark'
Nuno bad68017b8
Fix issue with getTargetNames who are lowerized
Nuno e0c4bcf4e0
Merge branch 'new_features'
Nuno a1d3f91a9b
Merge branch 'new_features'
Nuno 2804161714
Merge branch 'new_features'
Nuno 371f529699
Fix
Nuno 4d4223c87c
Fix
Nuno f7953eea36
Fix
Nuno 806cb449a1
Some fixes
Nuno b76ac3d37f
Merge branch 'fixes'
Nuno d33f6b283f
Merge branch 'deepl'
Nuno 08393ea94d
Merge branch 'marauder_fame'
Nuno 9b5a4d94cf
Merge branch 'new_features'
Nuno ca042995c0
Merge branch 'fixes'
Nuno d88b549dbc
Merge branch 'fixes'
Nuno e3b030b823
Merge branch 'ark'
Nuno bf4ccacec6
Merge branch 'ark'
Nuno f0cc3f3b42
Merge branch 'ark'
Nuno 4008a69448
Added setAnimalTitle
kaetemi 141e7c6459
Sync to Forge server repo, rev 9f74b215ab99c508b08e2cee125946167d87e2ba
Nuno 000fdfb5d7
Merge branch 'fixes'
Nuno 17d84c5925
Merge branch 'fixes'
Nuno 0e833c37ef
Merge branch 'fixes'
Nuno 7f33e9bdd6
Merge branch 'fixes'
Nuno 5678ef1727
Revert "Merge branch 'yubo'"
This reverts commit 5319587e80ed7e822944565cde8b9a437b8fc55c.
Nuno 619b5fd122
Merge branch 'yubo'
Nuno a58af169ab
Merge branch 'ark'
Nuno bd6c6c4fc2
Merge branch 'deepl'
Ulukyn d6dcd13938
Merge branch 'fixes'
Ulukyn 72d29ef8f6
Merge branch 'fixes'