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

52590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SamuXarick
a4035af337 Codechange: Apply coding style (#8640) 
* Fix: Missing or needed spaces

* Codechange: Remove space

* Codechange: Remove space

* Codechange: More missing spaces

* Codechange: Missing spaces

* Codechange: Remove space

* Codechange: Remove space
 2021-02-05 11:00:36 +01:00
Jonathan G Rennison
b8c3bee8b0 Fix clicking trains in slots window 2021-02-05 02:48:28 +00:00
Jonathan G Rennison
0cc994c870 Save/restore implicit and TT order indices in VehicleOrderSaver 
Fix implicit/TT order indices being unexpectedly changed by
UpdateOrderDest if an order target is unsuitable.
This could assert UpdateVehicleTimetable
 2021-02-04 21:49:05 +00:00
Jonathan G Rennison
db04bc090e Fix crash when removing unreserved tunnel when realistic braking enabled 2021-02-04 21:09:21 +00:00
Jonathan G Rennison
48395cb2db Fix assert when freeing train reservation from track edit command 2021-02-04 20:54:37 +00:00
Jonathan G Rennison
5283e16946 Fix misspelling of variable name: acceleration_type 2021-02-04 17:20:02 +00:00
Jonathan G Rennison
f4526dbb5f Fix wrong cost when cycling tunnel/bridge signal type with CTRL 2021-02-04 12:14:54 +00:00
Jonathan G Rennison
23651fd550 Fix #214: CmdRemoveSingleSignal removed tunnel/bridge signals in test mode 
Regression from: ed0ffb622
 2021-02-04 12:02:54 +00:00
Jonathan G Rennison
d52eebb829 Set value of cached_uncapped_decel in original acceleration model 
This is to avoid false positive cache mismatch messages
 2021-02-03 21:30:36 +00:00
Jonathan G Rennison
c1f1b5f3b3 Give monorail/maglev larger realistic braking deceleration limits 2021-02-03 21:22:09 +00:00
Jonathan G Rennison
4e1b1bc91e Fix wrong power units used for maglev realistic braking deceleration calc 2021-02-03 20:54:34 +00:00
Jonathan G Rennison
5ac9fa10e1 Fix signal dragging when obstructed by train reservation 2021-02-03 03:37:06 +00:00
Jonathan G Rennison
667001f2ec Fix crash when downgrading road bridge when realistic braking enabled 2021-02-03 02:57:44 +00:00
Jonathan G Rennison
331da334c0 Version: Committing version data for tag: jgrpp-0.40.0 2021-02-02 23:32:38 +00:00
Jonathan G Rennison
be216952cb Fix drag and drop in tracerestrict slot window 2021-02-02 23:32:04 +00:00
Jonathan G Rennison
a9b82b817b Prevent signed overflow of lookahead position 2021-02-02 22:02:44 +00:00
translators
5b3fe4ae27 Update: Translations from eints 
german: 4 changes by Wuzzy2
 2021-02-02 18:17:17 +00:00
Jonathan G Rennison
351cf27719 Use go to location sprite for tracerestrict go to signal button 2021-02-02 16:52:47 +00:00
glx22
144991990e Fix: [CMake] Language files should depend on english.txt 2021-02-02 17:33:18 +01:00
Jonathan G Rennison
650d5e014e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ai/ai_gui.cpp
#	src/company_cmd.cpp
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/hungarian.txt
#	src/lang/korean.txt
#	src/lang/slovak.txt
#	src/main_gui.cpp
#	src/video/sdl2_v.cpp
 2021-02-01 19:34:30 +00:00
Jonathan G Rennison
7154f8859d Merge tag '1.11.0-beta1' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp
 2021-02-01 18:58:36 +00:00
translators
696b6990ea Update: Translations from eints 
estonian: 110 changes by siimsoni
 2021-02-01 18:17:06 +00:00
Jonathan G Rennison
61e7b8c52a Debug: Include vehicle type and unit number in scope_dumper::VehicleInfo 2021-02-01 17:30:41 +00:00
Jonathan G Rennison
b7ddd486cf Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
 2021-02-01 17:07:34 +00:00
translators
069fb54253 Update: Translations from eints 
estonian: 17 changes by siimsoni
german: 410 changes by Wuzzy2
 2021-01-31 18:14:37 +00:00
embeddedt
76a279ef68 Fix: [Emscripten] Pin Dockerfile to emsdk:2.0.10 to prevent patch failure (#8628) 2021-01-31 15:27:17 +01:00
Patric Stout
7fbf705c41 Fix 2db88953: default Network Server List sorter put compatible servers in wrong order (#8626) 
If a server is compatible, it falls back to sorting by clients.
This used to be in reverse, so full servers are on top. With
the codechange commit, this was removed by accident, and as
such empty servers were on top. This is silly.
 2021-01-31 10:36:07 +01:00
Tyler Trahan
1dda7d6486 Fix: don't walk out of the map when trying to build tunnels (#8600) 2021-01-31 10:04:22 +01:00
Jonathan G Rennison
1d1b105299 Fix auto remove signals functionality 2021-01-31 01:46:29 +00:00
Jonathan G Rennison
082d9021d0 Only use more specific texts for money sending where available 2021-01-31 01:46:29 +00:00
Jonathan G Rennison
d978ffcb59 Fix train braking model not being set to original on load 2021-01-31 01:46:29 +00:00
Jonathan G Rennison
f9956d88c3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/company_gui.cpp
#	src/lang/arabic_egypt.txt
#	src/lang/czech.txt
#	src/lang/esperanto.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/malay.txt
#	src/lang/polish.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/unfinished/urdu.txt
#	src/main_gui.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings.ini
 2021-01-31 01:11:12 +00:00
Jonathan G Rennison
43b0ddc558 Use tile railtype for curve speed look ahead 
See: 0f91cb04
 2021-01-31 01:08:47 +00:00
Jonathan G Rennison
6c3e5642f8 Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
 2021-01-31 01:08:35 +00:00
Patric Stout
0e54c32452 Codechange: [SDL2] Use MakeDirty() to force a redraw 
The original code is "strictly correct", but just reads really
weird, and we use MakeDirty() in several other places instead too.
 2021-01-30 21:43:59 +01:00
Patric Stout
30e69c518b Codechange: [SDL2] Rework how palette is updated 
It now follows more what the Win32 driver does, and has far less
exceptions and special casing.

MakePalette creates the Palette and prepares surface.
UpdatePalette updates the Palette.
CheckPaletteAnim checks if UpdatePalette needs to be called and
  marks the whole screen dirty so DrawSurfaceToScreen will do a
  full redraw.
 2021-01-30 21:43:59 +01:00
Patric Stout
eb80fefd1d Fix: [SDL2] Display why SDL_CreateWindow() failed in case it does 
All SDL_NNN errors print SDL_GetError, except for this one place.
 2021-01-30 21:43:59 +01:00
Patric Stout
19345908cb Codechange: [SDL2] Split away CreateMainWindow from CreateMainSurface 
This makes the code a bit more readable, as both intentions are
more clear, and there is less nesting in the main function.
 2021-01-30 21:43:59 +01:00
Patric Stout
8c37e5c526 Codechange: [SDL2] reworked the different surfaces to make it more readable 2021-01-30 21:43:59 +01:00
Patric Stout
8de325f256 Codechange: [SDL2] Only prepare "caption" if you are going to us it 2021-01-30 21:43:59 +01:00
Patric Stout
e41ec5b42e Codechange: [SDL2] Minor code cleanup to remove silly variable 2021-01-30 21:43:59 +01:00
Patric Stout
678031f9b3 Codechange: [SDL2] Only set _cur_palette, never _local_palette 2021-01-30 21:43:59 +01:00
Patric Stout
f31b65825f Codechange: [SDL2] Move FindStartupDisplay to its own function 2021-01-30 21:43:59 +01:00
Patric Stout
6916fc76bd Codechange: [SDL2] reworked FindResolutions to be more like the rest 
There was no default resolution fallback, and the code was different
from the win32 driver. It is now named the same and much more
similar.
 2021-01-30 21:43:59 +01:00
Patric Stout
a52d716c88 Codechange: [SDL2] remove include-protection 
This is already done by CMake: if SDL2 is not detected, this file
is not included.
 2021-01-30 21:43:59 +01:00
Jonathan G Rennison
33d9e48bcf Add setting for inflation dates mode 2021-01-30 19:59:00 +00:00
Jonathan G Rennison
39df1c49a1 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fileio.cpp
#	src/group_gui.cpp
#	src/industry.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.cpp
#	src/linkgraph/linkgraphschedule.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/town_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
 2021-01-30 18:27:35 +00:00
translators
5ae2c1552b Update: Translations from eints 
estonian: 353 changes by siimsoni
 2021-01-30 18:14:36 +00:00
Jonathan G Rennison
7cf4621b1c Merge branch 'master' into jgrpp 2021-01-30 14:01:54 +00:00
Jonathan G Rennison
c4f63661bb Revert "Feature #7962: Improve rendering of large viewports" 
This reverts commit e82333cf77.
 2021-01-30 14:01:37 +00:00