Jonathan G Rennison
9e946d4c5d
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/command.cpp
# src/console_cmds.cpp
# src/group_gui.cpp
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/greek.txt
# src/lang/hungarian.txt
# src/lang/irish.txt
# src/lang/japanese.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.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_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/saveload/afterload.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/saveload.h
# src/script/script_instance.cpp
# src/toolbar_gui.cpp
# src/toolbar_gui.h
# src/vehicle_gui.cpp
# src/widgets/rail_widget.h
# src/widgets/vehicle_widget.h
# src/window.cpp
3 years ago
Jonathan G Rennison
faf32200cf
Merge tag '12.0-beta1' into jgrpp-beta
...
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/fios.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_coordinator.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/rev.cpp.in
# src/settings_type.h
# src/train.h
# src/train_cmd.cpp
3 years ago
Jonathan G Rennison
62afd94b47
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/company_cmd.cpp
# src/economy.cpp
# src/lang/swedish.txt
# src/network/network_command.cpp
# src/news_gui.cpp
# src/saveload/saveload.h
# src/script/api/script_list.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/sdl2_v.cpp
3 years ago
Patric Stout
394c749b6b
Change: Heading for 13 now ( #9573 )
3 years ago
Patric Stout
eca73a810c
Change: rebrand 1.12.0 to 12.0
...
One question that keeps popping up: "when do we release 2.0?".
NewGRF will force that at least 1.16 will be 2.0, but to not wait
for this, let's drop the "1." and be for ever done with that
conversation.
We are following in the footstep of giants here.
3 years ago
Rubidium
3237e97b35
Cleanup: [Script] Use nullptr instead of 0 or NULL
3 years ago
rubidium42
55a11710a6
Codechange: convert printf DEBUG statements to fmt Debug statements
3 years ago
Patric Stout
9bfa7198fd
Change: Heading for 1.12 now ( #8862 )
4 years ago
glx
47790b09a4
Codechange: Simplify CheckAPIVersion()
5 years ago
glx
2f264f2c92
Change: Heading for 1.11 now
5 years ago
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
frosch
a67ee02529
Change: Heading for 1.10 now ( #7319 )
6 years ago
glx
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
6 years ago
frosch
09d4735679
(svn r27993) -Change: Heading for 1.9 now
7 years ago
frosch
afcef7faa6
(svn r27780) -Update: Numbers
8 years ago
frosch
0c7c0ada78
(svn r27518) -Update: Numbers
9 years ago
frosch
8fc86bc5f5
(svn r27193) -Fix (r27192): Incomplete copy/paste.
10 years ago
frosch
6477356dd2
(svn r27192) -Change: heading for 1.6 now
10 years ago
rubidium
33ab505567
(svn r26774) -Cleanup [Squirrel]: remove _SC macro
10 years ago
rubidium
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
11 years ago
rubidium
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
11 years ago
frosch
db96a109ff
(svn r26406) -Change: heading for 1.5 now
11 years ago
rubidium
7ff6598cd2
(svn r25001) -Change: heading for 1.4 now
12 years ago
rubidium
a5cb454e94
(svn r23969) -Codechange: trunk heads to 1.3 now
13 years ago
rubidium
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
truebrain
a8b22e5292
(svn r23386) -Fix: debug script related events to 'script' (removes 'ai')
13 years ago
truebrain
4505edbd47
(svn r23365) -Codechange: move constants to a single place, to avoid duplication (and in time, different values)
13 years ago
truebrain
34d7f01ccc
(svn r23364) -Codechange: refactor AIConfig, moving it mostly to Scriptconfig
13 years ago
truebrain
e37149a1de
(svn r23362) -Codechange: refactor AIScanner, splitting it in AIScannerInfo and AIScannerLibrary
13 years ago
truebrain
d03bbdd4ac
(svn r23295) -Codechange: put ImportLibrary in AIController (and document the parameters for NoAI docs)
13 years ago
rubidium
7fd1e1df81
(svn r23198) -Codechange: introduce a free that takes const pointers so we don't need to cast to void/non-const before being able to free
13 years ago
rubidium
22afd83964
(svn r22083) -Change: trunk is heading towards 1.2 now
14 years ago
rubidium
7eba2bf4d3
(svn r21890) -Cleanup: remove some unneeded includes
14 years ago
yexo
4ec6c19d44
(svn r21697) -Codechange: use GetGameSettings() in a few more places to enhance readability
14 years ago
rubidium
090d6fb8b7
(svn r21311) -Fix [FS#4260]: AIs in an infinite loop in e.g. autosave, but also getting settings and such from info.nut, would not be interrupted after a while causing OpenTTD to seem to not respond
14 years ago
frosch
98250ad8da
(svn r20951) -Codechange: Add SmallMap::Contains() and use it.
14 years ago
rubidium
30f2afac9b
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
14 years ago
frosch
7e5309a28a
(svn r20479) -Change: Use 'Buttons Name: Value' layout for AI and NewGRF parameter GUI.
14 years ago
yexo
6d4900ed7c
(svn r20271) -Doc: add doxygen comments to several items under src/ai/
14 years ago
rubidium
997d52fc69
(svn r19143) -Codechange: trunk's going for 1.1 now.
15 years ago
rubidium
b1bd106703
(svn r18862) -Fix [FS#3544]: don't pass AI strings through iconv
15 years ago
rubidium
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
rubidium
60082980fd
(svn r18622) -Merge: release changes
15 years ago
rubidium
73df2c7a25
(svn r18418) -Fix [FS#3298]: under some circumstances a pointer could be left untouched and then freed. Make sure this doesn't happen by ensuring it starts out as NULL instead of 'garbage'.
15 years ago
yexo
3a7da30922
(svn r17609) -Fix: the dummy AI had no API version set, causing the 'API compatibility script not found' error to be printed when loading it
15 years ago
rubidium
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
rubidium
7fb95e2c2b
(svn r17228) -Codechange: some coding style fixes
15 years ago
yexo
67106dc063
(svn r17214) -Add [NoAI]: GetAPIVersion() as optional function in info.nut. Return "0.7" to get an api compatible (as much as possible) with the 0.7 api or "0.8" to get the latest api.
...
-Change [NoAI]: move all deprecated functions to a separate squirrel script that is only loaded if an AI requests an old API version.
15 years ago
alberth
c7c422465a
(svn r16738) -Codechange: Remove casting away constness by changing the text before storing.
15 years ago