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
4 months ago
49db7bbe08
Change: add vcpkg.json to instruct vcpkg what dependencies we require
...
This works on all OSes, making it far simpler for any developer
to jump in. Just install vcpkg, run "vcpkg install" in our root,
and you have all the dependencies.
4 months ago
43980639de
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
3 years ago
d6c54e7eef
Fix: [Git] ignore any build folder you might have
...
Instructions now suggest using build-host, etc. It is easier to
just ignore all build* folders.
3 years ago
7467051331
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# src/network/network_server.cpp
# src/vehicle_gui.cpp
4 years ago
db0bf20fbb
Fix: ignore more things
4 years ago
c434387794
Fix: Adjust .gitignore to CMake build system.
4 years ago
37e682cb07
gitignore: Add build directories
4 years ago
56d54cf60e
Add: introduce CMake for project management
...
CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.
Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.
This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.
Addtiionally, this heavily improves our detection of libraries, etc.
4 years ago
a67ee02529
Change: Heading for 1.10 now ( #7319 )
5 years ago
bd18951db1
Codechange: a .aps is created by MSVC when opening a .rc, so ignore it
6 years ago
c6eb633d18
(svn r27988) -Codechange: Extent hg- and gitignore for .vs
6 years ago
a04076ba41
(svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88)
7 years ago
5e728da075
(svn r27792) -Add: [Win32] .gitignore for IntelliSense database of VS2015 Update 2.
7 years ago
1aedadb49b
(svn r27730) -Change: Split openttd.grf into openttd.grf and orig_extra.grf
...
openttd.grf is now always loaded and provides all extra graphics in case the (possibly outdated) baseset does not.
orig_extra.grf contains graphics specific to the original baseset only.
7 years ago
dd502e1448
(svn r23656) -Fix: make all vcs ignore docs/gamedocs/ just like docs/aidocs/
13 years ago
79b82b56a8
(svn r23220) -Change: move the baseset files to their new location
13 years ago
dfb0a2c9a5
(svn r20305) -Change: reduce OpenTTD's install size by roughly 460 KiB by only providing the "extra" base graphics in one palette and doing the conversion upon loading; the conversion has existed for a while, but now the NewGRF can tell its palette using Action 14 thus it can enable the conversion for only that NewGRF.
14 years ago
642b463dfd
(svn r20033) -Fix: gitignore and hgignore had more missing/wrong entries.
14 years ago
4e8751d4c3
(svn r20031) -Fix: git and hg didn't ignore the generated windows RC file.
14 years ago
64b46751d2
(svn r14627) -Change: update .gitignore and add .hgignore to ignore all generated files.
16 years ago
f5d72cc84c
(svn r11890) -Change: ignore some files for git too. Patch by bruce89.
17 years ago
Jonathan G Rennison
Patric Stout
glx22
frosch
frosch
michi_cc
yexo
rubidium