Commit Graph

364 Commits (feature/prepare-cross-merge)

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