191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
6 years ago
80d6f6c622
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
6 years ago
d8ccad91f9
Fix: Some code and comment typos
...
Found with codespell
6 years ago
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
6 years ago
4a162c5502
Merge branch 'cpp-11' into save_ext
6 years ago
0bed63b77f
Merge branch 'master' into cpp-11
6 years ago
59fe4f28c8
Change: Animate text effects by real time instead of game ticks.
6 years ago
ead9c9eab5
Change: Switch various window timers to real time instead of game ticks.
6 years ago
2a8fa5fef9
Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks.
6 years ago
a0293d313d
Add #4115 : default company colour setting ( #6998 )
...
Works only in single player.
6 years ago
0dba091d79
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# config.lib
# src/saveload/saveload.cpp
6 years ago
962a9c5430
Merge branch 'master' into cpp-11
...
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/saveload/saveload.cpp
6 years ago
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
4703cd433d
Fix #6460 : [AI] Add start_date parameter for Random AIs on new game
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
3a640af71d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ground_vehicle.cpp
# src/viewport.cpp
6 years ago
50efaa2372
Fix e00908f: Visual C++ 2015 compile error
...
Microsoft Visual C++ 2015 Update 3 (and possibly other versions) consider a struct member undefined in a
static_assert in the struct body. Moving the static_assert to a member function solves the issue.
6 years ago
e00908f5e9
Fix #6898 : Replace atoi() with strtoul()
...
Normalize type and parsing of generation_seed across all files
Add assert_compile() to ensure correct type
6 years ago
3d60f2a4cf
Merge branch 'crashlog_improvements' into jgrpp
6 years ago
743432e7f0
Try to do non-main thread crash save/screenshot in main thread
6 years ago
9490f33a6c
Merge branch 'master' into crashlog_improvements
...
# Conflicts:
# src/console_cmds.cpp
# src/openttd.cpp
# src/vehicle.cpp
6 years ago
5661763d6a
Merge branch 'crashlog_improvements' into jgrpp
6 years ago
7f027f8dca
Add tile info dump function and assert variants
6 years ago
035f5622b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
6 years ago
2a868b9f3b
Feature: Framerate display window ( #6822 )
...
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
6 years ago
373ff3dd4e
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/table/settings.h.preamble
6 years ago
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
6 years ago
6298b96571
Change: Modernise music control logic implementation ( #6839 )
...
Rewrite of almost the entire music control logic to a more modern style, hopefully also easier to understand. The old playlist handling made it look like arcane magic, which it doesn't have to be.
- Playlists are now stored in std::vector of objects instead of arrays of bytes with magic sentinel values, that need to be rotated around all the time. Position in playlist is stored as a simple index.
- The theme song is now reserved for the title screen, it doesn't play on any of the standard playlists, but is still available for use on custom playlists.
- When the player enters/leaves the game from the main menu, the music always restarts.
- Playback state (playing or not) is kept even if music becomes unavailable due to an empty playlist (or an empty music set), so it can restart immediately if music becomes available again.
- The shuffle algorithm was changed to a standard Fisher-Yates.
- Possibly better behavior when editing a custom playlist while it's playing.
- Custom playlists should be compatible.
- Framework for supporting custom playlists with songs from multiple music sets.
6 years ago
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
6342099c4d
Allow 256 NewGRFs in multiplayer
...
Add extended network format for server info
Add general UDP packet fragmentation system
Fix map dimensions >= 64k
Increase length of server revision string
Maintain backwards compatibility with trunk for advertisement/server listing
6 years ago
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
6 years ago
aef69443e7
Remove: WinCE support
6 years ago
85adde7485
Remove: PSP support
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
4bcd05a620
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# findversion.sh
6 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
6 years ago
b90c5b9618
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
6 years ago
e8de33a61f
Cleanup: Use new filename for README file. ( #6738 )
6 years ago
8c0c9274ea
Merge branch 'infrastructure_sharing' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/misc.cpp
# src/openttd.cpp
# src/saveload/extended_ver_sl.cpp
7 years ago
9000d74f3c
Pay all cargo payment incomes when cargo finally delivered
7 years ago
38fb8c1b84
Zoning: Cache expensive zoning overlay values
7 years ago
e54a7189fd
Add debug command line switch to quit after fixed number of days
7 years ago
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
f3a0aace0c
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
3813b3ca09
Dump infrastructure totals when mismatch detected in CheckCaches.
7 years ago
2fbeb29277
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# src/misc.cpp
# src/openttd.cpp
7 years ago
349ddd90b7
Maintain a circular buffer of recent commands, add to crashlog.
...
Add console command to dump command log.
Increase max crashlog size.
7 years ago
3b45419a16
Merge branch 'master' into save_ext
8 years ago
90cd312428
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios.h
8 years ago
7b553d255e
(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.
8 years ago
050271ed2d
(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.
8 years ago
20a090b077
Show warning dialog if NewGRFs use too many string IDs.
...
Show when reloading/changing NewGRF config, or starting new game.
8 years ago
f82feb160f
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/misc.cpp
# src/openttd.cpp
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
556594f2f0
Extend bridge signal simulation to support an unlimited no. of signals.
...
This is instead of the previous limit of 16, all stored in M2.
8 years ago
ae8e19cf9a
Merge branch 'save_ext' into jgrpp
8 years ago
d124089d29
Add extended version tag and feature versions to output of -q.
8 years ago
375b069f82
Replace day length scaled tick macros with global variables.
...
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
8 years ago
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
8 years ago
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
0b7d68a6d1
Add support for verbose asserts.
...
(cherry picked from commit 48e4c35fdc
8 years ago
0adfb1ac6f
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
f286ba8db2
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
6f201ce4a8
(svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload.
8 years ago
e735bbebce
(svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload.
8 years ago
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
75ad6d0100
(svn r27647) -Codechange: Introduce file operations, and use it to replace most of SaveLoadDialogMode
8 years ago
ec2b2fad58
(svn r27647) -Codechange: Introduce file operations, and use it to replace most of SaveLoadDialogMode
8 years ago
0bf3372882
(svn r27640) -Codechange: Remove another use of _saveload_mode in the loading code.
8 years ago
c530f89761
(svn r27640) -Codechange: Remove another use of _saveload_mode in the loading code.
8 years ago
2fa0fdb176
(svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function.
8 years ago
e78627f2f1
(svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function.
8 years ago
df421a55bb
Fix air cache being leaked in CheckCaches.
8 years ago
26fa77c5ee
Run animations at the normal rate regardless of day length factor.
8 years ago
5dba89c783
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# source.list
# src/openttd.cpp
# src/stdafx.h
# src/vehicle.cpp
8 years ago
e89efa8581
Add a function to test whether the current thread is the main thread.
8 years ago
48e4c35fdc
Add support for verbose asserts.
...
Use for test/exec DoCommand mismatches.
8 years ago
f6a8f27501
Make server and all clients run desync checks if a client desyncs.
9 years ago
69c89c4881
Check caches at desync level 1, every 500 ticks.
...
Also check aircraft cache.
9 years ago
8cc6bddc24
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
Conflicts:
src/misc.cpp
9 years ago
919057a5e6
Cache tunnel info in viewport map mode, to prevent render flicker.
...
If we see a tunnel during the usual tile scan, keep it in the cache
until it is explicitly evicted by a clear tunnel tile action, or
the cache is cleared at game init/load/shutdown.
Select colours at the drawing rather than the cache-building stage.
Bridges and tunnels are now stored/handled separately.
The process for bridges is mostly unchanged.
9 years ago
ee87b1d7d3
Pause on savegame load if ctrl key is pressed.
9 years ago
66cd454c37
Merge branch 'day_length-sx' into jgrpp
9 years ago
26d0eb041d
Increase thoroughness of vehicle and YAPF cache desync debug checks.
9 years ago
f03cd98d04
Check/print tick skip counter in desync and random logging.
9 years ago
8b994e255d
Merge branch 'extra_large_maps-sx' into jgrpp
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
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
9 years ago
7d2b4bd3ea
Import extra large maps patch.
...
http://www.tt-forums.net/viewtopic.php?f=33&t=33137
9 years ago
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.
9 years ago
9565e5b9b1
Merge branch 'day_length-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/timetable_cmd.cpp
9 years ago
d86a56cbef
Import day length patch
...
Minor whitespace fixes.
http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
b6a1866ded
Merge branch 'max_grfs' into jgrpp
9 years ago
8f5ef2ae01
Import and rebase Max NewGRFs patch
...
Fix trailing whitespace, clean up code a bit
http://www.tt-forums.net/viewtopic.php?p=894743#p894743
9 years ago
2bcbeea011
Merge branch 'progsig-sx' into jgrpp
...
Conflicts:
src/command.cpp
src/command_type.h
src/lang/english.txt
src/rail_cmd.cpp
src/rail_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/widgets/rail_widget.h
src/window_type.h
9 years ago
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
5f1b148cf9
Initial minimal working tracerestrict implementation.
...
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
9 years ago
876d87097a
(svn r26828) -Fix: memory leak when passing -c multiple times
10 years ago
2485b40cdd
(svn r26828) -Fix: memory leak when passing -c multiple times
10 years ago
db47d62069
(svn r26729) -Feature: Warn about missing industries after generating a map.
10 years ago
87dd209784
(svn r26729) -Feature: Warn about missing industries after generating a map.
10 years ago
beb540ec55
(svn r26538) -Codechange: remove double accounting of the drivers
10 years ago
b476086c39
(svn r26538) -Codechange: remove double accounting of the drivers
10 years ago
b2c786ea68
(svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes.
...
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
10 years ago
631e8b45fd
(svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes.
...
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
10 years ago
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
b886c8db8c
(svn r26506) -Codechange: replace most of vsnprintf with vseprintf
10 years ago
e61fe21237
(svn r26506) -Codechange: replace most of vsnprintf with vseprintf
10 years ago
6ecc602050
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
5b82822c12
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
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
0463dbdc9e
(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
8771a19768
(svn r26371) -Fix [FS#5831]: Calling DoCommandP during the gameloop cleared pending persistent storage changes.
11 years ago
a32d18cbb9
(svn r26371) -Fix [FS#5831]: Calling DoCommandP during the gameloop cleared pending persistent storage changes.
11 years ago
3403ade478
(svn r26369) -Fix-ish: Do not run scripts during command replay.
11 years ago
e9f7103ad7
(svn r26369) -Fix-ish: Do not run scripts during command replay.
11 years ago
cce01f8104
(svn r26326) -Fix [FS#5871]: when autosaving the message about a save already happening could be shown, even though the code's intention was to not show it (MJP)
11 years ago
a4941e759c
(svn r26326) -Fix [FS#5871]: when autosaving the message about a save already happening could be shown, even though the code's intention was to not show it (MJP)
11 years ago
eb6974179d
(svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to.
11 years ago
41b7a04a68
(svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to.
11 years ago
4a911754b5
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
2618d960e3
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
5156c3731b
(svn r26205) -Feature: SSE 4.1 sprite sorter, improving the sorting performance significantly (MJP)
...
For example with GCC 4.8, x86_64 Linux, Intel i5-3337U this patch improves the performance of Pile, Treham and Hamac test save games by about 10% in over-all run time at fast forward at 1920x1080 when zoomed out and when trees are not disabled.
11 years ago
3c94485ba0
(svn r26205) -Feature: SSE 4.1 sprite sorter, improving the sorting performance significantly (MJP)
...
For example with GCC 4.8, x86_64 Linux, Intel i5-3337U this patch improves the performance of Pile, Treham and Hamac test save games by about 10% in over-all run time at fast forward at 1920x1080 when zoomed out and when trees are not disabled.
11 years ago
35ecb9db3f
(svn r26174) -Codechange: Rename BaseStorageArray to BasePersistentStorageArray
11 years ago
eca86d1baf
(svn r26174) -Codechange: Rename BaseStorageArray to BasePersistentStorageArray
11 years ago
f843a0b5d9
(svn r26107) -Codechange/cleanup: remove some coding bloat and simplify the driver factory instatiations
11 years ago
6996b441d9
(svn r26107) -Codechange/cleanup: remove some coding bloat and simplify the driver factory instatiations
11 years ago
cd2f85cfdb
(svn r26099) -Codechange: make NewGRF scanner management slightly easier
11 years ago
2009da4f7d
(svn r26099) -Codechange: make NewGRF scanner management slightly easier
11 years ago
f9300ba6a2
(svn r26098) -Fix: close the log file when OpenTTD was forked and finally closed
11 years ago
43edd2409e
(svn r26098) -Fix: close the log file when OpenTTD was forked and finally closed
11 years ago
2b3d476efc
(svn r26097) -Fix: another minor memory leak (when pressing cancel in the bootstrap window)
11 years ago
ee0aa389a8
(svn r26097) -Fix: another minor memory leak (when pressing cancel in the bootstrap window)
11 years ago
4e34aae523
(svn r26091) -Fix (r26089): double frees... woospie
11 years ago
4de2871fc0
(svn r26091) -Fix (r26089): double frees... woospie
11 years ago
d9a3177862
(svn r26089) -Fix: a number of minor memory leaks
11 years ago
0ac9ed0b6b
(svn r26089) -Fix: a number of minor memory leaks
11 years ago
6bb4748558
(svn r25570) -Add: cache for ParagraphLayouts.
11 years ago
d0eff986be
(svn r25570) -Add: cache for ParagraphLayouts.
11 years ago
6272a35c0a
(svn r25553) -Fix [FS#5530]: provide a warning when no vehicles are available, and tell what to do in that case
11 years ago
1efc64fa7d
(svn r25553) -Fix [FS#5530]: provide a warning when no vehicles are available, and tell what to do in that case
11 years ago
17951f57a5
(svn r25506) -Document: a function, and name it slightly better
11 years ago
5b2a5ac790
(svn r25506) -Document: a function, and name it slightly better
11 years ago
97a9908b0e
(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes
11 years ago
c32eea02dd
(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes
11 years ago
Jonathan G Rennison
nikolas
Peter Nelson
Gabda87
glx
SamuXarick
Charles Pigott
Niels Martin Hansen
Miguel Horta
Patric Stout
Ricardo N Feliciano
frosch
alberth
patch-import
rubidium
fonsinchen