983c7ade60
Codechange: Replace FOR_ALL_SEARCHPATHS with range-based for loops
3 years ago
20ac0b4148
Cleanup: Replace FOR_ALL_SORTED_CARGOSPECS macro with range iterator.
3 years ago
253772e9af
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# COMPILING.md
# src/console.cpp
# src/console_cmds.cpp
# src/console_internal.h
# src/rev.cpp.in
3 years ago
ba418f9d0d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/simplified_chinese.txt
# src/network/core/tcp_content.cpp
# src/network/core/udp.cpp
# src/network/network_server.cpp
# src/saveload/linkgraph_sl.cpp
# src/table/gameopt_settings.ini
3 years ago
37222c3fa2
Change: treat languages as finished, if translations are 75% completed.
...
Unfinished translations are not auto-picked from the locale.
In release builds, unfinished translations are not offered in the GUI.
Unfinished translations are available in non-release builds, or by editing openttd.cfg.
3 years ago
05612d60ae
Remove: "language" field from server/client
...
The original idea was that people could find a server they could
talk in their native language on. This isn't really used in that
way. There are several reasons for removing this:
- the client also sends his "language" to the server, but nothing
is doing anything with this.
- flags are a bad way to represent languages, and over the years
we had several (rightfully) complaints about this.
- most servers have their language set to "All", and prefix the
servername with the language it is about. This is a much more
efficient way to do the same.
All in all, this feature should go back to the drawing board.
Maybe it could work in another form, but this form is not it.
3 years ago
272e583478
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/korean.txt
# src/settings.cpp
3 years ago
fdc8230dfa
Cleanup: Fix comment for only one form ( #9012 )
3 years ago
227041008f
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/lang/russian.txt
# src/misc_gui.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_cmd.cpp
# src/window_gui.h
3 years ago
edfa04286b
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release.yml
# bin/CMakeLists.txt
# src/dock_gui.cpp
# src/lang/brazilian_portuguese.txt
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/german.txt
# src/lang/hungarian.txt
# src/lang/indonesian.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/object_gui.cpp
# src/pathfinder/yapf/yapf_costrail.hpp
# src/pathfinder/yapf/yapf_node_rail.hpp
# src/rail_cmd.cpp
# src/roadveh_cmd.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
3 years ago
d4c3d01d07
Add: new plural form for Romanian translation ( #8936 )
3 years ago
e0561dbded
Fix #8713 : Change OTTD2FS and FS2OTTD to return string objects instead of static buffers
3 years ago
5e14b54a0c
Merge branch 'master' into jgrpp
3 years ago
295f34a9df
Fix: Freeing LanguagePack with wrong size.
3 years ago
912c62d749
Add timetable lateness/earliness conditional order
3 years ago
b21ba566ae
Codechange: remove special strings for language and resolutions ( #8824 )
...
As OpenTTD grew, we found other ways to do this, and we are no
longer in need for a hack like this.
3 years ago
e95216b59d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/core/geometry_func.cpp
# src/date.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/object_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/video/allegro_v.cpp
# src/video/dedicated_v.cpp
# src/video/null_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
3 years ago
cb5cd11b9a
Fix AddressSanitizer complaining about LanguagePack deleter
...
See: 024a3f62
3 years ago
6755ff63e1
Add: [OSX] Native font rendering without using FreeType.
3 years ago
2b0200d429
Codechange: OS-specific data for font search is not used outside of searching.
3 years ago
7154f8859d
Merge tag '1.11.0-beta1' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/gfx_func.h
# src/industry.h
# src/lang/czech.txt
# src/lang/estonian.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/slovak.txt
# src/saveload/saveload.h
# src/station_gui.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/waypoint_gui.cpp
3 years ago
b7ddd486cf
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
3 years ago
6c3e5642f8
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
3 years ago
09dc33022c
Add client setting for vehicle naming scheme
3 years ago
43980639de
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
3 years ago
c6fd6cfd15
Fix: tell the user if a font fails to load and fallback is about to be used
...
Additionally, tell exactly why the font failed to load, which
glyph was missing from the font. This hopefully helps the user
a bit more in the right direction.
3 years ago
98400974a9
Codechange: nobody was using "str" parameter, so remove it
3 years ago
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
3 years ago
3088d41ac8
Feature: new velocity unit "tiles/day" ( #8278 )
...
(cherry picked from commit b1cf79da5b
4 years ago
024a3f6259
Codechange: Use automatic memory management for language pack reading.
4 years ago
f3326d34e7
Codechange: Use std::string in FIO search path handling.
4 years ago
ca65f19b03
Feature: Show group name as part of the default vehicle name.
...
Only if the vehicle is member of a group and does not have a user defined name.
4 years ago
b1cf79da5b
Feature: new velocity unit "tiles/day" ( #8278 )
4 years ago
270a748b64
Tracerestrict: Add time/date conditional
4 years ago
817bc44a3e
Initial implementation of tracerestrict counter mechanism
4 years ago
f5e9805b10
Store time display settings both in savegame and client, add setting
4 years ago
f8d6e781ba
Merge branch 'master' into jgrpp
...
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
4 years ago
63ccb36ef3
Codechange: Use std::string for most of the user-settable custom names.
4 years ago
09b13dd484
Add conditional orders for cargo load percentage and waiting cargo amount
...
See: #90
4 years ago
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
6562937899
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/console_cmds.cpp
# src/script/api/script_order.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/town_gui.cpp
5 years ago
8cccb158e9
Fix #7672 : more than 32 resolutions may be available
5 years ago
dbc5f1baed
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.cpp
5 years ago
d2ed426077
Codechange: [Win32] Pass a native GDI font description around when we have one, instead of repeatedly guessing the font.
5 years ago
2675762ae9
Add: [Win32] GDI engine for font glyph rendering as a replacement for including FreeType.
...
Building with FreeType is still possible and will take precedence over the GDI renderer, but
the project files don't include FreeType anymore by default. Combining GDI rendering with ICU
text layout is untested.
5 years ago
bd2fdde759
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
5 years ago
8899272614
Codechange: use std::vector for _language_dropdown
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
427d9d483f
Fix #6564 : enforce types of arguments for station name strings ( #7419 )
5 years ago
e453572b6a
Codechange: Initialise a few variables that -flto seems to think could possibly be uninitialised
5 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
5 years ago
af7d9020a1
Codechange: Use override specifer for overriding member declarations
...
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.
Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
5 years ago
e3c639a09f
Remove: ENABLE_NETWORK switch
...
This switch has been a pain for years. Often disabling broke
compilation, as no developer compiles OpenTTD without, neither do
any of our official binaries.
Additionaly, it has grown so hugely in our codebase, that it
clearly shows that the current solution was a poor one. 350+
instances of "#ifdef ENABLE_NETWORK" were in the code, of which
only ~30 in the networking code itself. The rest were all around
the code to do the right thing, from GUI to NewGRF.
A more proper solution would be to stub all the functions, and
make sure the rest of the code can simply assume network is
available. This was also partially done, and most variables were
correct if networking was disabled. Despite that, often the #ifdefs
were still used.
With the recent removal of DOS, there is also no platform anymore
which we support where networking isn't working out-of-the-box.
All in all, it is time to remove the ENABLE_NETWORK switch. No
replacement is planned, but if you feel we really need this option,
we welcome any Pull Request which implements this in a way that
doesn't crawl through the code like this diff shows we used to.
5 years ago
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
5 years ago
36105841b9
Codechange: ICU_SORT is in reality ICU_I18N (according to their CMake files)
...
By naming it in a different way, things get a bit confusing.
Especially if we are switching to CMake, which autodetects these
things, we need to use the name the authors of ICU gave it; not
our interpertation of that name.
5 years ago
52d7e7d45e
Codechange: ICU_LAYOUT is in reality ICU_LX (according to their CMake files)
...
By naming it in a different way, things get a bit confusing.
Especially if we are switching to CMake, which autodetects these
things, we need to use the name the authors of ICU gave it; not
our interpertation of that name.
5 years ago
7ff252c58d
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
5 years ago
63fe6c6598
Codechange: Make std::stack use std::vector container in string formatting/drawing. ( #7305 )
...
This is a very minor performance increase which can add up during operations such
as sorting. Performance impact my be platform/compiler dependent.
5 years ago
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
6 years ago
2003a86932
Merge remote-tracking branch 'origin/master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
32ce1ce347
Add: [OSX] Text layout using the native CoreText API.
...
By default, the native API will be used instead of ICU, but if ICU is
forced in using configure, it will take precedence.
6 years ago
8d7cd6a526
Add: [OSX] Native natural sort implementation.
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
e0c0394e37
Fix: Remove various dead or unnecessary assignments
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
f59535c0b7
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
60cc1a48ac
Refresh trace restrict slots window as with the train list window
6 years ago
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
11ab3c4ea2
Change: Increase cargo type limit to 64.
6 years ago
b48a6ef368
Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""
...
This reverts commit ca4a4869a2
6 years ago
ca4a4869a2
Revert "Add: [Win32] Uniscribe configure options for MinGW targets."
...
Revert "Change: [Win32] Use Uniscribe instead of ICU for text caret handling."
Revert "Change: [Win32/MSVC] Make the Uniscribe text layouter the windows default and remove usage of the deprecated ICU layout libs."
Revert "Add: [Win32] Text layout using the native Windows Uniscribe library."
Revert "Codechange: Move ParagraphLayouter-specific functions into factory classes instead of relying on overloads."
Revert "Add: [Win32] Native natural sort implementation."
This reverts commit cd966f3810eec3f4093133829dc6ab768a31bfe3a4278c302bf4394debdc#58 .
6 years ago
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
768a31bfe3
Add: [Win32] Text layout using the native Windows Uniscribe library.
...
Uniscribe is sometimes producing different results compared to ICU, especially
when RTL and LTR content is mixed. Comparing the results to other programs
(like editors or web browsers) leads me to believe that the result are at least
not worse than ICU and possibly better.
6 years ago
f4394debdc
Add: [Win32] Native natural sort implementation.
6 years ago
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
3b32075e8a
Add: {PUSH_COLOUR} and {POP_COLOUR} control codes to handle switching colours. ( #6737 )
...
This replaces the internal SCC_PREVIOUS_COLOUR swap.
6 years ago
9175c349da
Fix #6465 : Add {NORMAL_FONT} and {MONO_FONT} control codes to GS strings ( #6726 )
6 years ago
19076c24c1
Fix #6690 : Compilation with ICU 61
6 years ago
ee169c4455
Fix numerical/signed overflow when using high day lengths
...
Bug reported at day length = 125
7 years ago
b8328ad21f
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/vehiclelist.cpp
# src/window_type.h
7 years ago
6417fb16c3
Initial implementation of trace restrict slots
7 years ago
688ee9ac11
Add string control code to consume an argument.
7 years ago
58d8a791e4
Merge branch 'save_ext' into tracerestrict-sx
7 years ago
a6168dd2f0
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/company_sl.cpp
7 years ago
2bb80d280c
(svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k.
7 years ago
ce32ca4dc6
(svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k.
7 years ago
a56e2bccd0
(svn r27756) -Codechange: Add StringTab enum
7 years ago
49b940f69c
(svn r27756) -Codechange: Add StringTab enum
7 years ago
9ad09627ad
(svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs.
7 years ago
02967c3c08
(svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs.
7 years ago
f5212b27e4
Add a DECIMAL1 string code, which is DECIMAL with a fixed param of 1.
8 years ago
162e495cc9
Merge branch 'save_ext' into tracerestrict-sx
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/extended_ver_sl.cpp
8 years ago
7b56097f50
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# src/linkgraph/demands.cpp
# src/linkgraph/mcf.cpp
# src/linkgraph/refresh.cpp
# src/linkgraph/refresh.h
# src/smallmap_gui.cpp
8 years ago
f0fee802a9
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/settings_gui.cpp
# src/settings_type.h
# src/table/settings.ini
# src/vehicle_gui.cpp
8 years ago
8ec1b2200e
Change tracerestrict weight ratio properties to use decimals, and the weight unit.
...
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
8 years ago
80e3af6bf5
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
8 years ago
2c6f74a982
Move header definition for unit conversion functions to own header.
8 years ago
b5531975da
Add train weight, power, and max TE tracerestrict conditionals.
...
Minor refactorings.
8 years ago
d874cef678
(svn r27602) -Fix [FS#6481]: Compilation with --disable-network. (Deranged)
8 years ago
5973140ac2
(svn r27602) -Fix [FS#6481]: Compilation with --disable-network. (Deranged)
8 years ago
f81b252386
Fix statusbar date when time in minutes and show date with time are both on.
9 years ago
29809f2001
Time in minutes is no longer scaled by day length.
...
Time in minutes now based on the existing date ticks * the day length,
plus the tick skip counter, instead of just the date ticks.
Change the format of the {DATE_WALLCLOCK_*} string params
to use date ticks scaled by the day length, as above.
Update status bar clock.
9 years ago
19764bb4fb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
9 years ago
2b8bb12d62
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
69fac508c3
(svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n)
9 years ago
ee700fd3b1
(svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n)
9 years ago
526cb42608
Merge branch 'master' into depature-boards
...
Conflicts:
src/table/strgen_tables.h
9 years ago
79138de1b9
Import departure boards patch
9 years ago
a41f197379
(svn r27288) -Fix: Slow network content GUI in MSVC Debug builds due to repeated string resolving.
9 years ago
95cb7c8692
(svn r27288) -Fix: Slow network content GUI in MSVC Debug builds due to repeated string resolving.
9 years ago
978d4e4eaa
(svn r27102) -Fix [FS#6194]: money values would end up wrong in strings when outside of the bounds of a 32 bits integer
10 years ago
730773f5f1
(svn r27102) -Fix [FS#6194]: money values would end up wrong in strings when outside of the bounds of a 32 bits integer
10 years ago
e4063cb6d4
(svn r27063) -Fix [FS#6172]: Some lists did not use natural string sorting.
10 years ago
861b9bc85e
(svn r27063) -Fix [FS#6172]: Some lists did not use natural string sorting.
10 years ago
213b0613c7
(svn r26733) -Fix [FS#6086]: inconsistency in using spaces between number and unit in some strings
...
Try to follow the SI recommendation to use a non-breaking space between a number and its units (and prefix)
10 years ago
53e7138a2e
(svn r26733) -Fix [FS#6086]: inconsistency in using spaces between number and unit in some strings
...
Try to follow the SI recommendation to use a non-breaking space between a number and its units (and prefix)
10 years ago
9a64e4b43e
(svn r26657) -Add [FS#6047]: Days in dates are not represented by ordinal numbers in all languages
10 years ago
42bc994cce
(svn r26657) -Add [FS#6047]: Days in dates are not represented by ordinal numbers in all languages
10 years ago
9430dfe7fa
(svn r26525) -Remove: Screenshot format setting from GUI.
10 years ago
ebd2d3ccef
(svn r26525) -Remove: Screenshot format setting from GUI.
10 years ago
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
5c7c2445d8
(svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay
10 years ago
21f991e235
(svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay
10 years ago
6ecc602050
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
5b82822c12
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
bc53bbb8b6
(svn r26242) -Codechange: Use GRFFile that filled the TextRefStack to translate StringIDs from the TextRefStack, instead of passing stuff via global vars.
11 years ago
4f419b8f84
(svn r26242) -Codechange: Use GRFFile that filled the TextRefStack to translate StringIDs from the TextRefStack, instead of passing stuff via global vars.
11 years ago
9215fd3c96
(svn r26239) -Fix: Check that there is space left in the string parameter array, before pushing NewGRF parameters to it.
11 years ago
477c15383d
(svn r26239) -Fix: Check that there is space left in the string parameter array, before pushing NewGRF parameters to it.
11 years ago
68c8aa93cd
(svn r26238) -Codechange: Use StringParameters::GetDataLeft to check for left space in the param array.
11 years ago
5ab39cc651
(svn r26238) -Codechange: Use StringParameters::GetDataLeft to check for left space in the param array.
11 years ago
cb6aee2f27
(svn r26237) -Cleanup: Remove unused SCC_STRING_ID.
11 years ago
bc86bf9b12
(svn r26237) -Cleanup: Remove unused SCC_STRING_ID.
11 years ago
fcd6bf6342
(svn r26063) -Fix (r26062): a few tabs too much
11 years ago
3bae1522c9
(svn r26063) -Fix (r26062): a few tabs too much
11 years ago
54ecaa1290
(svn r26062) -Fix: beef up checks against invalid data in highscore and language files
11 years ago
3b2a92ea97
(svn r26062) -Fix: beef up checks against invalid data in highscore and language files
11 years ago
02af2aa10e
(svn r26041) -Fix: make variable initialization more obvious for humans and compilers.
11 years ago
8852d63711
(svn r26041) -Fix: make variable initialization more obvious for humans and compilers.
11 years ago
565ad16fc4
(svn r26007) -Change: make handling strings coming from game scripts slightly more lenient, i.e. less 'fatal error... must quit'
11 years ago
a25ecfd982
(svn r26007) -Change: make handling strings coming from game scripts slightly more lenient, i.e. less 'fatal error... must quit'
11 years ago
1b9e91534f
(svn r26006) -Fix [FS#5804]: Game script showing vehicle on a story book, then the vehicle being removed and eventually being replaced by a non-user vehicle (most likely smoke) causing an assertion to trigger
11 years ago
d7af679fd6
(svn r26006) -Fix [FS#5804]: Game script showing vehicle on a story book, then the vehicle being removed and eventually being replaced by a non-user vehicle (most likely smoke) causing an assertion to trigger
11 years ago
1cf6dad8f2
(svn r25508) -Change: split unit localisation choice into a choice per type of unit, and move it to the advanced settings
...
-Feature [FS#5482]: have tractive effort in imperial (lbf) and metric (kgf) units
-Feature: have weights and volumes in imperial units (short tons, gallons)
11 years ago
f9c9ff6ec3
(svn r25508) -Change: split unit localisation choice into a choice per type of unit, and move it to the advanced settings
...
-Feature [FS#5482]: have tractive effort in imperial (lbf) and metric (kgf) units
-Feature: have weights and volumes in imperial units (short tons, gallons)
11 years ago
2771de7f34
(svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it
11 years ago
7c0f34130c
(svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it
11 years ago
44d584f84a
(svn r25437) -Codechange: rework the FreeTypeSettings structure to make it better grouped
11 years ago
94a5fe6b92
(svn r25437) -Codechange: rework the FreeTypeSettings structure to make it better grouped
11 years ago
d99113bd00
(svn r25436) -Codechange: split the font detection code out of the font caching code
11 years ago
13c450a66b
(svn r25436) -Codechange: split the font detection code out of the font caching code
11 years ago
81e810a4f5
(svn r25314) -Fix (r25313): If '0' is the broadest digit, 0 * sum(10^i, i=0..(n-1)) is not the broadest n-digit number.
...
-Fix [FS#5562]: Proper size-estimation for numbers with n digits.
11 years ago
4261b6cc82
(svn r25314) -Fix (r25313): If '0' is the broadest digit, 0 * sum(10^i, i=0..(n-1)) is not the broadest n-digit number.
...
-Fix [FS#5562]: Proper size-estimation for numbers with n digits.
11 years ago
ddf817e8f3
(svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them.
11 years ago
ce110eed32
(svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them.
11 years ago
3a6db3e216
(svn r25078) -Add: New plural form to be used by Scottish Gaelic (1,11; 2,12; 3..10, 13..19; other)
11 years ago
3c2d8cc28d
(svn r25078) -Add: New plural form to be used by Scottish Gaelic (1,11; 2,12; 3..10, 13..19; other)
11 years ago
3190290de7
(svn r24981) -Fix: handle corner case where an encoded string contains too many parameters more gracefully
12 years ago
bb225ae39e
(svn r24981) -Fix: handle corner case where an encoded string contains too many parameters more gracefully
12 years ago
bdbfeedd59
(svn r24980) -Fix: memory leak in corner case of handling encoded strings
12 years ago
b9b34bc898
(svn r24980) -Fix: memory leak in corner case of handling encoded strings
12 years ago
7c81c9111c
(svn r24915) -Fix: Several out-of-bounds reads
12 years ago
3a3162865b
(svn r24915) -Fix: Several out-of-bounds reads
12 years ago
2655984a5d
(svn r24910) -Fix: [strgen] Description of plural form 3 was incorrect.
12 years ago
fea76bbb78
(svn r24910) -Fix: [strgen] Description of plural form 3 was incorrect.
12 years ago
56b26f2927
(svn r24909) -Codechange: Remove implicit bool -> integer conversion.
12 years ago
28f22a46bc
(svn r24909) -Codechange: Remove implicit bool -> integer conversion.
12 years ago
03e088c58b
(svn r24908) -Fix [FS#5419]: Allow GSs to pass negative integer string parameters (frosch123)
12 years ago
07ffc90bf4
(svn r24908) -Fix [FS#5419]: Allow GSs to pass negative integer string parameters (frosch123)
12 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
eb20798aae
(svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations.
12 years ago
b533523258
(svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations.
12 years ago
c0462c034e
(svn r24593) -Fix [FS#5333]: crash when a gamescript provided too many parameters to a GSText object
12 years ago
2f042ea198
(svn r24593) -Fix [FS#5333]: crash when a gamescript provided too many parameters to a GSText object
12 years ago
d14e71cce2
(svn r24523) -Fix: The gender of an industry name is defined by the industry-type part of the name, not by the town-name part, even if it comes first.
12 years ago
bd17361817
(svn r24523) -Fix: The gender of an industry name is defined by the industry-type part of the name, not by the town-name part, even if it comes first.
12 years ago
aee89afb55
(svn r24522) -Codechange: Rename _keep_gender_data to _scan_for_gender_data to reflect what it intends to do instead of what it does.
12 years ago
c7a536a6d8
(svn r24522) -Codechange: Rename _keep_gender_data to _scan_for_gender_data to reflect what it intends to do instead of what it does.
12 years ago
e1d7b6ec5c
(svn r24373) -Codechange: Improve descriptions of plural forms.
12 years ago
2ef319d0fe
(svn r24373) -Codechange: Improve descriptions of plural forms.
12 years ago
b1eb9573c8
(svn r24022) -Add: CARGO_LIST control code for strings
12 years ago
19923e81f9
(svn r24022) -Add: CARGO_LIST control code for strings
12 years ago
f3f94d1a12
(svn r23995) -Fix [FS#5079]: Improve rounding when converting display speeds to internal speeds.
12 years ago
89daed858b
(svn r23995) -Fix [FS#5079]: Improve rounding when converting display speeds to internal speeds.
12 years ago
b1471b4ec2
(svn r23945) -Fix: Better rounding when converting internal speed to displayed speed.
13 years ago
76344163c7
(svn r23945) -Fix: Better rounding when converting internal speed to displayed speed.
13 years ago
bb9b240a86
(svn r23941) -Add: support for clang
13 years ago
b5525fd33d
(svn r23941) -Add: support for clang
13 years ago
491aee463f
(svn r23830) -Revert (r23804) [FS#4986]: while the idea was good, it causes too much trouble
13 years ago
f917ac0a0f
(svn r23830) -Revert (r23804) [FS#4986]: while the idea was good, it causes too much trouble
13 years ago
624f916468
(svn r23805) -Add: {STRING6} and {STRING7}.
13 years ago
0011f9ce45
(svn r23805) -Add: {STRING6} and {STRING7}.
13 years ago
215447b4e8
(svn r23804) -Fix: [NewGRF] Make string code 80 more secure by not crashing when it's used in strings where it's not supposed to be used
13 years ago
15292fa080
(svn r23804) -Fix: [NewGRF] Make string code 80 more secure by not crashing when it's used in strings where it's not supposed to be used
13 years ago
0982dbf329
(svn r23782) -Fix [FS#4965]: crash due to genders used for station name in hangar string of Italian translation
13 years ago
f33f9b3920
(svn r23782) -Fix [FS#4965]: crash due to genders used for station name in hangar string of Italian translation
13 years ago
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
cf54bc425f
(svn r23706) -Codechange: prevent 'unknown command' doxygen errors
13 years ago
bcd3f2bb59
(svn r23706) -Codechange: prevent 'unknown command' doxygen errors
13 years ago
06597e684c
(svn r23704) -Doc: Doxygen comment fixes and additions.
13 years ago
4af8c2d5e1
(svn r23704) -Doc: Doxygen comment fixes and additions.
13 years ago
9d7aec3fe7
(svn r23644) -Fix [FS#4899]: prevent game scripts using StringIDs that are not coming from themselves, so the game script doesn't "accidentally" try to display an invalid string or try to display a town name in from an unknown town name generator
13 years ago
c02aabf1b8
(svn r23644) -Fix [FS#4899]: prevent game scripts using StringIDs that are not coming from themselves, so the game script doesn't "accidentally" try to display an invalid string or try to display a town name in from an unknown town name generator
13 years ago
8ac2d13c79
(svn r23636) -Add: introduce ScriptText in parameters where it can be used
13 years ago
102f811d02
(svn r23636) -Add: introduce ScriptText in parameters where it can be used
13 years ago
8bff646cf2
(svn r23635) -Add: introduce GSText, to allow translating GameScript text, even over network
13 years ago
b0ac529a6f
(svn r23635) -Add: introduce GSText, to allow translating GameScript text, even over network
13 years ago
f1f0776efd
(svn r23634) -Add: support language files for GameScript (Rubidium)
13 years ago
2ae87e7213
(svn r23634) -Add: support language files for GameScript (Rubidium)
13 years ago
e881e67b95
(svn r23598) -Fix: harden FormatString against abuse
13 years ago
f8203f09ca
(svn r23598) -Fix: harden FormatString against abuse
13 years ago
0331d3763e
(svn r23585) -Codechange: replace some magic numbers with less magic constants
13 years ago
50b63c5870
(svn r23585) -Codechange: replace some magic numbers with less magic constants
13 years ago
87045ae4ee
(svn r23478) -Codechange: add a method to copy string parameters *and* its raw strings
13 years ago
c06a3555fb
(svn r23478) -Codechange: add a method to copy string parameters *and* its raw strings
13 years ago
9aab2dc861
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
58423b26d1
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
30eee4db4e
(svn r23472) -Fix [FS#4877]: the monospace font broke the bootstrap GUI's ability to find a font
13 years ago
ebb3ad33ff
(svn r23472) -Fix [FS#4877]: the monospace font broke the bootstrap GUI's ability to find a font
13 years ago
71a040776a
(svn r23297) -Add: {CARGO_TINY} (Rubidium)
13 years ago
4e09cde649
(svn r23297) -Add: {CARGO_TINY} (Rubidium)
13 years ago
e82325e5c6
(svn r23276) -Codechange: add the answer for the question whether we're looking for monospace fonts in the searcher
13 years ago
462b875b4a
(svn r23276) -Codechange: add the answer for the question whether we're looking for monospace fonts in the searcher
13 years ago
17db686187
(svn r23275) -Codechange: allow loading of the monospace (freetype) font at another moment than the other fonts
13 years ago
9512838a5e
(svn r23275) -Codechange: allow loading of the monospace (freetype) font at another moment than the other fonts
13 years ago
1713d1ad3e
(svn r23273) -Codechange: allow passing a MissingGlyphSearcher to CheckForMissingGlyphs (default to the language pack strings)
13 years ago
0a4a75b0af
(svn r23273) -Codechange: allow passing a MissingGlyphSearcher to CheckForMissingGlyphs (default to the language pack strings)
13 years ago
c2ea904860
(svn r23271) -Codechange: don't repeatedly initialise and free the freetype library
13 years ago
542c61397c
(svn r23271) -Codechange: don't repeatedly initialise and free the freetype library
13 years ago
7f1f23a766
(svn r23270) -Fix (r23267): compile failure without freetype
13 years ago
5638eaa307
(svn r23270) -Fix (r23267): compile failure without freetype
13 years ago
c591589818
(svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent
13 years ago
b8866be093
(svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent
13 years ago
2ce44dc201
(svn r23267) -Codechange: unify the font name setting of the font cache
13 years ago
4e1c4f9079
(svn r23267) -Codechange: unify the font name setting of the font cache
13 years ago
e3905eecbb
(svn r23265) -Codechange: replace the setfallbackfont callback function with a class to call back
13 years ago
glx22
Peter Nelson
Jonathan G Rennison
frosch
Patric Stout
TELK
Nicolae Crefelean
Niels Martin Hansen
milek7
Michael Lutz
Charles Pigott
jostephd
stormcone
S. D. Cloudt
Henry Wilson
glx22
PeterN
Pavel Stupnikov
michi_cc
rubidium
patch-import
planetmaker
fonsinchen
smatz
zuu
yexo
alberth