dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,907 Commits 1 Branch 0 Tags
df7177876c725fe2931081b718d8ce1ff50c3949
Commit Graph

46907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
df7177876c Update baseset files 2018-07-26 20:37:20 +01:00
Jonathan G Rennison
e261a71271 Merge branch 'crashlog_improvements' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/openttd.cpp
#	src/vehicle.cpp
 2018-07-26 20:26:09 +01:00
Jonathan G Rennison
ae15c96c1a Merge branch 'master' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
 2018-07-26 20:54:13 +01:00
Jonathan G Rennison
1b5da1f2aa Add m8 support to DumpTileInfo 2018-07-26 20:03:16 +01:00
Jonathan G Rennison
9490f33a6c Merge branch 'master' into crashlog_improvements 
# Conflicts:
#	src/console_cmds.cpp
#	src/openttd.cpp
#	src/vehicle.cpp
 2018-07-26 20:01:08 +01:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
Jonathan G Rennison
5661763d6a Merge branch 'crashlog_improvements' into jgrpp 2018-07-26 19:04:34 +01:00
Jonathan G Rennison
ddef3ad7c2 Add map size information to crash log 2018-07-26 19:02:08 +01:00
Jonathan G Rennison
8805ab8387 Add tile info dump method to scope_dumper 2018-07-26 18:52:47 +01:00
Jonathan G Rennison
7f027f8dca Add tile info dump function and assert variants 2018-07-26 18:48:53 +01:00
Peter Nelson
bf8d7df736 Change: Extend rail types to 64 (6 bit storage) 2018-07-26 13:27:40 +01:00
Peter Nelson
5db883fbe9 Change: Move rail type bits from m3 to m8. 2018-07-26 13:27:40 +01:00
Peter Nelson
65548c37a8 Change: Extend map array by 2 bytes with a uint16. 2018-07-26 13:27:40 +01:00
Jonathan G Rennison
50c9af503e Makefile: Fix data dir not being created in make install target 2018-07-25 19:44:49 +01:00
translators
8090580f77 Update: Translations from eints 
spanish (mexican): 25 changes by Absay
 2018-07-25 19:45:41 +02:00
Jonathan G Rennison
943af5bf0d Merge branch 'crashlog_improvements' into jgrpp 
Fixes compilation on MSVC
 2018-07-25 08:15:09 +01:00
Jonathan G Rennison
e2a4e51725 Enable use of scope_dumper without scope info logging enabled 2018-07-25 08:13:15 +01:00
glx
a4eccd8076 Fix: dmusic compilation with MSYS2/MINGW 2018-07-24 21:39:21 +02:00
glx
d418d30947 Fix: dmusic detection 2018-07-24 21:39:21 +02: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
Jonathan G Rennison
4bdbf3863d Add setting to allow placing stations under bridges 2018-07-24 03:22:33 +01:00
Jonathan G Rennison
56bde8ce18 Add setting to allow placing all NewGRF objects under bridges 2018-07-24 03:22:33 +01:00
Jonathan G Rennison
035c00b521 Add rail custom bridge heads setting to settings GUI 2018-07-24 03:22:32 +01:00
J0an Josep
8975318286 Fix 2a868b9f3b: Expose widgets and windows to scripts and fix documentation. 2018-07-23 20:32:18 +02:00
translators
0bca1c53c9 Update: Translations from eints 
spanish (mexican): 19 changes by Absay
 2018-07-23 19:45:41 +02:00
Jonathan G Rennison
6a3d411fa1 Fix: Use after free in CmdBuildTunnel (#6856) 
Use after free could occur when when excavating far end
removed multiple NewGRF objects
 2018-07-22 21:58:05 +02:00
translators
38443bab0b Update: Translations from eints 
catalan: 2 changes by juanjo
russian: 9 changes by Lone_Wolf
 2018-07-22 19:45:41 +02:00
Jonathan G Rennison
8fc1517515 Codechange: detect native Apple clang correctly in config.lib #6773 
Fixes: 00c1603256
 2018-07-22 15:15:54 +01:00
Michael Lutz
bc1b34d1a2 Add: GDPR notice to contributing guide and a matching pull request template. 
Contents is adapted from the https://github.com/rsyslog/rsyslog project, which has mainly European contributors.
 2018-07-22 11:47:31 +02:00
translators
2f5cb9e4fc Update: Translations from eints 
catalan: 63 changes by juanjo
 2018-07-21 19:45:40 +02:00
translators
6a6ffddc5f Update: Translations from eints 
greek: 46 changes by kyrm
italian: 44 changes by lorenzodv
 2018-07-20 19:45:40 +02: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
Charles Pigott
a3d1950b65 Codechange: Ensure that -lfreetype is always last when linking statically 
Fixes weird bug with MinGW
 2018-07-19 20:24:17 +02:00
Charles Pigott
63898f61b0 Codechange: Rearrange struct packing defines and make MinGW use _Pragma pack style 2018-07-19 20:24:17 +02:00
Jonathan G Rennison
3ed5d8f09f Add mechanism to lock wait times in timetable against autofill/automate changes 2018-07-19 00:32:24 +01:00
translators
93469a92f2 Update: Translations from eints 
korean: 3 changes by kevinhigh
 2018-07-18 19:45:40 +02:00
translators
3014213186 Update: Translations from eints 
malay: 11 changes by eidan_shafie
 2018-07-17 19:45:39 +02:00
Jonathan G Rennison
42505f3532 Merge branch 'custom_bridgeheads' into jgrpp 2018-07-13 08:28:06 +01:00
Jonathan G Rennison
176fd2180b Fix regression preventing road vehicles from leaving tunnels 2018-07-13 08:27:52 +01:00
Jonathan G Rennison
e67cd04596 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/train_cmd.cpp
 2018-07-13 03:14:31 +01:00
Jonathan G Rennison
6ca0fcbae2 Use head tile track pieces in Train::GetVehicleTrackdir for trains in wormhole 2018-07-13 03:13:50 +01:00
Jonathan G Rennison
a7e767d766 Fix 90° turns being wrongly detected across bridges of non-zero length 
This prevented reservations
 2018-07-13 03:01:08 +01:00
translators
f70544074c Update: Translations from eints 
latin: 19 changes by Supercheese
english (us): 19 changes by Supercheese
 2018-07-11 19:45:41 +02:00
translators
85ef5acf29 Update: Translations from eints 
malay: 10 changes by eidan_shafie
spanish (mexican): 9 changes by Absay
 2018-07-10 19:45:40 +02:00
translators
ae13f88c12 Update: Translations from eints 
malay: 9 changes by eidan_shafie
 2018-07-09 19:45:37 +02:00
Jonathan G Rennison
6740a9a470 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	src/bridge_map.h
#	src/pbs.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
#	src/vehicle.cpp
#	src/viewport.cpp
 2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a Initial support for rail custom bridge heads 2018-07-08 23:03:42 +01:00
Jonathan G Rennison
dfd3e3dcaa Add track func: TrackdirToDirection 2018-07-08 23:01:29 +01:00
Jonathan G Rennison
8f574881e8 Add direction func: DirToDiagDirAlongAxis 2018-07-08 23:00:29 +01:00
translators
8bbf06e0d4 Update: Translations from eints 
belarusian: 7 changes by KorneySan
russian: 7 changes by Lone_Wolf
 2018-07-08 19:45:37 +02:00