Jonathan G Rennison
eda50ef6a5
Use std::vector for extra station name strings
2024-06-19 20:03:42 +01:00
Jonathan G Rennison
f9b75ed304
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/scripts/FindVersion.cmake
# src/airport_gui.cpp
# src/industry_gui.cpp
# src/newgrf.cpp
# src/newgrf_class_func.h
# src/newgrf_object.h
# src/newgrf_roadstop.cpp
# src/newgrf_roadstop.h
# src/object_gui.cpp
# src/rail_gui.cpp
# src/road_cmd.h
# src/road_gui.cpp
# src/station_cmd.h
# src/strings.cpp
# src/waypoint_cmd.h
2024-06-05 21:13:55 +01:00
Jonathan G Rennison
1e9fb74451
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release-windows.yml
# src/autoreplace_gui.cpp
# src/cargotype.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/company_gui.cpp
# src/currency.h
# src/date_gui.cpp
# src/dropdown.cpp
# src/dropdown_func.h
# src/dropdown_type.h
# src/game/game_gui.cpp
# src/genworld.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/house.h
# src/industry_gui.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_type.h
# src/newgrf_class_func.h
# src/newgrf_house.cpp
# src/newgrf_roadstop.h
# src/openttd.cpp
# src/order_gui.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/screenshot_gui.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/slider.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/survey.cpp
# src/tile_map.h
# src/town_cmd.cpp
# src/town_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
2024-05-28 20:33:35 +01:00
Jonathan G Rennison
18a42664fc
Merge branch 'master' into jgrpp
...
Remove 'byte' typedef
2024-05-07 17:21:50 +01:00
Jonathan G Rennison
d90c540f9e
Enable economy day length scaling in wallclock timekeeping mode
2024-04-30 18:04:04 +01:00
Rubidium
21b640b5ff
Codechange: simplify president name generation
2024-04-10 18:57:53 +02:00
Jonathan G Rennison
0008e7d769
Fix velocity unit names used in cargo payments graph window
2024-03-31 17:48:58 +01:00
Jonathan G Rennison
6e689c2b93
Fix tiles/day speed unit in wallclock mode
2024-03-31 17:02:27 +01:00
Peter Nelson
8d312b305b
Codechange: Replace currency macros with functions. ( #12396 )
2024-03-29 14:49:48 +00:00
Patric Stout
a3cfd23cf9
Codechange: rename byte to uint8_t ( #12308 )
2024-03-16 23:59:32 +01:00
Jonathan G Rennison
45b6079899
Add string code for absolute timetable time
2024-02-22 21:12:38 +00:00
Jonathan G Rennison
91b3e9c1ab
Initial support for relative timetabling in wallclock mode
2024-02-22 21:12:38 +00:00
Rubidium
4c117dd2d8
Revert #11993 : new number format system does not and cannot work for CJK languages
...
There are too many intricacies that I am unaware of that are popping up after
asking whether things are right or not.
I do not want to keep playing whack-a-mole, so just revert the whole thing.
This reverts:
15be383b93360fe8b0b61aa9a5c0ab59f56941e57e2eefb91fb741b2ba6f609d0071d59f8fd80112a253205b93819c6c756e
2024-02-22 20:40:12 +01:00
Rubidium
5d2e6e4efa
Fix #12148 , fca8166: Do not draw decimals when number of digits is 0
2024-02-21 19:32:53 +01:00
Rubidium
360fe8b0b6
Fix a253205: division by zero when attempting to format some short currencies
2024-02-17 22:45:48 +01:00
Rubidium
7e2eefb91f
Cleanup: Remove digit group separators from strgen and languages
2024-02-17 14:33:16 +01:00
Rubidium
b741b2ba6f
Feature: Fully user configurable number format and abbreviations
2024-02-17 14:33:16 +01:00
Rubidium
609d0071d5
Change: Remove saving of digit group and decimal separator configurations from the savegame
2024-02-17 14:33:16 +01:00
Rubidium
9f8fd80112
Feature: Fully customisable number abbreviations per translation
2024-02-17 14:33:16 +01:00
Rubidium
a253205b93
Feature: Fully customisable number format per translation
2024-02-17 14:33:16 +01:00
Rubidium
819c6c756e
Codechange: Add support for number format and abbreviations pragmas/attributes to strgen
2024-02-17 14:33:16 +01:00
Rubidium
fca8166087
Codechange: Simplify FormatNumber by moving out zero fill and decimal support
2024-02-17 14:33:16 +01:00
Rubidium
a44bd81280
Codechange: Move determining the decimal separator to a separate function
2024-02-17 14:33:16 +01:00
Jonathan G Rennison
838b166726
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_base.h
# src/debug.cpp
# src/debug.h
# src/economy.cpp
# src/engine_type.h
# src/graph_gui.cpp
# src/misc_cmd.cpp
# src/misc_cmd.h
# src/network/core/os_abstraction.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings_type.h
# src/ship_cmd.cpp
# src/stdafx.h
# src/tests/bitmath_func.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
2024-02-17 11:53:35 +00:00
Jonathan G Rennison
b13b2781bd
Add string codes for upstream wallclock mode, add upstream language changes
2024-02-14 23:22:28 +00:00
Jonathan G Rennison
e98d9a1d1d
Strings: Remove DATE_WALLCLOCK_* string codes, add TT_TIME
2024-02-13 22:08:15 +00:00
Jonathan G Rennison
7ce06e22b8
Split date types into calendar and economy dates
...
See: 735abfe1
2024-02-13 21:34:09 +00:00
Jonathan G Rennison
d456f4a3a5
Replace DATE_UNIT_SIZE macro with a function
2024-02-07 21:19:55 +00:00
Jonathan G Rennison
0ea57528c9
Rename DateTicksScaled to StateTicks
...
Rename various other related/derived types and variables
2024-02-07 18:36:47 +00:00
Patric Stout
f1842f9144
Add: {CURRENCY_SHORT} only did k / m suffix. Add bn / tn and make translatable. ( #11921 )
...
64bit numbers are REALLY large, but our compact method was build
for 32bit numbers. Extend it to 64bit.
2024-01-29 20:20:35 +00:00
frosch
28c83089f6
Codechange: Remove TKM string code.
2024-01-28 14:44:24 +01:00
Peter Nelson
009fea0e14
Fix: Memory leak in ICUParagraphLayout::NextLine() ( #11895 )
...
This function calls icu::BreakIterator::createLineInstance() but does not clean up after it.
Instead use a static instance that is cloned (for thread-safety) and deleted as necessary.
(cherry picked from commit 6d276698b6
2024-01-27 20:20:28 +00:00
Peter Nelson
6d276698b6
Fix: Memory leak in ICUParagraphLayout::NextLine() ( #11895 )
...
This function calls icu::BreakIterator::createLineInstance() but does not clean up after it.
Instead use a static instance that is cloned (for thread-safety) and deleted as necessary.
2024-01-27 20:13:42 +00:00
Jonathan G Rennison
5404be172c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/bitmath_func.cpp
# src/core/bitmath_func.hpp
# src/core/geometry_type.hpp
# src/game/game_text.hpp
# src/graph_gui.cpp
# src/pathfinder/npf/npf.cpp
# src/script/api/script_text.cpp
# src/spritecache.cpp
# src/track_func.h
2024-01-25 22:36:01 +00:00
Jonathan G Rennison
822ecae85d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cargotype.h
# src/core/CMakeLists.txt
# src/core/span_type.hpp
# src/fileio.cpp
# src/fios.cpp
# src/misc/endian_buffer.hpp
# src/misc_gui.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/settings.cpp
# src/settings_internal.h
# src/stdafx.h
# src/string_func.h
# src/strings.cpp
# src/strings_func.h
# src/strings_internal.h
2024-01-25 18:37:23 +00:00
Tyler Trahan
fd9e72a7e7
Feature: Use real-time "wallclock" timekeeping units ( #11341 )
2024-01-23 11:36:09 -05:00
Rubidium
ee00c7b159
Codechange: use TO_LE16 directly when reading language file offsets
2024-01-18 23:29:15 +01:00
Patric Stout
fd073a2810
Remove: replace custom span with std::span
2024-01-17 00:25:08 +01:00
Jonathan G Rennison
3050620189
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/autoreplace_cmd.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.cpp
# src/economy.cpp
# src/engine_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/linkgraph/refresh.cpp
# src/linkgraph/refresh.h
# src/newgrf.cpp
# src/newgrf_airporttiles.h
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/order_base.h
# src/order_cmd.cpp
# src/order_func.h
# src/order_gui.cpp
# src/pathfinder/pathfinder_type.h
# src/saveload/afterload.cpp
# src/subsidy_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
2024-01-11 17:55:16 +00:00
Jonathan G Rennison
4b48d3b5fe
Fix: String gender scan with SCC_INDUSTRY_NAME ( #11697 )
2024-01-07 15:48:47 -05:00
Jonathan G Rennison
97e6f3062e
Adding of _t to (u)int types, and WChar to char32_t
...
See: eaae0bb5e
2024-01-07 17:20:41 +00:00
Jonathan G Rennison
f24388c0b2
Fix string gender scan with SCC_INDUSTRY_NAME
2024-01-06 17:57:44 +00:00
Jonathan G Rennison
dcd71f5ab8
Strings: Exit early when scanning for gender data
2024-01-06 17:54:42 +00:00
Jonathan G Rennison
0460b820f3
Use std::string for LanguageMetadata::file
2024-01-05 22:35:20 +00:00
Jonathan G Rennison
0ab4b8ea31
Add helper functions to get last path segment
2024-01-05 22:35:20 +00:00
Jonathan G Rennison
f034714559
Use StringBuilder for GetString/GetStringWithArgs, as per upstream
...
Update dependent code as required
2024-01-05 21:12:54 +00:00
Jonathan G Rennison
7f6b1d6b94
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/company_func.h
# src/core/overflowsafe_type.hpp
# src/engine.cpp
# src/music/midifile.cpp
# src/network/network_command.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_roadstop.h
# src/newgrf_spritegroup.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/pathfinder/yapf/yapf_common.hpp
# src/road_gui.cpp
# src/saveload/engine_sl.cpp
# src/script/api/script_depotlist.cpp
# src/script/api/script_roadtypelist.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/strings.cpp
# src/table/settings/game_settings.ini
2024-01-05 13:37:52 +00:00
Peter Nelson
7482f71692
Change: Don't handle 'missing' string parameters as 0. ( #11673 )
...
If not enough parameters are supplied for a string, then a value of 0 was used, which could result in incorrect information being displayed.
Instead, throw an exception and include an error in the string.
2024-01-04 20:50:58 +00:00
Jonathan G Rennison
5db9266f4b
Change: Allow STRING/STRINGN to use all remaining parameters in game script mode
2024-01-04 17:45:33 +00:00
Jonathan G Rennison
e2a79f0f32
Codechange: No longer advance parent offset in StringParameters parent mode
...
Add method to manually advance offset
2024-01-04 17:45:33 +00:00
