Merge branch 'master' into 0.5.1-dev
- Conflicts:
- src/Globals.h
Description
Description
Details
Details
- Provenance
acme_pjz Authored on Nov 6 2018, 5:13 AM - Parents
- R79:df1df2f8c673: bump the version to 0.5a
R79:dbf4e09563b4: added the pseudo-random number generator (prng) to script API - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
- df1df2f8c673 bump the version to 0.5aAuthoracme_pjz
- 9d59eb8e4310 Merge pull request #36 from eugeneloza/masterAuthorJz Pan
- 33727f78efcd ad-hoc fix to #35Authoracme_pjz
- e427c3cb4159 Playtesting results for Russian&UkrainianAuthoreugeneloza
- Authoracme_pjz
- 58ce2848c86c Merge pull request #33 from eugeneloza/masterAuthorJz Pan
- 74a39e90b0be Proof-reading part 2 (Ukrainian)Authoreugeneloza
- b3f98f3be5cc Merge pull request #3 from acmepjz/masterAuthorEugene Loza
- 36ac82a8c445 Merge pull request #30 from AMDmi3/patch-2AuthorJz Pan
- 90529da1957f we also need SDL_INIT_TIMERAuthorJz Pan
- 42e9cbbe1426 Merge pull request #29 from AMDmi3/patch-1AuthorJz Pan
- 8a831e7764ad Don't use SDL_INIT_EVERYTHINGAuthorDmitry Marakasov
- 4847e6b57552 Define paths earlier in CMakeLists.txtAuthorDmitry Marakasov
- 5f2c0657608c Translated using Weblate (Ukrainian)AuthorOlexandr Nesterenko
- 0e557d4cd166 Translated using Weblate (Russian)Authormesnevi
- 12bc2af45cd8 Translated using Weblate (Russian)AuthorButterflyOfFire
- 3a0b6a6f6185 Translated using Weblate (Hungarian)AuthorSanskritFritz