Commit Graph

81 Commits

Author SHA1 Message Date
dP 854c507086 Merge remote-tracking branch 'upstream/master' 2024-04-14 01:59:39 +07:00
dP 02f7b3f1f8 Merge branch 'openttd' 2024-04-14 01:56:43 +07:00
dP 14504ff3b2 Update to 14.0 2024-04-14 01:56:35 +07:00
dP 47bc4b514f Merge remote-tracking branch 'upstream/master' 2024-03-17 01:25:55 +07:00
dP e7a0cb83c5 Merge branch 'openttd' 2024-03-17 01:02:31 +07:00
dP da761f41e2 Update to 14.0-RC2 2024-03-17 01:01:56 +07:00
dP 48e926c2cf Merge remote-tracking branch 'upstream/master' 2024-02-19 12:16:07 +05:30
dP e2be69e345 Merge branch 'openttd' 2024-02-19 04:42:57 +05:30
dP 53ff9d1f9f Update to 14.0-RC1 2024-02-19 04:42:45 +05:30
dP cdd69a496d Fix compilation errors 2024-02-06 20:35:28 +05:30
dP 645bfaffbd Merge remote-tracking branch 'upstream/master' 2024-02-04 22:50:08 +05:30
dP 7a1afa55d6 Merge branch 'openttd' 2024-02-04 02:48:37 +05:30
dP 33ef333b57 Update to 14.0-beta1 2024-02-04 02:18:17 +05:30
dP 8c1a9ce30f Merge remote-tracking branch 'upstream/master' 2023-07-31 19:49:55 +04:00
dP 77ed90fcb3 Merge branch 'openttd' 2023-07-31 19:33:31 +04:00
dP 79037e2c65 Update to 13.4 2023-07-31 19:33:16 +04:00
dP 467d1af763 Merge remote-tracking branch 'upstream/master' into 13.0 2023-02-05 22:16:58 +04:00
dP 7de6a4d937 Merge branch 'openttd' 2023-02-05 22:15:57 +04:00
dP 5f920a122d Update to 13.0 2023-02-05 22:15:48 +04:00
dP 2b3c725384 Merge remote-tracking branch 'upstream/master' into 13.0 2023-02-03 15:56:10 +04:00
dP 4754d5cde5 Merge branch 'openttd' 2023-02-03 15:06:09 +04:00
dP ebf0794b1c Update to 13.0-RC2 2023-02-03 15:05:53 +04:00
dP 35cf190d5e Merge remote-tracking branch 'upstream/master' into 13.0 2023-01-19 04:08:55 +04:00
Pavel Stupnikov 78c5d4161f Merge branch 'openttd' 2023-01-03 19:05:48 +04:00
Pavel Stupnikov 59c991fa52 Update to 13.0-RC1 2023-01-03 15:58:14 +04:00
Pavel Stupnikov f3ecdf6f7f Merge remote-tracking branch 'upstream/master' into 13.0 2022-11-26 22:16:25 +04:00
Pavel Stupnikov 4682b3cffb Merge branch 'openttd' 2022-11-23 14:35:54 +04:00
Pavel Stupnikov be23283677 Update to 13.0-beta1 2022-11-23 14:30:36 +04:00
dP dc09cd9e2a Update to 12.2 2022-04-02 17:32:19 +03:00
dP 8bed7c7014 Merge branch 'openttd' 2022-04-02 15:34:33 +03:00
dP 269352680c Update to 12.2 2022-04-02 15:34:00 +03:00
dP f353721956 Merge remote-tracking branch 'upstream/master' 2021-10-01 23:42:40 +03:00
dP 28429e1f57 Reorganize CityMania client custom settings 2021-08-19 23:27:22 +03:00
dP a38dc30bf6 Merge remote-tracking branch 'upstream/master' 2021-08-16 01:58:47 +03:00
dP c0b08d01d6 Merge branch 'openttd' 2021-08-15 16:45:35 +03:00
dP 9df4f2c4fc Update to 12.0-beta1 2021-08-15 14:57:29 +03:00
dP c36ef2b3f3 Merge remote-tracking branch 'upstream/1.11' into 1.11 2021-03-15 20:11:52 +03:00
dP 1381a86a1e Merge branch 'openttd' into 1.11 2021-03-15 15:49:25 +03:00
dP 595606287d Update to 1.11.0-RC1 2021-03-15 12:57:26 +03:00
dP c47930887b Merge remote-tracking branch 'upstream/1.11' into 1.11 2021-01-25 22:53:44 +03:00
dP 4c1dfdefa6 Update to 1.11.0-beta1 2021-01-23 17:54:36 +03:00
dP 5e4506f493 Update to 1.11.0-beta1 2021-01-23 17:31:11 +03:00
dP 8b4fbb41b5 Merge cargo profits from cmbase 2020-07-04 16:31:18 +03:00
dP 46bd8ab608 Track income by cargo type in company economy stats 2020-07-01 22:35:30 +03:00
dP 581a482692 Add more citymania data to savegame 2020-06-09 02:30:07 +03:00
dP 9b9a850d0b Merge 1.10.0-RC1 2020-02-18 20:56:38 +03:00
dP d4ae6a1d91 Update to 1.10.0-RC1 2020-02-18 18:13:33 +03:00
dP 47b70f6769 Change FOR_ALL_ cycles to ::Iterate 2020-01-06 20:45:47 +03:00
dP 1492a22027 Update to 1.10.0-beta2 2020-01-06 19:06:51 +03:00
dP c7c3966eec Update to 1.10.0-beta2 2020-01-06 18:49:34 +03:00