alberth
65db59da81
(svn r27397) -Fix(r27346)[FS#6370]: Fix object editing crash in scenario editor (based on work by adf88)
2015-09-13 12:04:47 +00:00
Jonathan G Rennison
b6d0e938ef
Version: Committing version data for tag: jgrpp-0.5.0
2015-09-13 11:49:52 +01:00
Jonathan G Rennison
2f077f0c42
Use a single action for build & refit, to make it MP safe.
...
Pass the cargo ID through the text field (in binary mode).
2015-09-12 23:35:32 +01:00
Jonathan G Rennison
40b7d6d335
Import, rebase and make changes to build and refit patch.
...
http://www.tt-forums.net/viewtopic.php?f=33&t=35805
2015-09-12 22:05:00 +01:00
Jonathan G Rennison
ecc0442a8b
Merge branch 'crashlog_improvements' into jgrpp
2015-09-12 20:36:58 +01:00
Jonathan G Rennison
1ee1c6201a
Fix compilation on 32 bit windows due to type mismatches.
2015-09-12 20:36:20 +01:00
Jonathan G Rennison
58dbc8fbd6
Scale link graph timeout and compression intervals by day length.
2015-09-12 18:51:15 +01:00
translators
a5355ec6c4
(svn r27396) -Update from WebTranslator v3.0:
...
latin - 17 changes by Supercheese
2015-09-12 17:45:16 +00:00
Jonathan G Rennison
361b8b4540
Merge branch 'extra_large_maps-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
2015-09-12 14:19:26 +01:00
Jonathan G Rennison
421b9034e2
Add an extended version feature for map sizes > 8kx8k.
...
This is to prevent earlier versions from trying to load the savegame
and aborting.
2015-09-12 14:17:37 +01:00
Jonathan G Rennison
72dadf7c6b
Merge branch 'save_ext' into extra_large_maps-sx
2015-09-12 14:15:47 +01:00
Jonathan G Rennison
d6395b97a7
Enable extended feature versions for saving to be set at run time.
2015-09-12 14:15:32 +01:00
Jonathan G Rennison
f27ca88596
Show error message instead of aborting when loading an invalid map size.
2015-09-12 13:33:35 +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
1891e7dfc8
Bump max map size to 28 bits.
...
Prevent opening NewGRF debug window on tile indexes > 27 bits,
to avoid overflowing field.
2015-09-11 22:39:41 +01:00
Jonathan G Rennison
5934cc4995
Fix compile and landscape creation for large maps.
2015-09-11 22:39:40 +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
Jonathan G Rennison
86dea90c4f
save_ext: Initial support for save/load of RIFF chunk sizes > 28 bits.
...
Add a chunk extension header with a flag for increased RIFF size.
2015-09-11 22:37:36 +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
Jonathan G Rennison
ddcb3bf560
Update project files.
2015-09-11 15:16:19 +01:00
Jonathan G Rennison
459891343e
Merge branch 'master' into save_ext
2015-09-11 15:15:36 +01:00
Jonathan G Rennison
5a8049f65b
Merge branch 'minimap-screenshot-rect' into jgrpp
...
Conflicts:
src/screenshot.cpp
2015-09-11 03:45:53 +01:00
Jonathan G Rennison
012c842a90
Merge branch 'daily_script' into jgrpp
2015-09-11 03:44:43 +01:00
Jonathan G Rennison
dde1c16105
Minimap screenshot: add console params and help to mostly match screenshot.
2015-09-11 03:44:25 +01:00
patch-import
019e862536
Import minimap patch.
...
Fix various compilation issues and update to current trunk.
http://www.tt-forums.net/viewtopic.php?p=848661#p848661
2015-09-11 03:31:27 +01:00
patch-import
2c3e58909f
Import daily/monthly/yearly scripts patch.
...
Fix whitespace.
http://www.tt-forums.net/viewtopic.php?f=33&t=49595
2015-09-11 02:55:04 +01:00
Jonathan G Rennison
ef1176cf9f
Merge branch 'more_cond_orders-sx' into jgrpp
2015-09-10 18:42:16 +01:00
Jonathan G Rennison
a82a786f57
Merge branch 'more_cond_orders' into more_cond_orders-sx
2015-09-10 18:41:59 +01:00
Jonathan G Rennison
e41b6fcc67
Merge branch 'master' into more_cond_orders-sx
2015-09-10 18:41:51 +01:00
Jonathan G Rennison
2d47c47a45
Fix new cond. order value widgets not being in the non-train orders window.
...
Copy the missing widgets from the train orders window.
2015-09-10 18:41:29 +01:00
Jonathan G Rennison
25c4616a0e
Merge branch 'crashlog_improvements' into jgrpp
2015-09-09 22:01:07 +01:00
Jonathan G Rennison
91ca8ab326
Merge branch 'improved_breakdowns' into jgrpp
2015-09-09 22:00:06 +01:00
Jonathan G Rennison
44ecaaff01
Improved breakdowns: Fix smoke persisting long after vehicles have gone.
...
Fix animation_state not being set for limited speed/power breakdowns,
such that the smoke lasted for a randomly long amount of time,
instead show a short burst of smoke.
Fix smoke for limited speed/power breakdowns only being shown 1/32 of
the time.
Make sure that a breakdown has non-zero delay before showing smoke.
2015-09-09 21:58:18 +01:00
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