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
|
faa77e2605
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/script/api/script_company.cpp
# src/script/api/script_date.cpp
# src/script/api/script_date.hpp
# src/script/api/script_gamesettings.cpp
# src/script/api/script_order.hpp
# src/script/api/script_town.cpp
# src/script/api/script_window.cpp
|
2023-03-06 01:05:43 +00:00 |
|
glx22
|
ca149447d7
|
Codechange: Use SQInteger for generic numbers in script_window
|
2023-03-06 00:32:12 +01:00 |
|
Jonathan G Rennison
|
1518c2fa1e
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/depot_type.h
# src/lang/german.txt
# src/order_gui.cpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/script/api/script_window.hpp.in
# src/settings_table.cpp
# src/train_cmd.cpp
|
2022-11-05 17:19:00 +00:00 |
|
Loïc Guilloux
|
0afa6f2424
|
Codechange: [CMake] Auto-fill list of #include in script_window.hpp (#10103)
|
2022-10-24 12:35:58 +02:00 |
|
Jonathan G Rennison
|
5b78090a61
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/saveload/town_sl.cpp
# src/screenshot.h
# src/script/api/ai/ai_date.hpp.sq
# src/script/api/ai/ai_marine.hpp.sq
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_date.hpp.sq
# src/script/api/game/game_marine.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/game/game_window.hpp.sq
# src/script/api/script_window.hpp
# src/script/api/template/template_window.hpp.sq
# src/signal.cpp
# src/statusbar_gui.cpp
# src/toolbar_gui.cpp
# src/viewport.cpp
# src/viewport_func.h
|
2020-08-27 18:31:09 +01:00 |
|
glx
|
8794c61f25
|
Change: rewrote generate_widget in CMake
|
2020-07-16 00:53:26 +02:00 |
|