Commit Graph

7379 Commits (master)

Author SHA1 Message Date
JPG c65db33610 Merge branch 'master' of https://github.com/cookiegranola/adel 2018-01-31 14:32:38 +01:00
JPG eb13ad9274 update halo texture 2018-01-31 14:32:19 +01:00
Irrlick f45b3eac17 fix accented characters on mac os 2018-01-22 14:01:33 +00:00
JPG 16034a6389 Merge remote-tracking branch 'origin/scaling' 2018-01-21 23:51:53 +01:00
JPG a200bce85a fix conflict 2018-01-21 23:51:18 +01:00
Irrlick ebfc40a735 fixed iterator 2018-01-21 18:11:33 +00:00
JPG fbb030508a update default setting 2018-01-21 13:44:10 +01:00
Irrlick 611d710ab1 fixed std thread and mutex 2018-01-19 13:28:59 +02:00
Irrlick bd229025f2 fixed iterator declaration 2018-01-18 17:34:37 +00:00
Irrlick da578139ed removed debug code 2018-01-18 10:53:49 +00:00
Irrlick 4d2da93391 added proportional parameters for image tabs 2018-01-18 10:25:37 +00:00
JPG f4dc92f8ac Add param for line spacing (Eric) 2018-01-10 16:11:31 +01:00
JPG 05b75d4c23 GuiFormspecMenu: remove trimming in ParseElement 2018-01-09 15:48:39 +01:00
JPG cfafb5a2b4 Fix memory leaks 2018-01-09 15:43:41 +01:00
JPG 91ab0079cc fix conflicts 2018-01-05 21:59:47 +01:00
JPG bf67673ef0 Change default formspec colors 2018-01-02 17:16:58 +01:00
phat64 66f986d80f fix crash wrong font path return NULL / using porting::getDataPath(...) 2017-12-27 11:34:01 +01:00
JPG 64818d4793 Merge remote-tracking branch 'origin/text_sprite' into testing 2017-12-22 18:47:37 +01:00
JPG a032b79590 Merge remote-tracking branch 'origin/input' into testing 2017-12-22 18:47:23 +01:00
JPG c0ba91b6a6 guiFormSpecMenu: fix merge conflict 2017-12-22 18:47:07 +01:00
JPG 5207c85154 Merge remote-tracking branch 'origin/colormap' into testing 2017-12-22 18:42:42 +01:00
JPG 1d5d0be72d Merge remote-tracking branch 'origin/beta' into testing 2017-12-22 18:42:30 +01:00
JPG 28b698ba2a update 2017-12-21 11:38:47 +01:00
JPG 90edabc832 Merge branch 'master' of https://github.com/cookiegranola/adel 2017-12-20 12:56:35 +01:00
Irrlick 60f9fb896b fixed lua error message 2017-12-20 11:43:56 +00:00
JPG 5d867eafcc Merge remote-tracking branch 'origin/text_sprite' 2017-12-20 10:46:14 +01:00
JPG 2ade2eecc5 Merge remote-tracking branch 'origin/input' 2017-12-20 10:46:05 +01:00
JPG 2d25d9ef16 fix conflicts 2017-12-20 10:45:47 +01:00
JPG 4f257664d2 Merge remote-tracking branch 'origin/colormap' 2017-12-20 10:33:02 +01:00
JPG c39781364a Merge remote-tracking branch 'origin/beta' 2017-12-20 10:31:10 +01:00
JPG 3951a664b3 Update pause menu 2017-12-19 15:51:41 +01:00
Irrlick 88496d1a11 added missing extension in cmake file 2017-12-18 20:30:01 +00:00
Irrlick c9ad05cf7e removed explanations 2017-12-14 19:02:38 +00:00
Irrlick 26a664f7db removed explanations 2017-12-14 19:01:46 +00:00
Irrlick e782ebf3ca removed explanations 2017-12-14 19:00:30 +00:00
Irrlick 1b9c871e48 removed explanations 2017-12-14 18:59:24 +00:00
Irrlick 1ab3e2f184 removed explanations 2017-12-14 18:57:02 +00:00
Irrlick 82c8cc72eb added middle mouse button support 2017-12-14 15:20:48 +00:00
Irrlick 2d1da68388 fixed skin creation 2017-12-14 12:42:49 +00:00
Irrlick c55494ffb3 removed texture loader 2017-12-14 12:16:29 +00:00
Irrlick 9ee561c048 fixed scroll bar and skin compilation 2017-12-14 11:27:37 +00:00
Irrlick 1b6fe48567 added custom colors to gui skin, button, combo box and scroll bar 2017-12-14 10:40:29 +00:00
JPG 2bd03ed4ff place_node: add an extra param 2017-12-14 11:30:36 +01:00
Irrlick e215bb4751 added gui explanations 2017-12-14 07:50:13 +00:00
Irrlick 5cba7f222b fixed line breaks 2017-12-13 09:19:31 +00:00
Irrlick f62466753d added text sprite node positioning 2017-12-13 02:09:54 +00:00
Irrlick 358c707732 added debugging rendering 2017-12-13 01:58:44 +00:00
Irrlick e2f44a4191 added text sprite scene node 2017-12-12 17:57:05 +00:00
Irrlick 61cb273927 added image tab control 2017-12-12 16:05:51 +00:00
Irrlick ead3ad860e added text parsing function 2017-12-12 15:44:35 +00:00