Commit Graph

227 Commits (424e4691ce2122ccfe42d19aad4edb6b71b5c689)

Author SHA1 Message Date
Jonathan G Rennison 8317eac918 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
7 years ago
Jonathan G Rennison 4e9d4dd80a Add a PreCleanPool() static method to pool item types.
(cherry picked from commit 87142ed840)
7 years ago
Jonathan G Rennison a3034891a1 Add missing include guard for dyn arena alloc header. 7 years ago
Jonathan G Rennison 2fb822d392 Fix includes and header guards of container functions. 7 years ago
Jonathan G Rennison 87142ed840 Add a PreCleanPool() static method to pool item types. 7 years ago
Jonathan G Rennison a67ecb4f6e Merge branch 'cpp-11' into jgrpp 7 years ago
Jonathan G Rennison 8f3e0c4fe5 Add a custom arena allocator utility. 7 years ago
Jonathan G Rennison a71a6ecec2 Fix Pop() method of SmallStack/StationIDStack.
Fixes 8deac54c
8 years ago
Jonathan G Rennison 8e6569c11f Include tick skip counter in all desync debug output.
Change message format to make field identification easier.
Update desync message reader to support tick skip counter.
8 years ago
Jonathan G Rennison ae8e19cf9a Merge branch 'save_ext' into jgrpp 8 years ago
Jonathan G Rennison 13fb737bed Add a template parameter for the inner container of MultiMap. 8 years ago
Jonathan G Rennison 0bd33eff1e Fixes use of builtins in CountBits for small and/or signed input types. 8 years ago
Jonathan G Rennison 0c1f59807d Merge branch 'enhanced_viewport_overlay' into jgrpp 8 years ago
Jonathan G Rennison ea2b04a6be Add C++11 container utility functions. 8 years ago
Jonathan G Rennison a8e0862500 Enable prefetch and bswap buitins for clang. 8 years ago
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
8 years ago
Jonathan G Rennison 5e67582a64 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison 72a386abe5 Merge branch 'save_ext' into cargo_type_order 8 years ago
Jonathan G Rennison 8deac54c9f Remove mutex from SmallStack/StationIDStack.
It is only ever used from the main thread.
8 years ago
Jonathan G Rennison 349cd8a6f0 Where possible use compiler builtins for CountBits and FindFirstBit. 8 years ago
alberth a38cdeccc0 (svn r27641) -Codechange: Fold the _fios_items file list vector into its own class. 8 years ago
Jonathan G Rennison cf26d48c9b Add a "SoftClamp" function which tolerates min > max, use for DrawTrainEngine. 8 years ago
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
8 years ago
Jonathan G Rennison 95b65163e3 Revert back to v2 of house picking/placing patch. 8 years ago
Jonathan G Rennison 41a06e698f Merge branch 'house_placing' into jgrpp
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
8 years ago
patch-import 0fd34a17a5 Update to v4 of house placing patch. 8 years ago
Jonathan G Rennison ec62878758 Merge branch 'crashlog_improvements' into jgrpp 8 years ago
Jonathan G Rennison 2a2ff30c3f Fix Pool verbose assertion format string on Windows platforms. 8 years ago
Jonathan G Rennison bdca33ee80 Merge branch 'crashlog_improvements' into jgrpp 8 years ago
Jonathan G Rennison a703e2ff58 Increase verbosity of Pool assertion failure messages. 8 years ago
Jonathan G Rennison ecf5943954 Fix some undefined behaviour: signed overflow and over shift left.
Caught by UndefinedBehaviourSanitizer.
9 years ago
Jonathan G Rennison 66cd454c37 Merge branch 'day_length-sx' into jgrpp 9 years ago
Jonathan G Rennison f03cd98d04 Check/print tick skip counter in desync and random logging. 9 years ago
michi_cc 44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 9 years ago
peter1138 1ad3db76e6 (svn r27049) -Fix (r26482): Fix compilation with --enable-desync-debug. 10 years ago
alberth ee7700ef78 (svn r26685) -Fix: Tighten parameter bound checks on GSCargoMonitor functions, and return -1 on out-of-bound parameters. 10 years ago
rubidium 15c4a7ec1c (svn r26651) -Fix: make sure an abs is used that supports int64 when using abs on those variables 10 years ago
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 10 years ago
fonsinchen 4b726930f1 (svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant. 11 years ago
frosch a92bf49191 (svn r26333) -Fix: Compilation without static_assert. 11 years ago
fonsinchen 86ebb981f1 (svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs. 11 years ago
rubidium 73474728e3 (svn r26057) -Fix: a number of possibly uninitialised variables 11 years ago
fonsinchen e037a8bea9 (svn r25893) -Fix: Document RandomRange and change misleading parameter name 'max' in random functions. 11 years ago
fonsinchen 6f834776e4 (svn r25889) -Codechange: Add forgotten file. 11 years ago
fonsinchen 85fc5fbedf (svn r25887) -Fix: Ignore NULL pointers in delete operator of PoolItem. 11 years ago
rubidium c702853917 (svn r25705) -Fix: a number of typos (inspired by 90c920601c84975acb694f3673e2beb08b013753) 11 years ago
michi_cc 8bb76958fa (svn r25685) -Codechange: [OSX] Use non-deprecated functions for byte swapping. 11 years ago
frosch dd5be60322 (svn r25402) -Fix-ish: Prevent copying of BasePool and WindowDesc, since they register in static vectors. 11 years ago
fonsinchen e4d3b981e3 (svn r25348) -Add: multimap implementation with guaranteed order between equal keys 11 years ago
fonsinchen fdcb488f80 (svn r25347) -Add: function for deterministic approximate division 11 years ago