Commit Graph

207 Commits

Author SHA1 Message Date
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
2021-02-01 18:58:36 +00:00
DeltaNedas
516e863395
Cleanup: src/3rdparty/optional was removed, also remove its licensing note. (#8567) 2021-01-13 21:41:37 +01:00
Jonathan G Rennison
6c82ac2647 Version: Committing version data for tag: jgrpp-0.39.2 2020-12-29 22:59:08 +00:00
Jonathan G Rennison
18583ac3d5 Version: Committing version data for tag: jgrpp-0.39.1 2020-11-28 11:42:32 +00:00
Jonathan G Rennison
55fae045b1 Merge branch 'master' into jgrpp 2020-11-28 11:23:35 +00:00
Tyler Trahan
521f41fc10
Fix: update links to new OpenTTD wiki (#8341) 2020-11-16 14:16:21 +01:00
Jonathan G Rennison
600d556f91 Version: Committing version data for tag: jgrpp-0.39.0 2020-11-08 23:55:20 +00:00
Jonathan G Rennison
c3741ca0e9 Documentation: Add docs on AI/GS additions 2020-10-28 22:16:24 +00:00
Jonathan G Rennison
267a2763fe Version: Committing version data for tag: jgrpp-0.38.1 2020-10-21 00:55:58 +01:00
Jonathan G Rennison
98f889f0ab Documentation: Add NML documentation for non-standard NewGRF features 2020-10-19 19:45:08 +01:00
Jonathan G Rennison
a76e51c3dd Version: Committing version data for tag: jgrpp-0.38.0 2020-10-16 23:43:52 +01:00
Jonathan G Rennison
2ded309430 Version: Committing version data for tag: jgrpp-0.37.0 2020-09-22 19:34:49 +01:00
Jonathan G Rennison
7c5f09f6b6 Version: Committing version data for tag: jgrpp-0.36.0 2020-08-30 12:32:13 +01:00
Jonathan G Rennison
192f89246c Version: Committing version data for tag: jgrpp-0.35.1 2020-07-20 17:30:34 +01:00
Jonathan G Rennison
ed0bddf7f8 Version: Committing version data for tag: jgrpp-0.35.0 2020-07-12 12:59:47 +01:00
Jonathan G Rennison
c552e08ffe Version: Committing version data for tag: jgrpp-0.34.4 2020-06-05 22:03:15 +01:00
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
2020-05-21 22:24:01 +01:00
Michael Lutz
8aef14386f Add: Optional implementation of std::optional for pre-C++17 compilers.
Sourced from https://github.com/akrzemi1/Optional, Boost Software License, Version 1.0.
2020-05-21 20:02:34 +02:00
Jonathan G Rennison
1f5322de20 Version: Committing version data for tag: jgrpp-0.34.3 2020-05-14 22:22:39 +01:00
Jonathan G Rennison
562ac0cb7b Version: Committing version data for tag: jgrpp-0.34.2 2020-05-01 00:32:59 +01:00
Jonathan G Rennison
23efead74e Version: Committing version data for tag: jgrpp-0.34.1 2020-04-13 10:18:33 +01:00
Jonathan G Rennison
4b8b1f9948 Version: Committing version data for tag: jgrpp-0.34.0 2020-04-07 18:52:46 +01:00
Jonathan G Rennison
8799170455 Version: Committing version data for tag: jgrpp-0.34-rc1 2020-03-11 23:26:54 +00:00
Jonathan G Rennison
fa73e42dfd Version: Committing version data for tag: jgrpp-0.33.2 2020-02-21 21:32:05 +00:00
Jonathan G Rennison
e41c85e8ec Version: Committing version data for tag: jgrpp-0.33.1 2020-02-13 01:12:28 +00:00
Jonathan G Rennison
5d88e40568 Version: Committing version data for tag: jgrpp-0.33.0 2020-01-10 21:50:53 +00:00
Jonathan G Rennison
9df3ae5f56 Documentation: Adjust readme text 2020-01-10 21:06:30 +00:00
Jonathan G Rennison
6f75d9119d ChillPP: Add support for loading compatible linkgraph settings 2020-01-03 18:54:44 +00:00
Jonathan G Rennison
4936b3ba51 Add support for loading ChillPP v8 savegames 2020-01-03 00:08:33 +00:00
Jonathan G Rennison
d56d4ea51f Add initial support for loading JokerPP savegames
See #123
2019-12-28 13:10:32 +00:00
Jonathan G Rennison
2dd786b090 Version: Committing version data for tag: jgrpp-0.32.4 2019-12-13 21:18:12 +00:00
Jonathan G Rennison
030e8bf762 Rename programmable signals to programmable pre-signals
This is to make it less unclear what they actually are and do
2019-12-05 18:13:35 +00:00
Jonathan G Rennison
9094df9ccc Version: Committing version data for tag: jgrpp-0.32.3 2019-11-20 22:00:20 +00:00
Jonathan G Rennison
ab3a373c73 Merge branch 'master' into jgrpp 2019-11-16 19:54:31 +00:00
Andy
cfc4568ddc Doc: revised README to be more helpful to casual GitHub visitors 2019-11-13 20:40:18 +01:00
Jonathan G Rennison
7174d8e9a0 Version: Committing version data for tag: jgrpp-0.32.2 2019-11-06 17:58:40 +00:00
Jonathan G Rennison
ca3c72438e Merge branch 'master' into jgrpp
# Conflicts:
#	Makefile.bundle.in
#	src/os/macosx/string_osx.cpp
#	src/station_cmd.cpp
2019-11-06 17:49:00 +00:00
Charles Pigott
dd07b23ed3 Fix: A few places still referred to old name of COPYING and README 2019-10-28 23:52:54 +01:00
Charles Pigott
a407db54cf Add: Me 2019-10-28 23:52:54 +01:00
Jonathan G Rennison
a8657f4c40 Version: Committing version data for tag: jgrpp-0.32.1 2019-10-20 19:15:06 +01:00
Andy
e5f1755629 Doc: split compiling instructions from README, as they aren't required for casual GitHub visitors 2019-10-19 16:56:21 +01:00
Jonathan G Rennison
0876bca9b7 Version: Committing version data for tag: jgrpp-0.32.0 2019-10-12 01:23:51 +01:00
Jonathan G Rennison
edfd378e93 Merge branch 'master' into jgrpp
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
2019-10-05 21:45:54 +01:00
Charles Pigott
99f5e29484 Doc: Update list of supported compilers 2019-09-30 14:00:06 +01:00
Jonathan G Rennison
6dd1f5c22d Version: Committing version data for tag: jgrpp-0.32-rc5 2019-09-22 11:08:18 +01:00
Jonathan G Rennison
5c839ba8f3 Version: Committing version data for tag: jgrpp-0.32-rc4 2019-09-18 01:50:25 +01:00
Jonathan G Rennison
99a94f3130 Version: Committing version data for tag: jgrpp-0.32-rc3 2019-08-29 01:05:38 +01:00
Jonathan G Rennison
f825d4695e Version: Committing version data for tag: jgrpp-0.32-rc2 2019-08-24 11:03:46 +01:00
Jonathan G Rennison
04ef407ddf Merge branch 'jgrpp' into jgrpp-nrt
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
2019-08-24 10:41:08 +01:00
Jonathan G Rennison
12be6fd81f Version: Committing version data for tag: jgrpp-0.31.4 2019-08-24 10:21:17 +01:00
Jonathan G Rennison
7573260235 Version: Committing version data for tag: jgrpp-0.32-rc1 2019-07-13 20:47:54 +01:00
Jonathan G Rennison
8b1fb60dea Version: Committing version data for tag: jgrpp-0.31.3 2019-07-13 18:23:03 +01:00
Jonathan G Rennison
b634e5d6de Version: Committing version data for tag: jgrpp-0.31.2 2019-06-18 18:02:31 +01:00
Jonathan G Rennison
640a5a673b Version: Committing version data for tag: jgrpp-0.31.1 2019-05-28 20:54:15 +01:00
Jonathan G Rennison
4666b1ef81 Version: Committing version data for tag: jgrpp-0.31.0 2019-05-06 22:26:42 +01:00
Jonathan G Rennison
fb5cae3120 Version: Committing version data for tag: jgrpp-0.30.3 2019-04-12 23:27:16 +01:00
Jonathan G Rennison
ab157ea07f Version: Committing version data for tag: jgrpp-0.30.2 2019-04-11 22:02:22 +01:00
nikolas
eab8ab40d9
Fix typo in readme: sufficienty -> sufficiently 2019-04-07 23:31:17 -04:00
Jonathan G Rennison
a6887d7010 Version: Committing version data for tag: jgrpp-0.30.1 2019-04-05 01:37:21 +01:00
Jonathan G Rennison
a0c8bd2164 Version: Committing version data for tag: jgrpp-0.30.0 2019-04-03 23:57:29 +01:00
Jonathan G Rennison
43053022aa Readme: Add link to online copy of NewGRF spec additions 2019-04-01 03:16:04 +01:00
Jonathan G Rennison
ba34ec7ade Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
2019-03-27 18:12:04 +00:00
Patric Stout
72c5f2b3ee Remove: DOS support
In 10 years there was no active development on DOS. Although it
turned out to still work, the FPS was very bad. There is little
interest in the current community to look into this.

Further more, we like to switch to c++11 functions for threads,
which are not implemented by DJGPP, the only current compiler
for DOS.

Additionally, DOS is the only platform which does not support
networking. It is the reason we have tons of #ifdefs to support
disabling networking.

By removing DOS support, we can both use c++11 functions for threads,
and remove all the code related to disabling network. Sadly, this
means we have to see DOS go.

Of course, if you feel up for the task, simply revert this commit,
and implement stub c++11 functions for threads and stub functions
for networking. We are more than happy to accept such Pull Request.
2019-03-19 23:22:51 +01:00
Jonathan G Rennison
5e6d283463 Merge branch 'master' into jgrpp
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
2019-03-13 03:38:26 +00:00
Patric Stout
7adae09897 Codechange: liblzma is called liblzma, how ever strange that might be
It is the only library we use that calls itself with 'lib' in the
name. This might be confusing, but with the arrival of cmake a lot
of these things are automated. And detection will find 'liblzma',
not 'lzma', like with 'lzo', 'zlib', ..
2019-03-11 10:16:00 +01:00
Patric Stout
18b37e4b81 Fix: mention Haiku in the README, including how to build 2019-03-05 22:22:00 +01:00
Patric Stout
f58db44ff2 Remove: BeOS support (deprecated by Haiku)
In 10 years there is no commit to change how BeOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).

With the arrival of SDL2 (and removal of SDL), BeOS is no longer
support. SDL2 suggests to use Haiku instead of BeOS.
2019-03-05 22:03:00 +01:00
Patric Stout
7784d77713 Remove: MorphOS / AmigaOS support
In 10 years there is no commit to change how MorphOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).

With the arrival of SDL2 (and removal of SDL), MorphOS is no longer
support. There is an SDL2 port for MorphOS, but it is not maintained
by upstream SDL2, and nobody can currently test it out.

If anyone wants to re-add MorphOS, please do (revert this patch,
fix the problems, and create a Pull Request). If you need any help
doing so, let us know! It is not that we don't like MorphOS, it is
that we don't have anyone fixing the problems :(
2019-03-05 22:03:00 +01:00
Jonathan G Rennison
7ff252c58d Merge branch 'master' into jgrpp
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
2019-03-04 01:18:25 +00:00
Johannes E. Krause
5e40338543 Doc: table alignment when viewing README.md as a monospace textfile 2019-03-02 20:53:50 +01:00
Niels Martin Hansen
7e1e2756d4 Add: Show performance of AI and GS in framerate window 2019-02-23 14:29:07 +01:00
Jonathan G Rennison
7d57bd2621 Update readme 2019-02-23 00:04:19 +00:00
Jonathan G Rennison
ccf1fe8592 Version: Committing version data for tag: jgrpp-0.29.3 2019-02-22 22:45:12 +00:00
Jonathan G Rennison
a695dcd331 Add docs file on low-level changes 2019-02-19 18:37:52 +00:00
Jonathan G Rennison
f5728b8c48 Version: Committing version data for tag: jgrpp-0.29.2 2019-02-04 22:42:53 +00:00
Jonathan G Rennison
7bcd921871 Version: Committing version data for tag: jgrpp-0.29.1 2019-02-02 07:54:01 +00:00
Jonathan G Rennison
281d346fe2 Merge branch 'master' into jgrpp
# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
2019-01-29 02:28:14 +00:00
Niels Martin Hansen
65782af2f4 Add: Visual Studio 2019 project files 2019-01-26 14:56:35 +01:00
Jonathan G Rennison
e3d167f9f0 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
2019-01-14 00:01:44 +00:00
Andy
f99f993e99 Doc: replace 4 references to SVN with Git #6698 (#7036) 2019-01-11 13:41:12 +01:00
Jonathan G Rennison
873a58454d Version: Committing version data for tag: jgrpp-0.29.0 2019-01-02 16:58:53 +00:00
Jonathan G Rennison
4f1d54564e Merge branch 'master' into jgrpp
# Conflicts:
#	src/debug.cpp
2019-01-02 16:09:44 +00:00
Patric Stout
65bc7123d1 Update: Readme_Windows_MSVC documentation now reflects the current reality again
It was not updated for a while, and kinda out-of-date. This should
bring it back to reality.
2018-12-26 17:29:11 +01:00
glx
28ff1be85b Update: replace openttd-useful with vcpkg in README 2018-12-26 17:29:11 +01:00
Jonathan G Rennison
479a9e31e9 Version: Committing version data for tag: jgrpp-0.28.0 2018-11-22 19:56:19 +00:00
Jonathan G Rennison
c1df63a2eb Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/viewport.cpp
2018-11-19 20:51:16 +00:00
Niels Martin Hansen
68e6b5531a Update: Developer credits 2018-11-17 21:05:07 +01:00
Jonathan G Rennison
ba8ddda0bc Version: Committing version data for tag: jgrpp-0.27.1 2018-09-20 08:44:20 +01:00
Jonathan G Rennison
a39cfe1854 Version: Committing version data for tag: jgrpp-0.27.0 2018-08-29 02:49:14 +01:00
Jonathan G Rennison
292025394c Version: Committing version data for tag: jgrpp-0.26.2 2018-08-12 03:15:10 +01:00
Jonathan G Rennison
15d818facc Documentation: Add docs on NewGRF spec additions 2018-08-08 23:19:06 +01:00
Jonathan G Rennison
9774606c22 Version: Committing version data for tag: jgrpp-0.26.1 2018-08-06 02:43:34 +01:00
Jonathan G Rennison
b80c3198cc Version: Committing version data for tag: jgrpp-0.26.0 2018-07-27 08:19:38 +01:00
Jonathan G Rennison
035f5622b9 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
2018-07-24 18:30:42 +01:00
Niels Martin Hansen
2a868b9f3b Feature: Framerate display window (#6822)
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
2018-07-19 21:17:07 +02:00
Jonathan G Rennison
4d1bd8e4b4 Merge branch 'master' into jgrpp
# Conflicts:
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/music.cpp
#	src/table/settings.ini
#	src/town_cmd.cpp
#	src/train_cmd.cpp
2018-06-25 18:57:48 +01:00
Greg-21
388bca6a42 Update: Changed some things in Readme file
Changed HTTP links to HTTPS, fixed some links to articles on OpenTTD Wiki, added Windows 10 and 8.1 to info section about path structure in these OSes, removed some
unnecessary whitespaces (and added several others), and some other less important changes.
2018-06-23 15:28:55 +02:00
Jonathan G Rennison
efdbde63c8 Version: Committing version data for tag: jgrpp-0.25.2 2018-06-13 02:11:38 +01:00
Jonathan G Rennison
15f80f16c3 Version: Committing version data for tag: jgrpp-0.25.1 2018-06-08 02:35:19 +01:00
Jonathan G Rennison
f2987854c7 Merge branch 'master' into jgrpp 2018-06-08 02:20:07 +01:00