AGulev 4ead8d9d42 Merge remote-tracking branch 'upstream/master' ...

# Conflicts:
#	monarch/monarch.lua

2017-11-27 10:57:32 +03:00

..

about.collection

A couple of bug fixes. Added reload option.

2017-11-22 13:28:27 +01:00

about.gui

A couple of bug fixes. Added reload option.

2017-11-22 13:28:27 +01:00

about.gui_script

A couple of bug fixes. Added reload option.

2017-11-22 13:28:27 +01:00

debug.gui

Initial commit

2017-09-04 12:01:57 +02:00

debug.gui_script

Initial commit

2017-09-04 12:01:57 +02:00

game.collection

Initial commit

2017-09-04 12:01:57 +02:00

game.gui

Allow data to be passed when showing or going back

2017-09-25 18:15:55 +02:00

game.gui_script

Allow data to be passed when showing or going back

2017-09-25 18:15:55 +02:00

main.collection

A couple of bug fixes. Added reload option.

2017-11-22 13:28:27 +01:00

main.script

Improved examples. Added transitions

2017-09-04 21:26:06 +02:00

menu.collection

Initial commit

2017-09-04 12:01:57 +02:00

menu.gui

A couple of bug fixes. Added reload option.

2017-11-22 13:28:27 +01:00

menu.gui_script

A couple of bug fixes. Added reload option.

2017-11-22 13:28:27 +01:00

popup.collection

Initial commit

2017-09-04 12:01:57 +02:00

popup.gui

Initial commit

2017-09-04 12:01:57 +02:00

popup.gui_script

scale_in and scale_out transactions

2017-11-03 10:24:37 +03:00

pregame.collection

Initial commit

2017-09-04 12:01:57 +02:00

pregame.gui

Improved examples. Added transitions

2017-09-04 21:26:06 +02:00

pregame.gui_script

Allow data to be passed when showing or going back

2017-09-25 18:15:55 +02:00