Commit Graph

97 Commits (5b7d1f7f8074a5f5f038cdf229176eaf9525d2db)

Author SHA1 Message Date
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
6 years ago
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.
6 years ago
Jonathan G Rennison ec302b8531 Adjust bundle path of data/ dir on OSX DMG 6 years ago
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
6 years ago
Patric Stout 52a66e4dd3 Fix 192770e6da: not all REV instances were renamed to VERSION 6 years ago
Jonathan G Rennison 50c9af503e Makefile: Fix data dir not being created in `make install` target 6 years ago
Jonathan G Rennison 1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 7 years ago
Ricardo N Feliciano e8de33a61f Cleanup: Use new filename for README file. (#6738) 7 years ago
frosch 192770e6da Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'. 7 years ago
Jonathan G Rennison 4c0423d6d8 Merge branch 'master' into jgrpp 8 years ago
rubidium 9a05a688a7 (svn r27558) -Fix: force sorting to be locale independent, so files are always ordered the same and by that token better diff-able 8 years ago
rubidium 6da8fede43 (svn r27558) -Fix: force sorting to be locale independent, so files are always ordered the same and by that token better diff-able 8 years ago
Jonathan G Rennison 73367d7209 build: include win32/win64 in output bundle name for mingw target. 9 years ago
Jonathan G Rennison a286096f63 Add readme and changelog to bundle/install target. 9 years ago
Jonathan G Rennison 531956bb4d Merge branch 'house_placing' into jgrpp 9 years ago
planetmaker 8fbcc2b45c (svn r27399) -Fix: [Makefile] game script directory and compat*.nut were never installed on *nix 9 years ago
planetmaker e4c3db0c6a (svn r27399) -Fix: [Makefile] game script directory and compat*.nut were never installed on *nix 9 years ago
Jonathan G Rennison 427808dfbe Include data directory in make install target. 9 years ago
Jonathan G Rennison 46817994bf Include GRFs in bundle output. 9 years ago
matthijs e25844cdf2 (svn r25780) -Change: [DOS] Put cwsdpmi and exe2coff files in subdirectories.
- Since these are different components, distributed under a different
    license, mixing them in the same directory is confusing.
11 years ago
matthijs 4e0a0db81b (svn r25780) -Change: [DOS] Put cwsdpmi and exe2coff files in subdirectories.
- Since these are different components, distributed under a different
    license, mixing them in the same directory is confusing.
11 years ago
frosch ba8d5d662c (svn r24892) -Fix (r24890): Missing mkdir 12 years ago
frosch 002337b6b1 (svn r24892) -Fix (r24890): Missing mkdir 12 years ago
zuu 2e4f470f1a (svn r24890) -Fix: Distribute GS compat_<version>.nut with OpenTTD 12 years ago
zuu e99f312766 (svn r24890) -Fix: Distribute GS compat_<version>.nut with OpenTTD 12 years ago
planetmaker 8259649381 (svn r24569) -Fix (r23817): Naming of bundles was somewhat broken 12 years ago
planetmaker 57d452df50 (svn r24569) -Fix (r23817): Naming of bundles was somewhat broken 12 years ago
rubidium c94a2d5289 (svn r24257) -Fix [FS#5112]: update some outdated documentation and make is somewhat more consistent 13 years ago
rubidium da6b84e779 (svn r24257) -Fix [FS#5112]: update some outdated documentation and make is somewhat more consistent 13 years ago
rubidium 1e817ae241 (svn r24100) -Fix: also provide translated comments in the desktop file without language name postfix 13 years ago
rubidium c7bce8e460 (svn r24100) -Fix: also provide translated comments in the desktop file without language name postfix 13 years ago
rubidium 79b82b56a8 (svn r23220) -Change: move the baseset files to their new location 13 years ago
rubidium 57afd9e9e8 (svn r23220) -Change: move the baseset files to their new location 13 years ago
rubidium bffa93a4e9 (svn r22910) -Fix [FS#4617]: icon would (almost) never be shown for SDL builds 13 years ago
rubidium 696e4eec2d (svn r22910) -Fix [FS#4617]: icon would (almost) never be shown for SDL builds 13 years ago
rubidium bedcbfe2ba (svn r21042) -Change: make it possible to make .tar.xz bundles 14 years ago
rubidium 90080e9586 (svn r21042) -Change: make it possible to make .tar.xz bundles 14 years ago
rubidium 9e35e80aa1 (svn r20999) -Change: Add installing options or rather options to not install certain documentation, in a similar way to GRFCodec/catcodec 14 years ago
rubidium 03aa88ba7c (svn r20999) -Change: Add installing options or rather options to not install certain documentation, in a similar way to GRFCodec/catcodec 14 years ago
rubidium fba7ce392d (svn r20590) -Fix: only unix2dos text files when generating the Windows installer 14 years ago
rubidium a27c25749f (svn r20590) -Fix: only unix2dos text files when generating the Windows installer 14 years ago
rubidium 45440063b5 (svn r19884) -Feature: translatable desktop shortcut comments 15 years ago
rubidium 27e8dc1bb0 (svn r19884) -Feature: translatable desktop shortcut comments 15 years ago
yexo 33e48c63b8 (svn r18706) -Cleanup: remove docs/Manual.txt and docs/OSX_install_instructions.txt, the contents of those are already in readme.txt and they were outdated.
Add docs/obm_format.txt and docs/obs_format.txt to Makefile.bundle
Add several documentation files to the windows installer
15 years ago
yexo ec9de781a6 (svn r18706) -Cleanup: remove docs/Manual.txt and docs/OSX_install_instructions.txt, the contents of those are already in readme.txt and they were outdated.
Add docs/obm_format.txt and docs/obs_format.txt to Makefile.bundle
Add several documentation files to the windows installer
15 years ago
rubidium c93d873638 (svn r18609) -Fix (r18608): installing of obm files didn't quite happen 15 years ago
rubidium 7346ba9aef (svn r18609) -Fix (r18608): installing of obm files didn't quite happen 15 years ago
rubidium 07d2af338e (svn r17339) -Codechange: move thread related files to their own directory (like done for video, music, sound, etc) 15 years ago
rubidium 533e3da493 (svn r17339) -Codechange: move thread related files to their own directory (like done for video, music, sound, etc) 15 years ago
rubidium 402df1486e (svn r17264) -Fix (r17261): bundle making for OSX failed 15 years ago