Commit Graph

274 Commits (3f5c3c5d98101cfba18925454a359fba0792c226)
 

Author SHA1 Message Date
Nuno 3f5c3c5d98 Merge remote-tracking branch 'origin/2-rework-player-trade-window' into main/yubo-dev 3 years ago
Nuno 3dc2aa1bb6 Merge remote-tracking branch 'origin/self-kill' into main/yubo-dev 3 years ago
Nuno 543be4bc4c Merge branch 'translations' 3 years ago
Nuno 80007bc602 Merge branch 'translations' into yubo 3 years ago
Nuno cf9855a6d5 Merge branch 'fixes' into yubo 3 years ago
Nuno bec18c661d Merge branch 'fixes' 3 years ago
Nuno 4a06fe15dd Merge branch 'master' into fixes 3 years ago
Ben Saine 111d4a7a0a self kill command 3 years ago
Nuno Gonçalves (Ulukyn) 5d91c33ddd Merge branch 'master' into translations 3 years ago
Nuno Gonçalves (Ulukyn) 01a2508567 Merge branch 'silan_refactoring' into yubo 3 years ago
Nuno Gonçalves (Ulukyn) b86b9283b2 Merge branch 'master' into silan_refactoring 3 years ago
Ulukyn 7bed39665e Updated visual_slot.tab 3 years ago
Nuno 6a1ea5ff59 Merge branch 'master' into yubo 3 years ago
Ulukyn 0e2a14c822 Updated visual_slot.tab 3 years ago
Nuno Gonçalves (Ulukyn) f9dafe720c Merge branch 'rewards' 3 years ago
Nuno Gonçalves (Ulukyn) 72691a3379 Merge branch 'rewards' into yubo 3 years ago
Nuno Gonçalves (Ulukyn) bc991c8146 Merge branch 'master' into rewards 3 years ago
Nuno 64bff20e03 Merge branch 'silan_refactoring' into yubo 3 years ago
Nuno 1eb651a946 Merge branch 'master' into silan_refactoring 3 years ago
Nuno 7da7d8cbbe Merge branch 'interface_textures' into yubo 3 years ago
Nuno 0ee26a6488 Merge branch 'master' into interface_textures 3 years ago
Nuno 9e404a5965 Merge branch 'deco_objects' into yubo 3 years ago
Nuno 97099768dc Merge branch 'master' into deco_objects 3 years ago
Nuno a443848924 Merge branch 'rewards' into yubo 3 years ago
Nuno ca0dc24aa0 Merge branch 'rewards' 3 years ago
Nuno 6d68e96dd4 Merge branch 'master' into rewards 3 years ago
Nuno 83a021e1e6 Merge branch 'master' into translations 4 years ago
Nuno cc5bd3ddae Merge branch 'interface_textures' into yubo 4 years ago
Nuno 5613eb855e Remove useless visual_slot.tab 4 years ago
Nuno 74c643f147 Merge branch 'ark' into yubo 4 years ago
Nuno 3d43c3c626 Merge branch 'ark' 4 years ago
Nuno 6bd853f7bf Merge branch 'master' into ark 4 years ago
Nuno 72f7cbe4fa Merge branch 'rewards' into yubo 4 years ago
Nuno 9d2fc8c630 Merge branch 'rewards' 4 years ago
Nuno b4e54d5ad4 Merge branch 'master' into rewards 4 years ago
Nuno 54fd022501 Merge branch 'silan_refactoring' into yubo 4 years ago
Nuno 5fe26ec6d6 Merge branch 'new_interface_features' 4 years ago
Nuno 40a9e782c3 Merge branch 'new_interface_features' into yubo 4 years ago
Nuno 155e268ece Merge branch 'master' into new_interface_features 4 years ago
Nuno d350b1621d Merge branch 'translations' 4 years ago
Nuno 22bab29654 Merge branch 'translations' into yubo 4 years ago
Nuno 5632fffa44 Merge branch 'me-translations' into translations 4 years ago
Nuno 1cc000cc6c Merge branch 'translations' into me-translations 4 years ago
Nuno 6f4319bfcb Merge branch 'translations' into yubo 4 years ago
Nuno ab958d1891 Merge branch 'master' into translations 4 years ago
Nuno c3c7e15c81 Merge branch 'master' into new_interface_features 4 years ago
Nuno 568a7a10a9 Merge branch 'new_interface_features' 4 years ago
Nuno f886d5eac7 Merge branch 'new_interface_features' into yubo 4 years ago
Nuno 85e788da81 Merge branch 'master' into new_interface_features 4 years ago
Nuno 0fb9422426 Merge branch 'master' into translations 4 years ago