Jonathan G Rennison
|
ae9b416684
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/ai/ai_instance.cpp
# src/console_cmds.cpp
# src/engine_type.h
# src/game/game_gui.cpp
# src/game/game_instance.cpp
# src/goal.cpp
# src/goal_cmd.h
# src/lang/english.txt
# src/lang/estonian.txt
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_generic.h
# src/openttd.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_map.h
# src/strings.cpp
# src/table/settings/difficulty_settings.ini
# src/table/settings/gui_settings.ini
# src/tbtr_template_gui_main.h
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/water_cmd.cpp
|
2023-02-11 23:05:22 +00:00 |
|
glx22
|
b080f24bd8
|
Codechange: move windows common to AI and GS out of ai_gui
|
2023-02-05 19:27:25 +01:00 |
|
rubidium42
|
55a11710a6
|
Codechange: convert printf DEBUG statements to fmt Debug statements
|
2021-06-13 12:45:45 +02:00 |
|
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
2019-11-10 17:59:20 +00:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
rubidium
|
9ed12b0f07
|
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
|
2014-04-25 15:40:32 +00:00 |
|
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
|
2014-04-23 20:13:33 +00:00 |
|
truebrain
|
cc3f42794d
|
(svn r23632) -Add: GSCompanyMode, to change company in GameScripts
|
2011-12-19 21:05:25 +00:00 |
|
truebrain
|
a8b22e5292
|
(svn r23386) -Fix: debug script related events to 'script' (removes 'ai')
|
2011-12-01 12:04:10 +00:00 |
|
truebrain
|
98103121d4
|
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
|
2011-11-29 23:15:35 +00:00 |
|
truebrain
|
afdb67a353
|
(svn r23354) -Codechange: move all src/ai/api/ai_*.[hc]pp files to src/script/api/script_* (Rubidium)
|
2011-11-29 23:07:38 +00:00 |
|