Jonathan G Rennison
|
406b81abb1
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/economy.cpp
# src/lang/traditional_chinese.txt
# src/order_gui.cpp
# src/settings.cpp
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/table/win32_settings.ini
# src/table/window_settings.ini
|
3 years ago |
rubidium42
|
08308d808c
|
Codechange: use separate pre and post callbacks for int settings
|
3 years ago |
|
Jonathan G Rennison
|
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 |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
|
Jonathan G Rennison
|
65b9a103ad
|
Initial implementation of two rail types per tile
|
6 years ago |
frosch
|
d9bfe88261
|
(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
|
8 years ago |
|
frosch
|
616c02c42e
|
(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
|
8 years ago |
|
rubidium
|
7efd7e19ed
|
(svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m].
|
14 years ago |
|
rubidium
|
ec4f688ca0
|
(svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m].
|
14 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
|
9467b7c6d6
|
(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
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
|
rubidium
|
99d46e0ad7
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
smatz
|
496b541cb1
|
(svn r15334) -Codechange: reset setting to old value when the callback procedure returns false
|
16 years ago |
|
smatz
|
e3216e4b4b
|
(svn r15334) -Codechange: reset setting to old value when the callback procedure returns false
|
16 years ago |
|
rubidium
|
923e21129c
|
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
|
16 years ago |
|
rubidium
|
e7a501100a
|
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
|
16 years ago |
|
rubidium
|
4625695653
|
(svn r13251) -Codechange: rename _patches to _settings as that is more logic.
-Codechange: move all Settings into substructs of _settings in a way that they are logically grouped.
|
16 years ago |
|
rubidium
|
dc77647ea4
|
(svn r13251) -Codechange: rename _patches to _settings as that is more logic.
-Codechange: move all Settings into substructs of _settings in a way that they are logically grouped.
|
16 years ago |
|
smatz
|
386a3f1d20
|
(svn r13016) -Codechange: unify the detection if rail catenary should be drawn
|
16 years ago |
|
smatz
|
b4968c6bea
|
(svn r13016) -Codechange: unify the detection if rail catenary should be drawn
|
16 years ago |