Commit Graph

115 Commits (jgrpp)

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
5 years ago
Henry Wilson af7d9020a1 Codechange: Use override specifer for overriding member declarations
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.

Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
5 years ago
Jonathan G Rennison 4f1d54564e Merge branch 'master' into jgrpp
# Conflicts:
#	src/debug.cpp
6 years ago
glx c540d72445 Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32 6 years ago
Jonathan G Rennison 8e9d68048a Merge branch 'master' into jgrpp
# Conflicts:
#	src/string.cpp
6 years ago
Niels Martin Hansen 458e441a4c Codechange: Make FioCreateDirectory public 6 years ago
Jonathan G Rennison 03b0931c57 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/debug.cpp
#	src/saveload/saveload.cpp
6 years ago
Michael Lutz ce51e54d26 Change: [Win32] Parse and load DLS files for the DirectMusic driver without relying on high-level functions. 6 years ago
Jonathan G Rennison f89e8b76d6 Fix increased number of NewGRFs support.
Improve error handling if multiplayer limit is exceeded.
7 years ago
rubidium 5c7c2445d8 (svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay 10 years ago
rubidium 21f991e235 (svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay 10 years ago
rubidium c4ab18c029 (svn r25974) -Codechange: make the _personal_dir global const, since once it's set it shouldn't be changed anyhow 11 years ago
rubidium def597fe31 (svn r25974) -Codechange: make the _personal_dir global const, since once it's set it shouldn't be changed anyhow 11 years ago
frosch 50abcf3edc (svn r24804) -Add: Separate subdirectory for screenshots. 12 years ago
frosch edd9c0553a (svn r24804) -Add: Separate subdirectory for screenshots. 12 years ago
michi_cc 1966de1a2a (svn r24417) -Codechange: [Win32] Don't needlessly include windows.h in a commonly used header. 12 years ago
michi_cc 36181b3fb2 (svn r24417) -Codechange: [Win32] Don't needlessly include windows.h in a commonly used header. 12 years ago
truebrain 14325e2391 (svn r23605) -Add: GAME_DIR and CONTENT_TYPE_GAME, and read gamescript from that directory 13 years ago
truebrain b4f832f29f (svn r23605) -Add: GAME_DIR and CONTENT_TYPE_GAME, and read gamescript from that directory 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
rubidium ffccec6d84 (svn r23234) -Fix [FS#4840]: crash when after downloading content 13 years ago
rubidium a3a2fdcfc2 (svn r23234) -Fix [FS#4840]: crash when after downloading content 13 years ago
rubidium 4d281cce97 (svn r23217) -Codechange: introduce the concept of scanning only in a limited set of sub directories 13 years ago
rubidium 6d991b3b10 (svn r23217) -Codechange: introduce the concept of scanning only in a limited set of sub directories 13 years ago
rubidium 9bf2cb0e86 (svn r23216) -Codechange: introduce the concept of having different tar lists 13 years ago
rubidium 160294ff22 (svn r23216) -Codechange: introduce the concept of having different tar lists 13 years ago
rubidium 661e5c6655 (svn r22904) -Codechange: add tar filename to file scanning 13 years ago
rubidium 414c397000 (svn r22904) -Codechange: add tar filename to file scanning 13 years ago
rubidium fb5a2f4485 (svn r22835) -Codechange: keep track of the subdirectory we are looking through in the file scanner 13 years ago
rubidium 672df52e0c (svn r22835) -Codechange: keep track of the subdirectory we are looking through in the file scanner 13 years ago
rubidium 62886dfeed (svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one 13 years ago
rubidium b4edc30c64 (svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one 13 years ago
rubidium 26788cf363 (svn r22825) -Codechange: pass subdir to FioOpenFile 13 years ago
rubidium 2a12c9df2f (svn r22825) -Codechange: pass subdir to FioOpenFile 13 years ago
rubidium c8167de1c2 (svn r22822) -Codechange: make a distinction between base sets and newgrfs for their directory 13 years ago
rubidium 0061b5f184 (svn r22822) -Codechange: make a distinction between base sets and newgrfs for their directory 13 years ago
alberth a70556dac2 (svn r22459) -Doc: Typo fixes and doxygen markup improvements. 13 years ago
alberth 28092366ec (svn r22459) -Doc: Typo fixes and doxygen markup improvements. 13 years ago
alberth 2b4da1d345 (svn r20689) -Codechange: Make some global functions used in 1 .cpp file static in that file. 14 years ago
alberth 9f5a96ead2 (svn r20689) -Codechange: Make some global functions used in 1 .cpp file static in that file. 14 years ago
rubidium c03844c22a (svn r19779) -Change: add a return type to AppendPathSeparator and use that to determine whether we could append the path separator. If not, do not recurse into that directory as the path would exceed the maximum path length 14 years ago
rubidium 08919d2747 (svn r19779) -Change: add a return type to AppendPathSeparator and use that to determine whether we could append the path separator. If not, do not recurse into that directory as the path would exceed the maximum path length 14 years ago
rubidium 2099d3ffb8 (svn r19777) -Change: use the file scanner to find the .tars 14 years ago
rubidium 948beec597 (svn r19777) -Change: use the file scanner to find the .tars 14 years ago
rubidium 04fbf762fb (svn r19262) -Feature: finalise BaNaNaS support for music sets 15 years ago
rubidium 0f6d82df7e (svn r19262) -Feature: finalise BaNaNaS support for music sets 15 years ago
glx 2e499a43a9 (svn r18029) -Fix (r18028): AppendPathSeparator() should stay global 15 years ago
glx 85a910f02e (svn r18029) -Fix (r18028): AppendPathSeparator() should stay global 15 years ago
rubidium 224f4e0197 (svn r18028) -Codechange: unglobalise some functions 15 years ago
rubidium 860b9b1cea (svn r18028) -Codechange: unglobalise some functions 15 years ago
rubidium f1f3009782 (svn r18026) -Codechange: make a lookup table static that doesn't need to be 'exported' 15 years ago
rubidium 3702746756 (svn r18026) -Codechange: make a lookup table static that doesn't need to be 'exported' 15 years ago
rubidium 99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium fb978c04b1 (svn r15606) -Codechange: make it possible to not recursively search with the file scanner (i.e. only search a single directory). 16 years ago
rubidium d1d0778a54 (svn r15606) -Codechange: make it possible to not recursively search with the file scanner (i.e. only search a single directory). 16 years ago
rubidium 72b0341ed0 (svn r15126) -Feature: downloading content from a central server (content.openttd.org) where authors can upload they NewGRFS/AI etc. This should make joining servers that use only NewGRFs that are distributed via this system easier as the players can download the NewGRFs from in the game. It should also make it easier to see whether there are updates for NewGRFs and make the necessary updates. 16 years ago
rubidium 3a13b75e37 (svn r15126) -Feature: downloading content from a central server (content.openttd.org) where authors can upload they NewGRFS/AI etc. This should make joining servers that use only NewGRFs that are distributed via this system easier as the players can download the NewGRFs from in the game. It should also make it easier to see whether there are updates for NewGRFs and make the necessary updates. 16 years ago
truebrain c2406cd42d (svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
NoAI is an API (a framework) to build your own AIs in. See:
   http://wiki.openttd.org/wiki/index.php/AI:Main_Page
 With many thanks to:
  - glx and Rubidium for their syncing, feedback and hard work
  - Yexo for his feedback, patches, and AIs which tested the system very deep
  - Morloth for his feedback and patches
  - TJIP for hosting a challenge which kept NoAI on track
  - All AI authors for testing our AI API, and all other people who helped in one way or another
-Remove: all old AIs and their cheats/hacks
16 years ago
truebrain a3dd7506d3 (svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
NoAI is an API (a framework) to build your own AIs in. See:
   http://wiki.openttd.org/wiki/index.php/AI:Main_Page
 With many thanks to:
  - glx and Rubidium for their syncing, feedback and hard work
  - Yexo for his feedback, patches, and AIs which tested the system very deep
  - Morloth for his feedback and patches
  - TJIP for hosting a challenge which kept NoAI on track
  - All AI authors for testing our AI API, and all other people who helped in one way or another
-Remove: all old AIs and their cheats/hacks
16 years ago
rubidium 9f91aacc07 (svn r14207) -Fix [FS#2262] (r14191): warning about non-virtual destructor in class with virtual functions. 16 years ago
rubidium dc2ace2494 (svn r14207) -Fix [FS#2262] (r14191): warning about non-virtual destructor in class with virtual functions. 16 years ago
rubidium a20b833516 (svn r14199) -Codechange: split fileio.h into fileio_type.h and fileio_func.h so not everything that includes saveload.h needs to include everything else too. 16 years ago
rubidium ea1f180a55 (svn r14199) -Codechange: split fileio.h into fileio_type.h and fileio_func.h so not everything that includes saveload.h needs to include everything else too. 16 years ago