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
2024-01-02 14:44:33 +00:00
Patric Stout
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.
2023-12-30 18:40:04 +01:00
Jonathan G Rennison
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
2021-01-29 17:45:15 +00:00
Patric Stout
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.
2020-12-15 15:46:39 +01:00
Jonathan G Rennison
7467051331
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# src/network/network_server.cpp
# src/vehicle_gui.cpp
2020-07-12 12:29:28 +01:00
glx22
db0bf20fbb
Fix: ignore more things
2020-07-10 14:48:47 +01:00
frosch
c434387794
Fix: Adjust .gitignore to CMake build system.
2020-07-10 14:48:47 +01:00
Jonathan G Rennison
37e682cb07
gitignore: Add build directories
2020-06-28 21:57:02 +01:00
Patric Stout
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.
2020-06-05 19:36:05 +02:00
frosch
a67ee02529
Change: Heading for 1.10 now ( #7319 )
2019-03-03 20:51:57 +01:00
glx
bd18951db1
Codechange: a .aps is created by MSVC when opening a .rc, so ignore it
2018-04-14 22:06:28 +02:00
frosch
c6eb633d18
(svn r27988) -Codechange: Extent hg- and gitignore for .vs
2018-03-11 13:34:28 +00:00
frosch
a04076ba41
(svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88)
2017-08-24 14:50:55 +00:00
michi_cc
5e728da075
(svn r27792) -Add: [Win32] .gitignore for IntelliSense database of VS2015 Update 2.
2017-03-13 21:56:41 +00:00
frosch
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.
2017-01-14 15:48:19 +00:00
yexo
dd502e1448
(svn r23656) -Fix: make all vcs ignore docs/gamedocs/ just like docs/aidocs/
2011-12-22 16:32:13 +00:00
rubidium
79b82b56a8
(svn r23220) -Change: move the baseset files to their new location
2011-11-14 21:38:36 +00:00
rubidium
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.
2010-08-02 15:29:31 +00:00
michi_cc
642b463dfd
(svn r20033) -Fix: gitignore and hgignore had more missing/wrong entries.
2010-06-28 19:38:27 +00:00
michi_cc
4e8751d4c3
(svn r20031) -Fix: git and hg didn't ignore the generated windows RC file.
2010-06-28 18:14:22 +00:00
rubidium
64b46751d2
(svn r14627) -Change: update .gitignore and add .hgignore to ignore all generated files.
2008-11-25 18:52:17 +00:00
rubidium
f5d72cc84c
(svn r11890) -Change: ignore some files for git too. Patch by bruce89.
2008-01-17 02:13:01 +00:00
