dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,952 Commits 1 Branch 0 Tags
cd298f4722873f14cb0963409046ba76e7a8991c
Commit Graph

22952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
4c506a8fc8 Fix EF_NO_BREAKDOWN_SMOKE vehicle flag being ignored. 
This is due to a bad merge/import in commit
9f5164b403.
 2015-09-09 21:25:38 +01:00
Jonathan G Rennison
d7853db2fd Add configure switches for libbfd and bfd extra debug info. 2015-09-09 20:19:26 +01:00
Jonathan G Rennison
b67d139317 Merge branch 'house_placing' into jgrpp 2015-09-09 19:48:02 +01:00
Jonathan G Rennison
7040d61287 House picker: Allow only one instance, remove button toggle behaviour. 
This makes it behave more like object picker window.
 2015-09-09 19:44:42 +01:00
Jonathan G Rennison
5a2ecfd548 Merge branch 'master' into house_placing 2015-09-09 19:43:03 +01:00
Jonathan G Rennison
af85ccbbc3 Fix crash when opening object picker window. 
SELGW = ScenarioEditorLandscapeGenerationWindow
Crash is triggered by the following:
1. SELGW has a OnPlaceObject active (e.g. raise/lower land).
2. SELGW button is clicked to open BuildObjectWindow
3. BuildObjectWindow constructor calls ResetObjectToPlace
4: SELGW::OnPlaceObjectAbort is called
5: DeleteWindowById(WC_BUILD_OBJECT, 0) is called
6: BuildObjectWindow is freed whilst its constructor is executing
7: Crash occurs either through access to this->vscroll
   or during the dynamic_cast to get widget: WID_BO_SELECT_MATRIX.

The use-after-free was caught by AddressSanitizer.
 2015-09-09 19:24:13 +01:00
translators
081da61d05 (svn r27395) -Update from WebTranslator v3.0: 
frisian - 14 changes by BAJansen
 2015-09-09 17:45:14 +00:00
Jonathan G Rennison
eaf9aa6571 Unix crash log: handle SIGSEGVs while backtracing. Add documentation. 2015-09-09 18:28:03 +01:00
Jonathan G Rennison
46df5f8343 Merge branch 'tracerestrict-sx' into jgrpp 2015-09-09 02:37:54 +01:00
Jonathan G Rennison
2e8a283417 Merge branch 'tracerestrict' into tracerestrict-sx 2015-09-09 02:37:43 +01:00
Jonathan G Rennison
b9f5765415 Use rm -f instead of rm for removing configure build temporaries. 2015-09-09 02:29:19 +01:00
Jonathan G Rennison
3a093c4b63 Use libbfd as a fallback for backtrace symbol lookup on MinGW. 
This will try to demangle.
If bfd_find_nearest_line returns a file name but nothing else
(debugging info is turned off), scan the symbol table for the previous
symbol and use it if it looks OKish.
 2015-09-09 02:14:06 +01:00
Jonathan G Rennison
99d8d1afa6 Enable existing MSVC stack backtrace code on MinGW where supported. 
The existing code seems to work fine, though symbol lookup in
openttd.exe does not work.
 2015-09-09 00:09:07 +01:00
Jonathan G Rennison
c5bc04c4b8 Compile with -g1 if using libbfd to get line numbers. 2015-09-09 00:08:24 +01:00
Jonathan G Rennison
5b755050b8 Use libbfd on Unix to get more symbols, line numbers, etc. for backtraces. 2015-09-09 00:08:21 +01:00
Jonathan G Rennison
387bf403da GCC/Unix: Try to demangle C++ function names in crashlog stack trace. 
Change format of stack trace lines to improve readability.
 2015-09-08 00:49:34 +01:00
Jonathan G Rennison
427808dfbe Include data directory in make install target. 2015-09-07 17:39:29 +01:00
Jonathan G Rennison
876a21b3c1 Fix indentation/whitespace issues in breakdown code. 2015-09-07 00:54:46 +01:00
Jonathan G Rennison
f81b252386 Fix statusbar date when time in minutes and show date with time are both on. 2015-09-06 21:22:29 +01:00
Jonathan G Rennison
ec08a32c94 Perform SpringPP airport checks before calling AfterLoadVehicles. 
This is because AfterLoadVehicles may indirectly check airport
properties via the NewGRF code.

Defer missing GRF error message output until the end of AfterLoadGame
to avoid obscuring any earlier errors.
 2015-09-06 19:48:43 +01:00
Jonathan G Rennison
08df98bc10 Version: Committing version data for tag: jgrpp-0.4.1 2015-09-06 10:57:39 +01:00
Jonathan G Rennison
08f07cda42 Makefile: include revision number in rev.cpp recompilation check. 2015-09-06 10:53:05 +01:00
Jonathan G Rennison
6bd9f09e97 Merge branch 'tracerestrict-sx' into jgrpp 2015-09-05 23:15:44 +01:00
Jonathan G Rennison
366291ce20 Merge branch 'tracerestrict' into tracerestrict-sx 2015-09-05 23:15:28 +01:00
Jonathan G Rennison
776c93ca55 Fix use of nullptr, which broke compilation on legacy compilers. 2015-09-05 23:15:19 +01:00
Jonathan G Rennison
713f9fabc5 Version: Committing version data for tag: jgrpp-0.4.0 2015-09-05 12:40:01 +01:00
Jonathan G Rennison
4f17596ad9 Merge branch 'master' into jgrpp 2015-09-05 12:38:53 +01:00
Jonathan G Rennison
e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-03 23:30:13 +01:00
Jonathan G Rennison
42370dc28d Add company setting to auto-enable auto timetables for new vehicles. 
Default: off.
 2015-09-03 23:27:26 +01:00
translators
54eb340998 (svn r27394) -Update from WebTranslator v3.0: 
frisian - 25 changes by BAJansen
 2015-09-03 17:45:12 +00:00
Jonathan G Rennison
c6854afcef Pause the game instead of blocking when link graph jobs lag. 
Check if the job is still running one date fract tick before it
is due to join and if so pause the game until its done.
This avoids the main thread being blocked on a thread join.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
 2015-09-03 18:36:30 +01:00
Jonathan G Rennison
5108a71240 SpringPP load: remove wait for cargo orders. 2015-09-02 21:25:33 +01:00
Jonathan G Rennison
3dec3242cc Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-02 21:09:25 +01:00
Jonathan G Rennison
c751bba17c Bump SLXI tracerestrict version due to reserve through new feature. 2015-09-02 21:07:08 +01:00
Jonathan G Rennison
8f4c216b3f Merge branch 'tracerestrict' into tracerestrict-sx 2015-09-02 21:03:14 +01:00
Jonathan G Rennison
73b69c5594 Validate type of all instructions, log validation failures at load. 
The validator now checks that the type of conditional instructions
is known.
On a validation failure, the load code now outputs a corrupt savegame
message, with the validation error message and a program dump,
instead of using an assertion.
 2015-09-02 20:51:30 +01:00
Jonathan G Rennison
d9acfc4599 Fix validation of dual item instructions. 2015-09-02 19:13:30 +01:00
Jonathan G Rennison
e2435c7169 Only run trace restrict programs if they contain relevant actions. 
Only run in pathfinder case if deny or penalty are present.
Only run in is safe waiting tile case is reserve through is present.
Presence is determined at program validation time and cached in the
program structure.
Validator now checks for unknown non-conditional instructions.
 2015-09-02 18:35:56 +01:00
Jonathan G Rennison
06a1d7c5c9 Add reserve through action to trace restrict programs. 
This only changes the behaviour of PBS reservations which
would otherwise terminate at a PBS signal.
If the signal restriction sets the reserve through state,
the reservation continues through the signal, and the signal
is set to green.
 2015-09-02 02:12:02 +01:00
Jonathan G Rennison
06cc930e47 Improve insertion and removal of 'or if' conditionals. 
Allow inserting an 'or if' immediately after 'if', 'else if', 'or if'.
Removing an 'or if' no longer removes the associated block.
 2015-09-02 02:12:02 +01:00
Jonathan G Rennison
de270a2702 Version: Committing version data for tag: jgrpp-0.3.2 2015-08-31 19:45:40 +01:00
Jonathan G Rennison
2edfccd187 SpringPP load: Fix loading when day-length > 1 
Adjust value of _date_fract.
 2015-08-31 19:42:34 +01:00
translators
246df66229 (svn r27391) -Update from WebTranslator v3.0: 
english_US - 2 changes by Supercheese
 2015-08-31 17:45:13 +00:00
Jonathan G Rennison
cbfdb4c94c Version: Committing version data for tag: jgrpp-0.3.1 2015-08-31 16:37:45 +01:00
Jonathan G Rennison
32dffceaa0 Merge branch 'order_occupancy-sx' into jgrpp 2015-08-31 16:36:02 +01:00
Jonathan G Rennison
e9d3e6fad2 Merge branch 'order_occupancy' into order_occupancy-sx 2015-08-31 16:35:34 +01:00
Jonathan G Rennison
0cf7428f85 Fix crash in competitor orders GUI. 
Fix attempt to set occupancy widget displayed pane in
competitors order GUI, where the occupancy widget is not present.
 2015-08-31 16:35:24 +01:00
Jonathan G Rennison
1723c0f302 Version: Committing version data for tag: jgrpp-0.3.0 2015-08-31 11:46:06 +01:00
Jonathan G Rennison
ce15bdc08f Merge branch 'save_ext_spp' into jgrpp 2015-08-31 10:22:39 +01:00
Jonathan G Rennison
44a41ba13e Fix traffic light removal not deleting animated tile. 2015-08-31 09:58:42 +01:00