Jonathan G Rennison
|
42c8f50551
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows.yml
# .gitignore
# COMPILING.md
# src/company_gui.cpp
# src/date_gui.cpp
# src/engine.cpp
# src/engine_func.h
# src/fileio.cpp
# src/linkgraph/linkgraph_gui.h
# src/newgrf_debug_gui.cpp
# src/newgrf_gui.cpp
# src/order_gui.cpp
# src/osk_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/script/api/script_event_types.hpp
# src/sl/oldloader_sl.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/town_gui.cpp
# src/transparency_gui.cpp
# src/vehicle_gui.cpp
# src/widget.cpp
# src/widget_type.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_func.h
# src/widgets/dropdown_type.h
# src/widgets/group_widget.h
# src/widgets/vehicle_widget.h
# src/window.cpp
# src/window_gui.h
# src/window_type.h
|
6 months ago |
Peter Nelson
|
268e512fb8
|
Codechange: Set storage type of widget enums to WidgetID.
|
6 months ago |
Jonathan G Rennison
|
c929f7075e
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/SourceList.cmake
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/depot_base.h
# src/elrail.cpp
# src/network/core/udp.cpp
# src/network/network_admin.cpp
# src/network/network_chat_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_storage.h
# src/os/unix/crashlog_unix.cpp
# src/rail.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_cmd.cpp
# src/road_map.h
# src/saveload/labelmaps_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/sl/oldloader_sl.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/table/settings/world_settings.ini
# src/tests/test_script_admin.cpp
# src/textfile_gui.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle_gui.cpp
# src/widget.cpp
# src/window.cpp
# src/window_gui.h
# src/window_type.h
|
7 months ago |
Niels Martin Hansen
|
41de0d46f3
|
Feature: Help and manuals access window
|
9 months ago |
Jonathan G Rennison
|
7154f8859d
|
Merge tag '1.11.0-beta1' into jgrpp
# Conflicts:
# src/console_cmds.cpp
# src/gfx_func.h
# src/industry.h
# src/lang/czech.txt
# src/lang/estonian.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/slovak.txt
# src/saveload/saveload.h
# src/station_gui.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/waypoint_gui.cpp
|
3 years ago |
frosch
|
e339188ded
|
Add: a go-to-location button to the LandInfo window.
|
3 years ago |
Jonathan G Rennison
|
07c9621fcf
|
Merge branch 'master' into jgrpp
|
4 years ago |
glx
|
e0d20a44d2
|
Codechange: Use a dynamic copyright year
|
4 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
|
b3431512ee
|
Add modifier key window for toggling shift/ctrl key states using mouse
|
5 years ago |
Jonathan G Rennison
|
36eb4165b8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
|
5 years ago |
Niels Martin Hansen
|
dd35a43703
|
Codechange: Revert unnecessary indentation change
|
5 years ago |
Niels Martin Hansen
|
08284e005d
|
Fix: Automatic line breaking of the warning
|
5 years ago |
Niels Martin Hansen
|
dcb2571888
|
Add: Warn players that company passwords are not truly secure
|
5 years ago |
Jonathan G Rennison
|
8c4a3cfb64
|
Add patchpack info and website to about window.
|
7 years ago |
frosch
|
433565b98f
|
(svn r25816) -Add [FS#5748]: Toggle button for wrapping lines in the textfile GUI (LordAro)
|
11 years ago |
frosch
|
dfa0e61f25
|
(svn r25816) -Add [FS#5748]: Toggle button for wrapping lines in the textfile GUI (LordAro)
|
11 years ago |
rubidium
|
6256d64553
|
(svn r23932) -Codechange: split the NewGRF text window into its own source files
|
13 years ago |
rubidium
|
e8dbcf9043
|
(svn r23932) -Codechange: split the NewGRF text window into its own source files
|
13 years ago |
truebrain
|
32ca564bca
|
(svn r23600) -Codechange: link WC+number to a Widget, and the Widget to a Window class
|
13 years ago |
truebrain
|
bcbdc3933c
|
(svn r23600) -Codechange: link WC+number to a Widget, and the Widget to a Window class
|
13 years ago |
rubidium
|
3d605f6488
|
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
|
13 years ago |
rubidium
|
df16ebd730
|
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
|
13 years ago |
truebrain
|
c73649512b
|
(svn r23536) -Codechange: document and rename widgets to be consistent and understandable
|
13 years ago |
truebrain
|
05af1d176b
|
(svn r23536) -Codechange: document and rename widgets to be consistent and understandable
|
13 years ago |
truebrain
|
49e88dcbf0
|
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
|
13 years ago |
truebrain
|
2aa774e831
|
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
|
13 years ago |