ead18b2af2
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/3rdparty/md5/md5.h
# src/3rdparty/squirrel/squirrel/squtils.h
# src/animated_tile.cpp
# src/console_func.h
# src/core/CMakeLists.txt
# src/core/container_func.hpp
# src/core/smallstack_type.hpp
# src/crashlog.cpp
# src/crashlog.h
# src/debug.h
# src/economy.cpp
# src/gamelog.cpp
# src/industry_gui.cpp
# src/lang/catalan.txt
# src/misc_gui.cpp
# src/network/network_content.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/newgrf_gui.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_cmd.cpp
# src/saveload/animated_tile_sl.cpp
# src/script/api/script_tilelist.cpp
# src/settings.cpp
# src/settingsgen/settingsgen.cpp
# src/sl/oldloader_sl.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen_base.cpp
# src/table/settings/gui_settings.ini
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui_base.h
# src/viewport_sprite_sorter.h
11 months ago
3323402aaa
Codechange: rename smallvec_type to container_func and use only when needed
1 year ago
68ff3fd062
Change: include fmt.h C++ headers in stdafx.h
...
This to prevent compilation issues between runs with and without precompiled
headers. Also remove the headers from the rest of the code base as they are
not needed there anymore, although they do relatively little harm.
1 year ago
81290df946
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/lang/spanish.txt
# src/network/core/tcp_content_type.h
# src/network/network_content.cpp
# src/saveload/cheat_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_internal.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/gameopt_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
3 years ago
ab9b937ab7
Codechange: [Network] Use std::string to get a NewGRF's name
3 years ago
f0c3a4b42e
Saveload: Store NewGRF name in savegame, include in missing GRF message
4 years ago
c082f570ce
Codechange: Use std::string when translating TTDP NewGRF string codes.
4 years ago
43cd892e0c
Codechange: Replace custom linked list for GRF texts with STL vectors and strings.
4 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
5 years ago
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
0d13f793f2
(svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test.
7 years ago
00e7ceeca4
(svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there.
11 years ago
ba1779b978
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
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
fab78a7bf2
(svn r23812) -Fix [FS#4977] (r23804): custom ActionB messages were broken
13 years ago
bac8ce6b41
(svn r23027) -Fix: in some cases NewGRF string arguments were popped twice from the newgrf textstack
13 years ago
7de22e25da
(svn r22970) -Fix [FS#4769]: strip newlines from NewGRF strings that should not have newlines, e.g. the NewGRF's name
13 years ago
5ea8b07e05
(svn r22630) -Cleanup: Remove SwitchToNormalRefStack() and SwitchToErrorRefStack().
13 years ago
2158f4f1bf
(svn r22628) -Codechange: Allow passing the textref stack values to use to StartTextRefStackUsage() instead of always using the temporary NewGRF registers.
13 years ago
f93c8ce5aa
(svn r22627) -Codechange: Rename PrepareTextRefStackUsage() to StartTextRefStackUsage() to make it more obvious that you must call StopTextRefStackUsage() at some point. Also extent the documentation.
13 years ago
ac0e83a7e2
(svn r21435) -Fix: NewGRF strings that referenced a value that was set by a string command later in the string failed
14 years ago
18f0f1d81d
(svn r21216) -Feature: [NewGRF] Allow specifying a "choice list" for plurals
14 years ago
ddf71db8c2
(svn r21211) -Feature: [NewGRF] Allow specifying a "choice list" for cases and genders
14 years ago
0f9c40244a
(svn r21209) -Feature: [NewGRF] Allow setting the gender of the current string or select the case of the next substring
14 years ago
0500c92003
(svn r21208) -Add: [NewGRF] Mapping information w.r.t. a translation's case and gender names
14 years ago
e84c52e662
(svn r21207) -Codechange: replace the magic 0x00DE constant with something less magic
14 years ago
4965c7dd2b
(svn r21202) -Codechange: allow strings with embedded '\0' in GRFText.
14 years ago
fc75b00992
(svn r21178) -Codechange: pass the language_id to TranslateTTDPatchCodes as well
14 years ago
d3c1be9abd
(svn r20249) -Codechange: change the newgrf name/description from a char* to a GRFText* to make translations possible
14 years ago
faf5e19aae
(svn r19569) -Fix: possible buffer underflow in newgrf string code
14 years ago
82fc28f77f
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
47bd3ee4ba
(svn r17584) -Codechange: split the NewGRF StringID mapping in a 'global' part and a part that's for NewGRF strings
15 years ago
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
eb0d43aadd
(svn r15696) -Codechange: move the NewGRF language ID into the language file instead of maintaining a table in the code.
15 years ago
799f30c663
(svn r14817) -Cleanup: unify the place where the @file header is placed
16 years ago
9ccce57438
(svn r12317) -Fix [FS#1815]: Map string IDs that are embedded from other strings.
17 years ago
fb8973c64a
(svn r12015) -Fix [FS#1716] (Revert r11422): Patch in FS#1430 avoided instead of fixed the problem. GetStringWithArgs() discards information that SCC_GENDER_LIST needs to work. Now use pointers to retrieve GRF strings, so that GetStringPtr() will work correctly. This is advantageous as now no buffer copy is made when using all GRF strings.
17 years ago
e21b7634bf
(svn r11287) -Codechange: add support for pushing paramaters into NewIndustries' error messages. Patch by Csaboka.
17 years ago
240285b8d8
(svn r11145) -Codechange: add support for "decoding" TTDPs string codes wrt to registers 0x100 to 0x10F.
17 years ago
109dd33c4a
(svn r10114) -Fix: Only load newgrf error messages if the language matches the current
...
language. Since only one error can be loaded anyway, if the language didn't
match you'd get "Undefined string". Also since we're only loading one language
there's no need to use AddGRFString any more.
17 years ago
dcd510c81f
(svn r9385) -Cleanup: doxygen changes. Today, we are exploring the letter N.
17 years ago
36bb92ae24
(svn r9050) -Codechange: Foo(void) -> Foo()
18 years ago
66bbf336c6
(svn r7759) -Merge: makefile rewrite. This merge features:
...
- A proper ./configure, so everything needs to be configured only once, not for every make.
- Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
- A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
- Proper support for OSX universal binaries.
- Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
- Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
18 years ago
Jonathan G Rennison
Rubidium
Michael Lutz
S. D. Cloudt
Henry Wilson
peter1138
frosch
yexo
smatz
maedhros
belugas