Merge branch 'feature-kidnapping' into 'devel' (6f606324) · Commits · labs / Tablexia

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

Commit 6f606324 authored 9 years ago by

Matyáš Latner

Browse files

Merge branch 'feature-kidnapping' into 'devel'

#27 Color overlays

Přidání získávání jednobarevných textur na ApplicationAtlasManager, který se postará o jejich dispose.
Dále přidání disposables na AbstracttablexiaScreen pro operace, kdy na screenu vznikne disposable a chceme ho nechat na koneci lifecycle disposenout.

Tímto nahrazeny overlaye u dialogů, game menu a únosu

See merge request !41

parents 96613286 07d988d8

Branches

Admin message

Admin message

Merge branch 'feature-kidnapping' into 'devel'