dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,235 Commits 1 Branch 0 Tags
1365600bed4802438f4b51d53157a0adbcf7c064
Commit Graph

1214 Commits

Author SHA1 Message Date
Jonathan G Rennison
8c0c9274ea Merge branch 'infrastructure_sharing' into jgrpp 
# Conflicts:
#	src/economy.cpp
#	src/misc.cpp
#	src/openttd.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-01-26 18:47:08 +00:00
Jonathan G Rennison
9000d74f3c Pay all cargo payment incomes when cargo finally delivered 2018-01-26 18:28:57 +00:00
Jonathan G Rennison
38fb8c1b84 Zoning: Cache expensive zoning overlay values 2018-01-22 17:49:53 +00:00
Jonathan G Rennison
e54a7189fd Add debug command line switch to quit after fixed number of days 2018-01-15 21:47:10 +00:00
Jonathan G Rennison
4a6ddb2d50 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	config.lib
 2017-09-04 01:22:54 +01:00
Jonathan G Rennison
f3a0aace0c Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2017-08-15 18:44:17 +01:00
Jonathan G Rennison
3813b3ca09 Dump infrastructure totals when mismatch detected in CheckCaches. 2017-02-22 02:51:25 +00:00
Jonathan G Rennison
2fbeb29277 Merge branch 'crashlog_improvements' into jgrpp 
# Conflicts:
#	src/misc.cpp
#	src/openttd.cpp
 2017-02-21 21:50:08 +00:00
Jonathan G Rennison
349ddd90b7 Maintain a circular buffer of recent commands, add to crashlog. 
Add console command to dump command log.
Increase max crashlog size.
 2017-02-21 21:49:56 +00:00
Jonathan G Rennison
3b45419a16 Merge branch 'master' into save_ext 2017-02-02 20:41:48 +00:00
Jonathan G Rennison
90cd312428 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios.h
 2017-01-17 19:11:09 +00:00
frosch
7b553d255e (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
frosch
050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
Jonathan G Rennison
20a090b077 Show warning dialog if NewGRFs use too many string IDs. 
Show when reloading/changing NewGRF config, or starting new game.
 2016-12-08 23:48:53 +00:00
Jonathan G Rennison
f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
 2016-09-18 20:07:48 +01:00
Jonathan G Rennison
556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals. 
This is instead of the previous limit of 16, all stored in M2.
 2016-09-18 20:06:59 +01:00
Jonathan G Rennison
ae8e19cf9a Merge branch 'save_ext' into jgrpp 2016-09-13 22:57:08 +01:00
Jonathan G Rennison
d124089d29 Add extended version tag and feature versions to output of -q. 2016-09-13 22:56:17 +01:00
Jonathan G Rennison
375b069f82 Replace day length scaled tick macros with global variables. 
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
 2016-09-10 01:03:48 +01:00
Jonathan G Rennison
f7774415f2 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	src/stdafx.h
 2016-09-08 19:36:00 +01:00
Jonathan G Rennison
5e67582a64 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
 2016-09-07 22:02:57 +01:00
Jonathan G Rennison
0b7d68a6d1 Add support for verbose asserts. 
(cherry picked from commit 48e4c35fdc)
 2016-09-05 22:46:01 +01:00
alberth
0adfb1ac6f (svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit. 2016-09-04 16:06:50 +00:00
alberth
f286ba8db2 (svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit. 2016-09-04 16:06:50 +00:00
alberth
6f201ce4a8 (svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload. 2016-09-04 12:58:04 +00:00
alberth
e735bbebce (svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload. 2016-09-04 12:58:04 +00:00
alberth
597380e099 (svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType. 2016-09-04 12:57:43 +00:00
alberth
a959c0c965 (svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType. 2016-09-04 12:57:43 +00:00
alberth
75ad6d0100 (svn r27647) -Codechange: Introduce file operations, and use it to replace most of SaveLoadDialogMode 2016-09-04 12:56:23 +00:00
alberth
ec2b2fad58 (svn r27647) -Codechange: Introduce file operations, and use it to replace most of SaveLoadDialogMode 2016-09-04 12:56:23 +00:00
alberth
0bf3372882 (svn r27640) -Codechange: Remove another use of _saveload_mode in the loading code. 2016-09-04 12:48:28 +00:00
alberth
c530f89761 (svn r27640) -Codechange: Remove another use of _saveload_mode in the loading code. 2016-09-04 12:48:28 +00:00
alberth
2fa0fdb176 (svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function. 2016-09-04 12:47:07 +00:00
alberth
e78627f2f1 (svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function. 2016-09-04 12:47:07 +00:00
Jonathan G Rennison
df421a55bb Fix air cache being leaked in CheckCaches. 2016-03-21 21:19:40 +00:00
Jonathan G Rennison
26fa77c5ee Run animations at the normal rate regardless of day length factor. 2016-03-02 18:36:53 +00:00
Jonathan G Rennison
5dba89c783 Merge branch 'crashlog_improvements' into jgrpp 
# Conflicts:
#	source.list
#	src/openttd.cpp
#	src/stdafx.h
#	src/vehicle.cpp
 2016-02-17 22:56:15 +00:00
Jonathan G Rennison
e89efa8581 Add a function to test whether the current thread is the main thread. 2016-02-17 22:41:07 +00:00
Jonathan G Rennison
48e4c35fdc Add support for verbose asserts. 
Use for test/exec DoCommand mismatches.
 2016-02-17 22:41:07 +00:00
Jonathan G Rennison
f6a8f27501 Make server and all clients run desync checks if a client desyncs. 2015-11-23 19:47:59 +00:00
Jonathan G Rennison
69c89c4881 Check caches at desync level 1, every 500 ticks. 
Also check aircraft cache.
 2015-11-23 19:17:49 +00:00
Jonathan G Rennison
8cc6bddc24 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 
Conflicts:
	src/misc.cpp
 2015-11-11 19:20:36 +00:00
Jonathan G Rennison
919057a5e6 Cache tunnel info in viewport map mode, to prevent render flicker. 
If we see a tunnel during the usual tile scan, keep it in the cache
until it is explicitly evicted by a clear tunnel tile action, or
the cache is cleared at game init/load/shutdown.
Select colours at the drawing rather than the cache-building stage.
Bridges and tunnels are now stored/handled separately.
The process for bridges is mostly unchanged.
 2015-11-11 19:18:32 +00:00
Jonathan G Rennison
ee87b1d7d3 Pause on savegame load if ctrl key is pressed. 2015-10-15 00:45:22 +01:00
Jonathan G Rennison
66cd454c37 Merge branch 'day_length-sx' into jgrpp 2015-09-27 23:18:33 +01:00
Jonathan G Rennison
26d0eb041d Increase thoroughness of vehicle and YAPF cache desync debug checks. 2015-09-27 23:16:12 +01:00
Jonathan G Rennison
f03cd98d04 Check/print tick skip counter in desync and random logging. 2015-09-27 23:12:00 +01:00
Jonathan G Rennison
8b994e255d Merge branch 'extra_large_maps-sx' into jgrpp 
Conflicts:
	src/saveload/saveload.cpp
 2015-09-11 22:50:35 +01:00
Jonathan G Rennison
5d222e4d5e Merge branch 'extra_large_maps' into extra_large_maps-sx 
Conflicts:
	src/genworld_gui.cpp
	src/map_type.h
	src/newgrf_debug_gui.cpp
 2015-09-11 22:39:01 +01:00
patch-import
7d2b4bd3ea Import extra large maps patch. 
http://www.tt-forums.net/viewtopic.php?f=33&t=33137
 2015-09-11 19:53:08 +01:00