Commit Graph

34 Commits (38571cf0daea6f9e4ec56f489df0c9a282ef94f4)

Author SHA1 Message Date
Jonathan G Rennison cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
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 c01a2e2a81 Codechange: Removed SmallVector completely 5 years ago
Jonathan G Rennison 2e7e712f06 Ctrl+click on shared list button in order/timetable window to add veh to group 7 years ago
Jonathan G Rennison 6417fb16c3 Initial implementation of trace restrict slots 7 years ago
frosch 476b2b0e8c (svn r27677) -Codechange: Remove implicit VehicleListIdentifier from uint32 constructor, to make conversions more explicit. 8 years ago
frosch 9d8c04b0cc (svn r27677) -Codechange: Remove implicit VehicleListIdentifier from uint32 constructor, to make conversions more explicit. 8 years ago
rubidium a72dd0480c (svn r27013) -Codechange: extract the functionality to determine the number of digits to make space for when drawing an unit number into a separate function 10 years ago
rubidium 890f50d491 (svn r27013) -Codechange: extract the functionality to determine the number of digits to make space for when drawing an unit number into a separate function 10 years ago
frosch da9de1de70 (svn r26679) -Codechange: VehicleListIdentifier::Pack can be const. (Juanjo) 10 years ago
frosch 9d5a1b2275 (svn r26679) -Codechange: VehicleListIdentifier::Pack can be const. (Juanjo) 10 years ago
rubidium ffb9279479 (svn r26112) -Fix: make sure a vehicle list is always initialised 11 years ago
rubidium 94b9ee1e45 (svn r26112) -Fix: make sure a vehicle list is always initialised 11 years ago
rubidium 1a515e6344 (svn r22405) -Document: some more "random-ish" tidbits 13 years ago
rubidium 87272273b5 (svn r22405) -Document: some more "random-ish" tidbits 13 years ago
rubidium f5128695c5 (svn r20772) -Codechange: use packed VehicleListIdentifiers as window numbers 14 years ago
rubidium 1664ac1eb5 (svn r20772) -Codechange: use packed VehicleListIdentifiers as window numbers 14 years ago
rubidium 881c6c679f (svn r20771) -Add: concept of vehicle list identifiers to identify a vehicle list instead of a string of parameters 14 years ago
rubidium fcb4cfedb0 (svn r20771) -Add: concept of vehicle list identifiers to identify a vehicle list instead of a string of parameters 14 years ago
frosch 5ecf2f7f8c (svn r19656) -Codechange/Fix: Report back if invalid vehicle lists are requested. 14 years ago
frosch 91a27a9738 (svn r19656) -Codechange/Fix: Report back if invalid vehicle lists are requested. 14 years ago
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 3b798599b6 (svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with. 16 years ago
rubidium f56e630e5c (svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with. 16 years ago
frosch 67db5087cd (svn r14406) -Fix [FS#Eddi]: Autoreplace did not work for vehicles in free wagon chains. 16 years ago
frosch 32289ebd63 (svn r14406) -Fix [FS#Eddi]: Autoreplace did not work for vehicles in free wagon chains. 16 years ago
skidd13 2f65d35ead (svn r13575) -Codechange: Move small vector to core since it fits better in there
-Codechange: convert smallvector from struct to class
16 years ago
skidd13 ad9b19b77a (svn r13575) -Codechange: Move small vector to core since it fits better in there
-Codechange: convert smallvector from struct to class
16 years ago
peter1138 f9fc53f98a (svn r13307) -Codechange: Separate VehicleList and its two functions so only the 3 users include it, reducing dependencies on misc/smallvec.h 16 years ago
peter1138 f731b31eda (svn r13307) -Codechange: Separate VehicleList and its two functions so only the 3 users include it, reducing dependencies on misc/smallvec.h 16 years ago