Commit Graph

2102 Commits

Author SHA1 Message Date
Jonathan G Rennison
0773dde669 Merge pull request #287 from VacuumBreather/advanced_train_purchase_window
Advanced train purchase window
2021-06-29 00:43:26 +01:00
Jonathan G Rennison
5e418128da Add setting for whether to use dual pane train purchase window 2021-06-29 00:11:07 +01:00
reldred
0eb32a55f9 change the tree line width for arctic tree line patch from 20 to 64 2021-06-20 11:25:12 +01:00
Andreas Schmitt
3b4cbd3323 Improve tree placement
Prior to this change, trees tended to either cover the entire map like an ancient forest, or alternatively you turn off their growth which breaks industry. Furthermore there are these ugly random tree clumps at the beginning of the game which look like squares on the map someone placed there.

This change adds a new tree placing setting which removes the ugly random clumps and only slightly modifies the initial placement. The actual growth causes trees to bunch up in higher levels as usual but on the lower 4 levels their growth works differently. The number of trees per tile is limited and the trees spread out over a wider area instead of only to the neighboring tile. That spreads them out more and makes for a nicer look.

This also allows cacti to spread, since they can now use that same algorithm and avoid bunching up, but spread as they should.
2021-06-19 13:56:05 +01:00
Jonathan G Rennison
ac9749d015 Merge PR #283 (max city height) into jgrpp 2021-06-19 13:37:21 +01:00
Jonathan G Rennison
24834c86f7 Allow changing max town height level setting in-game (for town founding) 2021-06-19 13:33:39 +01:00
Andreas Schmitt
5fe1963feb Lower minimum to 2 2021-06-19 13:23:19 +01:00
Andreas Schmitt
a17efcd7d5 Introduce setting for a max height level for towns
Prior to this change, the game tended to place towns on mountain tops. Realistic heightmaps had limitations because of this.

This change allows the player to specify that the towns should be generated in the valleys.
2021-06-19 13:23:19 +01:00
Jonathan G Rennison
3a67065332 Add a build public roads button to the scenario editor 2021-06-19 13:11:03 +01:00
Jonathan G Rennison
e46fb1aa99 Fix loading of build public roads setting from JokerPP savegames 2021-06-19 13:02:36 +01:00
Andreas Schmitt
150e502cf9 Add generation of public roads linking towns 2021-06-19 13:02:36 +01:00
Andreas Schmitt
d718ba62ef Add option to sort tracks by category and speed (#282) 2021-06-17 19:08:59 +01:00
Andreas Schmitt
ec40677fdc Add a setting to turn off road vehicle slowdown in curves
Prior to this change, road vehicles would always slowdown in curves. This forces the player to build grid like roads. With new height levels and more mountainous maps and in the absense of diagonal roads this causes unnecessary pain. It should be an option to turn this off, so mountainous maps and curvy roads are not punishing the player unnecessarily. Nobody wants to build grid like roads outside of towns.
2021-06-17 17:10:26 +01:00
Jonathan G Rennison
0b80461cd4 Merge branch 'pr-270' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/settings_type.h
#	src/table/settings.ini
2021-06-15 19:32:54 +01:00
Jonathan G Rennison
696fb746b7 Add setting for demolition confirmation mode 2021-06-15 18:46:12 +01:00
Jonathan G Rennison
3392d25aa3 Merge PR #274 into jgrpp 2021-06-15 02:01:22 +01:00
Jonathan G Rennison
1cc8053003 Add setting to control station rating tooltip detail level
Default to simple
2021-06-15 02:00:58 +01:00
Jonathan G Rennison
8485ed724b Add {PLUS_NUM} string code which includes leading + for positive values 2021-06-14 22:55:26 +01:00
Jonathan G Rennison
2cd1740c01 Merge PR #268 into jgrpp 2021-06-14 00:53:59 +01:00
Jonathan G Rennison
fd4b5cc083 Add buttons to cargo payment graph to select x-axis
Save in misc settings
2021-06-14 00:52:46 +01:00
Jonathan G Rennison
f438daa0bc Use localised units for payment graph X axis
Match quantities in graph title
2021-06-13 23:57:14 +01:00
Jonathan G Rennison
229f856327 Merge PR #275 into jgrpp 2021-06-13 11:50:54 +01:00
Andreas Schmitt
da4de2c959 Improve lake generation
Prior to this change, lakes could be very small and could also not be deactivated.

This change allows the deactivation of lake creation and the lake size is now the set size +- 25% instead of anything between 0 and lake_size.
2021-06-13 08:15:43 +02:00
Jonathan G Rennison
7aa63e9726 Update status bar sizing when changing date/time display settings 2021-06-10 22:12:10 +01:00
Jonathan G Rennison
a7d8c6fe0c Add PF setting for whether to pathfind up to back of one-way PBS 2021-06-09 20:43:57 +01:00
Jonathan G Rennison
900a93ac59 Debug: Add sprite dumping to vehicle debug windows 2021-05-21 19:36:19 +01:00
PeterN
dcb0cc2c52 Fix #9186: Fix incorrect bounding box height causing station sprite glitch. (#9187)
Increased height of small station building bounding box to cover the build rather than just the platform.

(cherry picked from commit ba193f2e23)
2021-05-21 18:29:45 +01:00
Jonathan G Rennison
3e8ee4f49f Remove "Disable vehicle image update" setting 2021-05-19 20:42:04 +01:00
Jonathan G Rennison
a15e26f369 NewGRF: Elide unmasked vehicle callbacks where possible
This includes:
* CBID_VEHICLE_32DAY_CALLBACK
* CBID_VEHICLE_REFIT_COST
* CBID_VEHICLE_MODIFY_PROPERTY
  This is on a per-property basis

The main benefit of this is to avoid callbacks not handled by the
vehicle's current sprite group from using the full graphics chain as
the "default" branch in the callback switch.
In the case where the graphics chain is long/expensive, a lot of work
had to be done before a callback failure result was eventually returned.
2021-05-18 19:07:44 +01:00
Jonathan G Rennison
a9515456cb Merge branch 'master' into jgrpp
# Conflicts:
#	src/network/core/os_abstraction.h
#	src/network/core/tcp_content.h
#	src/network/core/udp.cpp
#	src/table/currency_settings.ini
#	src/table/settings.h.preamble
2021-05-03 21:59:49 +01:00
rubidium42
b54d8a49fb Feature: allow non-ASCII currency separators 2021-04-27 19:41:51 +02:00
Jonathan G Rennison
8eb27e1ac7 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/lang/japanese.txt
#	src/network/core/config.h
#	src/network/core/packet.cpp
#	src/network/core/tcp.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui_base.h
2021-04-25 22:14:59 +01:00
Jonathan G Rennison
ba418f9d0d Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/simplified_chinese.txt
#	src/network/core/tcp_content.cpp
#	src/network/core/udp.cpp
#	src/network/network_server.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/table/gameopt_settings.ini
2021-04-25 01:23:52 +01:00
Jonathan G Rennison
e3193e7b9e Fix #248: Crash in debug window -> parent button for non-GRF industries 2021-04-25 00:12:57 +01:00
Patric Stout
fda1a590f6 Change: use icons to indicate you/host in Online Players GUI 2021-04-24 21:43:58 +02:00
Patric Stout
5266359424 Feature: rework in-game Online Players GUI
The GUI now more clearly shows some basic information about the
server you joined, your client name (and the ability to change it),
and what players are in which company.

It also contains useful buttons to press to join companies, chat
with other people, and for admins to kick/ban people.

Additionally, renamed "advertised" to "visibility"; this has to
do with future additions, but also because it is more clear in
wording.
2021-04-24 21:43:58 +02:00
Jonathan G Rennison
c14dcdadaf Debug: Log town growth fields in town debug window 2021-04-24 01:05:07 +01:00
Patric Stout
05612d60ae Remove: "language" field from server/client
The original idea was that people could find a server they could
talk in their native language on. This isn't really used in that
way. There are several reasons for removing this:

- the client also sends his "language" to the server, but nothing
  is doing anything with this.
- flags are a bad way to represent languages, and over the years
  we had several (rightfully) complaints about this.
- most servers have their language set to "All", and prefix the
  servername with the language it is about. This is a much more
  efficient way to do the same.

All in all, this feature should go back to the drawing board.
Maybe it could work in another form, but this form is not it.
2021-04-20 17:24:38 +02:00
Jonathan G Rennison
1fd620fd1f Debug: Show untranslated house IDs in debug window 2021-04-19 22:47:55 +01:00
Jonathan G Rennison
6a62b94263 Add NewGRF railtype flag to disable realistic braking for vehs of that type
See: #242
2021-04-15 20:56:45 +01:00
Jonathan G Rennison
ba2e6087b2 Add train cache flag for whether train using realistic braking physics 2021-04-15 20:56:45 +01:00
Jonathan G Rennison
b514d29db1 Replace TrainCache::cached_tilt with a flags field 2021-04-15 20:56:45 +01:00
reldred
d1d27c0748 Adds additional zone configuration for cities, renames existing zone configuration to towns. 2021-04-12 17:44:18 +01:00
Jonathan G Rennison
272e583478 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/korean.txt
#	src/settings.cpp
2021-04-12 00:22:13 +01:00
Jonathan G Rennison
d484c32d44 Reduce sensitivity of train overheated breakdown 2021-04-11 22:53:02 +01:00
Patric Stout
f0f2073006 Feature: allow a toggle to enable/disable vsync
Vsync should be off by default, as for most players it will be
better to play without vsync. Exception exist, mainly people who
play in fullscreen mode.
2021-04-11 14:26:00 +02:00
Jonathan G Rennison
227041008f Merge branch 'master' into jgrpp
# Conflicts:
#	src/debug.cpp
#	src/lang/russian.txt
#	src/misc_gui.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_cmd.cpp
#	src/window_gui.h
2021-04-11 03:05:08 +01:00
Jonathan G Rennison
f39b6f4ba3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/cheat_gui.cpp
#	src/genworld_gui.cpp
#	src/landscape.cpp
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/screenshot.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings.ini
#	src/tile_type.h
#	src/widgets/genworld_widget.h
2021-04-10 18:29:36 +01:00
frosch
c6781cbd44 Fix d4c3d01d: add plural form 14 to strgen. (#8999) 2021-04-10 18:09:04 +02:00
Niels Martin Hansen
49d370185b Change: Default music and sound effects volume to be lower 2021-04-09 12:18:52 +02:00