You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison 75dd135e8d Merge tag '14.0-beta3' into jgrpp ... # Conflicts: # regression/regression/result.txt # src/industrytype.h # src/network/core/config.h # src/network/core/network_game_info.cpp # src/network/core/network_game_info.h # src/network/core/packet.cpp # src/network/core/packet.h # src/network/core/tcp.cpp # src/network/core/tcp.h # src/network/core/tcp_admin.cpp # src/network/core/tcp_content.cpp # src/network/core/tcp_coordinator.cpp # src/network/core/tcp_game.cpp # src/network/core/tcp_game.h # src/network/core/tcp_turn.cpp # src/network/core/udp.cpp # src/network/core/udp.h # src/network/network_admin.cpp # src/network/network_client.cpp # src/network/network_client.h # src/network/network_command.cpp # src/network/network_content.cpp # src/network/network_internal.h # src/network/network_query.cpp # src/network/network_query.h # src/network/network_server.cpp # src/network/network_server.h # src/network/network_turn.cpp # src/network/network_udp.cpp # src/rail_gui.cpp # src/road_gui.cpp		3 months ago
..
extra_signals	Fix direction of semaphore no-entry signal sprites for W-E track	1 year ago
misc_gui	Add a baseset GRF for misc GUI sprites	2 years ago
openttd	Change: [CMake] Use explicit list for grf source files (#11539)	6 months ago
orig_extra	Feature: Toyland-specific river graphics (#11523)	5 months ago
road_waypoints	Add replacement sprites for road waypoint buildings	2 years ago
CMakeLists.txt	Merge branch 'master' into jgrpp	4 months ago
OpenTTD-Mono.ttf	Change: Update OpenTTD TTF fonts to v0.5 (#11994)	4 months ago
OpenTTD-Sans.ttf	Change: Update OpenTTD TTF fonts to v0.5 (#11994)	4 months ago
OpenTTD-Serif.ttf	Change: Update OpenTTD TTF fonts to v0.5 (#11994)	4 months ago
OpenTTD-Small.ttf	Change: Update OpenTTD TTF fonts to v0.5 (#11994)	4 months ago
OpenTTD-font.md	Change: Update OpenTTD TTF fonts to v0.5 (#11994)	4 months ago
extra_signals.grf	Fix direction of semaphore no-entry signal sprites for W-E track	1 year ago
innerhighlight.grf	Add 3 more zoning highlight colours	4 years ago
misc_gui.grf	Add a baseset GRF for misc GUI sprites	2 years ago
no_music.obm	Codechange: rework how grf and ob[msg] are generated	4 years ago
no_sound.obs	Codechange: rework how grf and ob[msg] are generated	4 years ago
openttd.grf	Fix: Add shading to river slopes	6 months ago
openttd.grf.hash	Fix: Add shading to river slopes	6 months ago
opntitle.dat	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_dos.obg	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_dos.obm	Fix #8313: use correct capitalization for TTO / DOS base-music (#8385)	3 years ago
orig_dos.obs	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_dos_de.obg	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_extra.grf	Feature: Toyland-specific river graphics (#11523)	5 months ago
orig_extra.grf.hash	Feature: Toyland-specific river graphics (#11523)	5 months ago
orig_tto.obm	Fix #8313: use correct capitalization for TTO / DOS base-music (#8385)	3 years ago
orig_win.obg	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_win.obm	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_win.obs	Codechange: rework how grf and ob[msg] are generated	4 years ago
progsignals.grf	CMake: Move built in GRfs to baseset dir	4 years ago
road_waypoints.grf	Add replacement sprites for road waypoint buildings	2 years ago
route_step.grf	CMake: Move built in GRfs to baseset dir	4 years ago
tracerestrict.grf	Improve colouring of restricted signal posts with original TTD graphics	11 months ago