dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,568 Commits 1 Branch 0 Tags
aa7413a89f4786de5e0228a01d5e70d98eef09ba
Commit Graph

614 Commits

Author SHA1 Message Date
Jonathan G Rennison
ae8e19cf9a Merge branch 'save_ext' into jgrpp 2016-09-13 22:57:08 +01:00
Jonathan G Rennison
13fb737bed Add a template parameter for the inner container of MultiMap. 2016-09-12 23:30:43 +01:00
Jonathan G Rennison
0bd33eff1e Fixes use of builtins in CountBits for small and/or signed input types. 2016-09-12 18:37:28 +01:00
Jonathan G Rennison
0c1f59807d Merge branch 'enhanced_viewport_overlay' into jgrpp 2016-09-10 01:03:31 +01:00
Jonathan G Rennison
ea2b04a6be Add C++11 container utility functions. 2016-09-10 00:55:13 +01:00
Jonathan G Rennison
a8e0862500 Enable prefetch and bswap buitins for clang. 2016-09-08 20:00:56 +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
9ea018abc5 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
 2016-09-08 00:12:48 +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
72a386abe5 Merge branch 'save_ext' into cargo_type_order 2016-09-06 22:09:50 +01:00
Jonathan G Rennison
8deac54c9f Remove mutex from SmallStack/StationIDStack. 
It is only ever used from the main thread.
 2016-09-04 23:00:10 +01:00
Jonathan G Rennison
349cd8a6f0 Where possible use compiler builtins for CountBits and FindFirstBit. 2016-09-04 18:01:38 +01:00
alberth
bc08fe7c5f (svn r27641) -Codechange: Fold the _fios_items file list vector into its own class. 2016-09-04 12:50:22 +00:00
alberth
a38cdeccc0 (svn r27641) -Codechange: Fold the _fios_items file list vector into its own class. 2016-09-04 12:50:22 +00:00
Jonathan G Rennison
cf26d48c9b Add a "SoftClamp" function which tolerates min > max, use for DrawTrainEngine. 2016-06-18 13:22:59 +01:00
Jonathan G Rennison
f6d374ade4 Merge branch 'house_placing' into jgrpp 
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-05-12 22:57:42 +01:00
Jonathan G Rennison
95b65163e3 Revert back to v2 of house picking/placing patch. 2016-05-12 22:35:39 +01:00
Jonathan G Rennison
41a06e698f Merge branch 'house_placing' into jgrpp 
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-04-08 20:15:08 +01:00
patch-import
0fd34a17a5 Update to v4 of house placing patch. 2016-04-08 19:42:10 +01:00
Jonathan G Rennison
ec62878758 Merge branch 'crashlog_improvements' into jgrpp 2016-03-23 18:22:14 +00:00
Jonathan G Rennison
2a2ff30c3f Fix Pool verbose assertion format string on Windows platforms. 2016-03-23 18:21:54 +00:00
Jonathan G Rennison
bdca33ee80 Merge branch 'crashlog_improvements' into jgrpp 2016-03-21 20:47:16 +00:00
Jonathan G Rennison
a703e2ff58 Increase verbosity of Pool assertion failure messages. 2016-03-21 18:22:52 +00:00
Jonathan G Rennison
ecf5943954 Fix some undefined behaviour: signed overflow and over shift left. 
Caught by UndefinedBehaviourSanitizer.
 2015-11-22 23:16:09 +00:00
Jonathan G Rennison
66cd454c37 Merge branch 'day_length-sx' into jgrpp 2015-09-27 23:18:33 +01:00
Jonathan G Rennison
f03cd98d04 Check/print tick skip counter in desync and random logging. 2015-09-27 23:12:00 +01:00
michi_cc
44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
michi_cc
2b8bb12d62 (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
peter1138
1ad3db76e6 (svn r27049) -Fix (r26482): Fix compilation with --enable-desync-debug. 2014-10-28 11:32:19 +00:00
peter1138
cea2c3490a (svn r27049) -Fix (r26482): Fix compilation with --enable-desync-debug. 2014-10-28 11:32:19 +00:00
alberth
ee7700ef78 (svn r26685) -Fix: Tighten parameter bound checks on GSCargoMonitor functions, and return -1 on out-of-bound parameters. 2014-07-12 17:04:14 +00:00
alberth
8fe8765aaa (svn r26685) -Fix: Tighten parameter bound checks on GSCargoMonitor functions, and return -1 on out-of-bound parameters. 2014-07-12 17:04:14 +00:00
rubidium
15c4a7ec1c (svn r26651) -Fix: make sure an abs is used that supports int64 when using abs on those variables 2014-06-17 19:01:45 +00:00
rubidium
ab964a6cee (svn r26651) -Fix: make sure an abs is used that supports int64 when using abs on those variables 2014-06-17 19:01:45 +00:00
rubidium
2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
rubidium
0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
fonsinchen
4b726930f1 (svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant. 2014-02-16 16:25:18 +00:00
fonsinchen
46590e112e (svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant. 2014-02-16 16:25:18 +00:00
frosch
a92bf49191 (svn r26333) -Fix: Compilation without static_assert. 2014-02-11 20:34:48 +00:00
frosch
858e80f3dd (svn r26333) -Fix: Compilation without static_assert. 2014-02-11 20:34:48 +00:00
fonsinchen
86ebb981f1 (svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs. 2014-02-10 20:13:07 +00:00
fonsinchen
e37656f2e5 (svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs. 2014-02-10 20:13:07 +00:00
rubidium
73474728e3 (svn r26057) -Fix: a number of possibly uninitialised variables 2013-11-23 13:12:19 +00:00
rubidium
b3e93d6520 (svn r26057) -Fix: a number of possibly uninitialised variables 2013-11-23 13:12:19 +00:00
fonsinchen
e037a8bea9 (svn r25893) -Fix: Document RandomRange and change misleading parameter name 'max' in random functions. 2013-10-20 14:48:08 +00:00
fonsinchen
fe550c2db3 (svn r25893) -Fix: Document RandomRange and change misleading parameter name 'max' in random functions. 2013-10-20 14:48:08 +00:00
fonsinchen
6f834776e4 (svn r25889) -Codechange: Add forgotten file. 2013-10-20 13:46:14 +00:00
fonsinchen
1ed478d433 (svn r25889) -Codechange: Add forgotten file. 2013-10-20 13:46:14 +00:00
fonsinchen
85fc5fbedf (svn r25887) -Fix: Ignore NULL pointers in delete operator of PoolItem. 2013-10-20 13:35:35 +00:00
fonsinchen
e21ae34878 (svn r25887) -Fix: Ignore NULL pointers in delete operator of PoolItem. 2013-10-20 13:35:35 +00:00