Commit Graph

475 Commits

Author SHA1 Message Date
dP
cd2da419a5 Add CM_ prefix to all CityMania sprite constants and new icon for c&p 2021-09-28 23:15:50 +03:00
dP
239ff976da Merge remote-tracking branch 'upstream/master' 2021-09-27 19:53:01 +03:00
dP
407b10e090 Merge branch 'openttd' 2021-09-26 20:30:27 +03:00
dP
4eb8b29dbf Update to 12.0-RC1 2021-09-26 20:30:12 +03:00
dP
02a1224535 Fix order modifier settings 2021-09-22 18:28:40 +03:00
dP
09123ac84f Merge branch 'master' into blueprints 2021-09-21 23:48:34 +03:00
dP
890bf485fd Fix crash when closing order GUI with a hotkey 2021-09-10 23:10:06 +03:00
dP
1e6b6bde88 Add new company/spectate option back to the company toolbar dropdown 2021-09-01 22:28:14 +03:00
dP
5796b4329b Fix crash when opening settings 2021-08-20 22:27:36 +03:00
dP
82fcd11442 Add forgotten citymania_settings.ini 2021-08-19 23:34:00 +03:00
dP
c04c5de983 Merge remote-tracking branch 'upstream/master' 2021-08-19 23:27:27 +03:00
dP
28429e1f57 Reorganize CityMania client custom settings 2021-08-19 23:27:22 +03:00
dP
1be8e636db Merge branch 'openttd' 2021-08-19 23:05:44 +03:00
dP
c9765f712f Update to 12.0-beta2 2021-08-19 23:05:31 +03:00
dP
0c3bfa92f4 Fix settings 2021-08-19 00:51:34 +03:00
dP
318cbbbc59 Fix compilation errors 2021-08-17 22:53:23 +03:00
dP
a38dc30bf6 Merge remote-tracking branch 'upstream/master' 2021-08-16 01:58:47 +03:00
dP
97a23be348 Merge branch 'openttd' 2021-08-15 18:46:49 +03:00
dP
7ade3d06e6 Remove old files 2021-08-15 18:46:31 +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
c4d5a71da1 Allow CmdCompanyCtrl while replaying the command log 2021-08-02 18:13:15 +03:00
dP
ee0094cc1d Merge branch 'master' into blueprints 2021-07-31 13:17:58 +03:00
dP
16ec18a70d Console commands and other improvements for automated testing 2021-07-28 21:35:57 +03:00
dP
68ffdb88a7 Fix: Crash when no valid airport is selected 2021-06-30 16:44:43 +03:00
Pavel Stupnikov
6b30d9c457 Merge branch '1.11' into blueprints 2021-05-26 00:46:18 +03:00
Pavel Stupnikov
aa93b045f0 Fix minimap jittering 2021-05-23 13:34:03 +03:00
dP
7b500024fe Don't reverse preceding sprites in sorter 2021-05-04 02:37:40 +03:00
dP
375001ca25 Fix compilation error 2021-05-03 23:00:51 +03:00
dP
d7c46e1477 Merge remote-tracking branch 'upstream/1.11' into 1.11 2021-05-03 22:21:59 +03:00
dP
2783c34588 Merge branch 'openttd' into 1.11 2021-05-03 22:11:13 +03:00
dP
ac7d3eba75 Update to 1.11.2 2021-05-03 22:10:57 +03:00
dP
ea7b277a40 Fix #4: Always enable citymania login button 2021-04-19 01:32:15 +03:00
dP
33f4c4996a Merge remote-tracking branch 'upstream/1.11' into 1.11 2021-04-19 01:20:03 +03:00
dP
942ac9df90 Fix community password prompt window title 2021-04-19 00:55:08 +03:00
dP
8601ff15c4 Merge branch 'openttd' into 1.11 2021-04-19 00:52:56 +03:00
dP
5881c752f5 Update to 1.11.1 2021-04-19 00:52:41 +03:00
dP
740341679f Fix #4: Improve login window string constants naming and colour 2021-04-19 00:47:45 +03:00
dP
f6f5c001cc Fix #8: Potential read of unitialized memory in town growth tiles 2021-04-19 00:13:23 +03:00
danidoedel
56b9d1317a Fixes an improvements for the German translation (#7) 2021-04-15 13:36:37 +03:00
dP
0f8af6108d Fix joining companies from company window 2021-04-05 21:43:01 +03:00
dP
6f71276722 Fix strings in German translation 2021-04-05 20:16:16 +03:00
dP
a7b7157a52 Merge branch '1.11' of github.com:citymania-org/cmclient into 1.11 2021-04-05 20:12:15 +03:00
dP
b9ecd7df48 Don't crash when building road stops and airports 2021-04-05 20:12:01 +03:00
danidoedel
3fce9b4ec1 Add missing German translations 2021-04-05 02:59:37 +07:00
danidoedel
5004fa39cb Fix typos in English translation 2021-04-05 02:58:27 +07:00
dP
edba868423 Fix goal windows size 2021-04-04 19:29:59 +03:00
Bernard Teo
036b73a4e1 Fix #8922: Show vehicle window for single vehicle in shared order grouping 2021-04-04 17:49:55 +03:00
Michael Lutz
c92a198ef5 Fix #8935: [OSX] Crash when clicking 'Save' due to wrongly-threaded OS call. 2021-04-04 17:48:39 +03:00
dP
a7365c129d Remove commended code 2021-04-04 17:47:15 +03:00