Jonathan G Rennison
d5ee9d34da
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# projects/determineversion.vbs
# source.list
# src/crashlog.cpp
# src/misc.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rev.h
# src/thread/thread.h
# src/thread/thread_morphos.cpp
# src/thread/thread_none.cpp
# src/thread/thread_os2.cpp
# src/thread/thread_pthread.cpp
# src/thread/thread_win32.cpp
5 years ago
Jonathan G Rennison
7f80884047
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
5 years ago
Jonathan G Rennison
01261daec0
Merge branch 'master' into cpp-11
...
# Conflicts:
# config.lib
5 years ago
Michael Lutz
05bc2ed7cb
Codechange: Replace custom thread code with C++11 thread objects.
...
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
5 years ago
Michael Lutz
05f4e73608
Codechange: Replace custom mutex code with C++11 mutex'es.
...
A conforming compiler with a valid <mutex>-header is expected.
Most parts of the code assume that locking a mutex will never fail unexpectedly,
which is generally true on all common platforms that don't just pretend to
be C++11. The use of condition variables in driver code is checked.
5 years ago
Jonathan G Rennison
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
Henry Wilson
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
Henry Wilson
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
Henry Wilson
097328c3d7
Codechange: Replaced SmallVector::Get() const with std alternatives
5 years ago
Patric Stout
e3c639a09f
Remove: ENABLE_NETWORK switch
...
This switch has been a pain for years. Often disabling broke
compilation, as no developer compiles OpenTTD without, neither do
any of our official binaries.
Additionaly, it has grown so hugely in our codebase, that it
clearly shows that the current solution was a poor one. 350+
instances of "#ifdef ENABLE_NETWORK" were in the code, of which
only ~30 in the networking code itself. The rest were all around
the code to do the right thing, from GUI to NewGRF.
A more proper solution would be to stub all the functions, and
make sure the rest of the code can simply assume network is
available. This was also partially done, and most variables were
correct if networking was disabled. Despite that, often the #ifdefs
were still used.
With the recent removal of DOS, there is also no platform anymore
which we support where networking isn't working out-of-the-box.
All in all, it is time to remove the ENABLE_NETWORK switch. No
replacement is planned, but if you feel we really need this option,
we welcome any Pull Request which implements this in a way that
doesn't crawl through the code like this diff shows we used to.
5 years ago
Charles Pigott
fe448a2616
Remove: OPF
5 years ago
Jonathan G Rennison
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
5 years ago
Patric Stout
7784d77713
Remove: MorphOS / AmigaOS support
...
In 10 years there is no commit to change how MorphOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), MorphOS is no longer
support. There is an SDL2 port for MorphOS, but it is not maintained
by upstream SDL2, and nobody can currently test it out.
If anyone wants to re-add MorphOS, please do (revert this patch,
fix the problems, and create a Pull Request). If you need any help
doing so, let us know! It is not that we don't like MorphOS, it is
that we don't have anyone fixing the problems :(
5 years ago
Jonathan G Rennison
7ff252c58d
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
5 years ago
Niels Martin Hansen
7e1e2756d4
Add: Show performance of AI and GS in framerate window
5 years ago
Jonathan G Rennison
2142452305
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/gamelog.cpp
# src/gamelog_internal.h
# src/lang/german.txt
# src/lang/korean.txt
# src/network/core/config.h
# src/network/network.cpp
# src/network/network_udp.cpp
# src/rev.h
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
# src/viewport.cpp
5 years ago
Jonathan G Rennison
46b5b0155c
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
5 years ago
Jonathan G Rennison
09c62d6951
Merge branch 'master' into cpp-11
5 years ago
Peter Nelson
0f37a683a2
Codechange: Additional type safety for saveload version variables.
5 years ago
Jonathan G Rennison
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
5 years ago
glx
ba38a7ca65
Fix: don't show OS error box for non GUI video drivers
5 years ago
Jonathan G Rennison
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
5 years ago
Jonathan G Rennison
698409381e
Cache viewport station/waypoint sign infomation
5 years ago
Jonathan G Rennison
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
5 years ago
Jonathan G Rennison
80d6f6c622
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
5 years ago
nikolas
d8ccad91f9
Fix: Some code and comment typos
...
Found with codespell
5 years ago
Jonathan G Rennison
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
5 years ago
Jonathan G Rennison
4a162c5502
Merge branch 'cpp-11' into save_ext
5 years ago
Jonathan G Rennison
0bed63b77f
Merge branch 'master' into cpp-11
5 years ago
Peter Nelson
59fe4f28c8
Change: Animate text effects by real time instead of game ticks.
5 years ago
Peter Nelson
ead9c9eab5
Change: Switch various window timers to real time instead of game ticks.
5 years ago
Peter Nelson
2a8fa5fef9
Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks.
5 years ago
Gabda87
a0293d313d
Add #4115 : default company colour setting ( #6998 )
...
Works only in single player.
5 years ago
Jonathan G Rennison
0dba091d79
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# config.lib
# src/saveload/saveload.cpp
5 years ago
Jonathan G Rennison
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
5 years ago
Jonathan G Rennison
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
5 years ago
glx
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
5 years ago
Jonathan G Rennison
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
SamuXarick
4703cd433d
Fix #6460 : [AI] Add start_date parameter for Random AIs on new game
6 years ago
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
Jonathan G Rennison
3a640af71d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ground_vehicle.cpp
# src/viewport.cpp
6 years ago
Niels Martin Hansen
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
Miguel Horta
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
Jonathan G Rennison
3d60f2a4cf
Merge branch 'crashlog_improvements' into jgrpp
6 years ago
Jonathan G Rennison
743432e7f0
Try to do non-main thread crash save/screenshot in main thread
6 years ago
Jonathan G Rennison
9490f33a6c
Merge branch 'master' into crashlog_improvements
...
# Conflicts:
# src/console_cmds.cpp
# src/openttd.cpp
# src/vehicle.cpp
6 years ago
Jonathan G Rennison
5661763d6a
Merge branch 'crashlog_improvements' into jgrpp
6 years ago
Jonathan G Rennison
7f027f8dca
Add tile info dump function and assert variants
6 years ago
Jonathan G Rennison
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
Niels Martin Hansen
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
Jonathan G Rennison
373ff3dd4e
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/table/settings.h.preamble
6 years ago
Jonathan G Rennison
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
Niels Martin Hansen
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
Jonathan G Rennison
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
Jonathan G Rennison
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
Jonathan G Rennison
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
Patric Stout
aef69443e7
Remove: WinCE support
6 years ago
Patric Stout
85adde7485
Remove: PSP support
6 years ago
Jonathan G Rennison
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
Jonathan G Rennison
4bcd05a620
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# findversion.sh
6 years ago
Jonathan G Rennison
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
6 years ago
Jonathan G Rennison
b90c5b9618
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
6 years ago
Ricardo N Feliciano
e8de33a61f
Cleanup: Use new filename for README file. ( #6738 )
6 years ago
Jonathan G Rennison
8c0c9274ea
Merge branch 'infrastructure_sharing' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/misc.cpp
# src/openttd.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
Jonathan G Rennison
9000d74f3c
Pay all cargo payment incomes when cargo finally delivered
6 years ago
Jonathan G Rennison
38fb8c1b84
Zoning: Cache expensive zoning overlay values
6 years ago
Jonathan G Rennison
e54a7189fd
Add debug command line switch to quit after fixed number of days
6 years ago
Jonathan G Rennison
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
Jonathan G Rennison
f3a0aace0c
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
Jonathan G Rennison
3813b3ca09
Dump infrastructure totals when mismatch detected in CheckCaches.
7 years ago
Jonathan G Rennison
2fbeb29277
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# src/misc.cpp
# src/openttd.cpp
7 years ago
Jonathan G Rennison
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
Jonathan G Rennison
3b45419a16
Merge branch 'master' into save_ext
7 years ago
Jonathan G Rennison
90cd312428
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios.h
7 years ago
frosch
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.
7 years ago
frosch
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.
7 years ago
Jonathan G Rennison
20a090b077
Show warning dialog if NewGRFs use too many string IDs.
...
Show when reloading/changing NewGRF config, or starting new game.
8 years ago
Jonathan G Rennison
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
Jonathan G Rennison
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
Jonathan G Rennison
ae8e19cf9a
Merge branch 'save_ext' into jgrpp
8 years ago
Jonathan G Rennison
d124089d29
Add extended version tag and feature versions to output of -q.
8 years ago
Jonathan G Rennison
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
Jonathan G Rennison
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
8 years ago
Jonathan G Rennison
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison
0b7d68a6d1
Add support for verbose asserts.
...
(cherry picked from commit 48e4c35fdc
)
8 years ago
alberth
0adfb1ac6f
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
alberth
f286ba8db2
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
alberth
6f201ce4a8
(svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload.
8 years ago
alberth
e735bbebce
(svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload.
8 years ago
alberth
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
alberth
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
alberth
75ad6d0100
(svn r27647) -Codechange: Introduce file operations, and use it to replace most of SaveLoadDialogMode
8 years ago
alberth
ec2b2fad58
(svn r27647) -Codechange: Introduce file operations, and use it to replace most of SaveLoadDialogMode
8 years ago
alberth
0bf3372882
(svn r27640) -Codechange: Remove another use of _saveload_mode in the loading code.
8 years ago
alberth
c530f89761
(svn r27640) -Codechange: Remove another use of _saveload_mode in the loading code.
8 years ago
alberth
2fa0fdb176
(svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function.
8 years ago
alberth
e78627f2f1
(svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function.
8 years ago
Jonathan G Rennison
df421a55bb
Fix air cache being leaked in CheckCaches.
8 years ago
Jonathan G Rennison
26fa77c5ee
Run animations at the normal rate regardless of day length factor.
8 years ago
Jonathan G Rennison
5dba89c783
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# source.list
# src/openttd.cpp
# src/stdafx.h
# src/vehicle.cpp
8 years ago
Jonathan G Rennison
e89efa8581
Add a function to test whether the current thread is the main thread.
8 years ago
Jonathan G Rennison
48e4c35fdc
Add support for verbose asserts.
...
Use for test/exec DoCommand mismatches.
8 years ago
Jonathan G Rennison
f6a8f27501
Make server and all clients run desync checks if a client desyncs.
9 years ago
Jonathan G Rennison
69c89c4881
Check caches at desync level 1, every 500 ticks.
...
Also check aircraft cache.
9 years ago
Jonathan G Rennison
8cc6bddc24
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
Conflicts:
src/misc.cpp
9 years ago
Jonathan G Rennison
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
Jonathan G Rennison
ee87b1d7d3
Pause on savegame load if ctrl key is pressed.
9 years ago
Jonathan G Rennison
66cd454c37
Merge branch 'day_length-sx' into jgrpp
9 years ago
Jonathan G Rennison
26d0eb041d
Increase thoroughness of vehicle and YAPF cache desync debug checks.
9 years ago
Jonathan G Rennison
f03cd98d04
Check/print tick skip counter in desync and random logging.
9 years ago
Jonathan G Rennison
8b994e255d
Merge branch 'extra_large_maps-sx' into jgrpp
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
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
9 years ago
patch-import
7d2b4bd3ea
Import extra large maps patch.
...
http://www.tt-forums.net/viewtopic.php?f=33&t=33137
9 years ago
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.
9 years ago
Jonathan G Rennison
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
patch-import
d86a56cbef
Import day length patch
...
Minor whitespace fixes.
http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
9 years ago
Jonathan G Rennison
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
patch-import
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
Jonathan G Rennison
b6a1866ded
Merge branch 'max_grfs' into jgrpp
9 years ago
patch-import
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
Jonathan G Rennison
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
patch-import
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
Jonathan G Rennison
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
rubidium
876d87097a
(svn r26828) -Fix: memory leak when passing -c multiple times
10 years ago
rubidium
2485b40cdd
(svn r26828) -Fix: memory leak when passing -c multiple times
10 years ago
alberth
db47d62069
(svn r26729) -Feature: Warn about missing industries after generating a map.
10 years ago
alberth
87dd209784
(svn r26729) -Feature: Warn about missing industries after generating a map.
10 years ago
rubidium
beb540ec55
(svn r26538) -Codechange: remove double accounting of the drivers
10 years ago
rubidium
b476086c39
(svn r26538) -Codechange: remove double accounting of the drivers
10 years ago
frosch
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
frosch
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
rubidium
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
rubidium
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
rubidium
b886c8db8c
(svn r26506) -Codechange: replace most of vsnprintf with vseprintf
10 years ago
rubidium
e61fe21237
(svn r26506) -Codechange: replace most of vsnprintf with vseprintf
10 years ago
rubidium
6ecc602050
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
rubidium
5b82822c12
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
rubidium
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
rubidium
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
frosch
8771a19768
(svn r26371) -Fix [FS#5831]: Calling DoCommandP during the gameloop cleared pending persistent storage changes.
10 years ago
frosch
a32d18cbb9
(svn r26371) -Fix [FS#5831]: Calling DoCommandP during the gameloop cleared pending persistent storage changes.
10 years ago
frosch
3403ade478
(svn r26369) -Fix-ish: Do not run scripts during command replay.
10 years ago
frosch
e9f7103ad7
(svn r26369) -Fix-ish: Do not run scripts during command replay.
10 years ago
rubidium
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)
10 years ago
rubidium
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)
10 years ago
frosch
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.
10 years ago
frosch
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.
10 years ago
rubidium
4a911754b5
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
rubidium
2618d960e3
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
rubidium
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
rubidium
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
frosch
35ecb9db3f
(svn r26174) -Codechange: Rename BaseStorageArray to BasePersistentStorageArray
11 years ago
frosch
eca86d1baf
(svn r26174) -Codechange: Rename BaseStorageArray to BasePersistentStorageArray
11 years ago
rubidium
f843a0b5d9
(svn r26107) -Codechange/cleanup: remove some coding bloat and simplify the driver factory instatiations
11 years ago
rubidium
6996b441d9
(svn r26107) -Codechange/cleanup: remove some coding bloat and simplify the driver factory instatiations
11 years ago
rubidium
cd2f85cfdb
(svn r26099) -Codechange: make NewGRF scanner management slightly easier
11 years ago
rubidium
2009da4f7d
(svn r26099) -Codechange: make NewGRF scanner management slightly easier
11 years ago
rubidium
f9300ba6a2
(svn r26098) -Fix: close the log file when OpenTTD was forked and finally closed
11 years ago
rubidium
43edd2409e
(svn r26098) -Fix: close the log file when OpenTTD was forked and finally closed
11 years ago
rubidium
2b3d476efc
(svn r26097) -Fix: another minor memory leak (when pressing cancel in the bootstrap window)
11 years ago
rubidium
ee0aa389a8
(svn r26097) -Fix: another minor memory leak (when pressing cancel in the bootstrap window)
11 years ago
rubidium
4e34aae523
(svn r26091) -Fix (r26089): double frees... woospie
11 years ago
rubidium
4de2871fc0
(svn r26091) -Fix (r26089): double frees... woospie
11 years ago
rubidium
d9a3177862
(svn r26089) -Fix: a number of minor memory leaks
11 years ago
rubidium
0ac9ed0b6b
(svn r26089) -Fix: a number of minor memory leaks
11 years ago
frosch
6bb4748558
(svn r25570) -Add: cache for ParagraphLayouts.
11 years ago
frosch
d0eff986be
(svn r25570) -Add: cache for ParagraphLayouts.
11 years ago
rubidium
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
rubidium
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
rubidium
17951f57a5
(svn r25506) -Document: a function, and name it slightly better
11 years ago
rubidium
5b2a5ac790
(svn r25506) -Document: a function, and name it slightly better
11 years ago
fonsinchen
97a9908b0e
(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes
11 years ago
fonsinchen
c32eea02dd
(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes
11 years ago
frosch
b172ed3578
(svn r25291) -Add: WindowDesc ability to load and store information in a config file.
11 years ago
frosch
23ba42b66c
(svn r25291) -Add: WindowDesc ability to load and store information in a config file.
11 years ago
peter1138
7bf898c81c
(svn r24974) -Fix [FS#5279]: Honour pause_on_newgame setting when running as a dedicated server.
11 years ago
peter1138
5bffc704f9
(svn r24974) -Fix [FS#5279]: Honour pause_on_newgame setting when running as a dedicated server.
11 years ago
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
frosch
76fef0843c
(svn r24790) -Remove: Classic difficulty profiles.
12 years ago
frosch
d1ab0f03bc
(svn r24790) -Remove: Classic difficulty profiles.
12 years ago
frosch
4d2ce0a035
(svn r24716) -Feature(ette): Reset engine pool when starting a scenario.
12 years ago
frosch
4471f6bca8
(svn r24716) -Feature(ette): Reset engine pool when starting a scenario.
12 years ago
planetmaker
27551960cf
(svn r24485) -Fix: Clarify description of command line option -n
12 years ago
planetmaker
e83cab150b
(svn r24485) -Fix: Clarify description of command line option -n
12 years ago
frosch
7814956d4c
(svn r24482) -Fix [FS#5232] (r24180): Do not call RebuildSubsidisedSourceAndDestinationCache() before subsidy savegame conversion is finished.
12 years ago
frosch
b11b0bb0e2
(svn r24482) -Fix [FS#5232] (r24180): Do not call RebuildSubsidisedSourceAndDestinationCache() before subsidy savegame conversion is finished.
12 years ago
frosch
7ae3b0d332
(svn r24388) -Fix [FS#5233]: Do not consider not finding a particular base set critical; just load a different one and display an in-game error later on.
12 years ago
frosch
73706925d1
(svn r24388) -Fix [FS#5233]: Do not consider not finding a particular base set critical; just load a different one and display an in-game error later on.
12 years ago
rubidium
81d866e68d
(svn r24180) -Codechange/feature-ish: add cache checker for the town's cache
12 years ago
rubidium
b926277caf
(svn r24180) -Codechange/feature-ish: add cache checker for the town's cache
12 years ago
rubidium
4125568754
(svn r24155) -Fix: the music volume was set too early during startup; at a moment the configuration file wasn't read yet
12 years ago
rubidium
27d9808f45
(svn r24155) -Fix: the music volume was set too early during startup; at a moment the configuration file wasn't read yet
12 years ago
alberth
485e70c16a
(svn r24099) -Add: Output list of -d option facilities with in the help text.
12 years ago
alberth
b57bef91a1
(svn r24099) -Add: Output list of -d option facilities with in the help text.
12 years ago
rubidium
0a2c5d0b96
(svn r23963) -Fix [FS#5072]: do not look for missing sprites twice during startup
12 years ago
rubidium
e185c2f609
(svn r23963) -Fix [FS#5072]: do not look for missing sprites twice during startup
12 years ago
frosch
1ef2dd585a
(svn r23839) -Feature: Allow command line options -e and -g to be combined to load saves/scenarios directly into SE.
13 years ago
frosch
428e5d3103
(svn r23839) -Feature: Allow command line options -e and -g to be combined to load saves/scenarios directly into SE.
13 years ago
rubidium
f8faaebaf0
(svn r23751) -Codechange: rename NetworkUDPGameLoop to a more descriptive name, and move the UDP specific bits to network_udp
13 years ago
rubidium
531e501b5a
(svn r23751) -Codechange: rename NetworkUDPGameLoop to a more descriptive name, and move the UDP specific bits to network_udp
13 years ago
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
rubidium
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
truebrain
17fea560ba
(svn r23606) -Add: GameScanner, to auto-detect game scripts, and wire it in the console
13 years ago
truebrain
c99950c215
(svn r23606) -Add: GameScanner, to auto-detect game scripts, and wire it in the console
13 years ago
truebrain
f66f27d249
(svn r23604) -Add: initial support for GameScripts
13 years ago
truebrain
12aa5b6a58
(svn r23604) -Add: initial support for GameScripts
13 years ago
rubidium
56089105bc
(svn r23580) -Codechange: put the infrastructure maintenance cache testing behind the desync debug level guard, improving the game's speed significantly
13 years ago
rubidium
d0e7b0fd9d
(svn r23580) -Codechange: put the infrastructure maintenance cache testing behind the desync debug level guard, improving the game's speed significantly
13 years ago
yexo
f18be8a266
(svn r23490) -Add [FS#2750]: OpenBrowser function to open a browser on major OSes
13 years ago
yexo
b4fdba2fb3
(svn r23490) -Add [FS#2750]: OpenBrowser function to open a browser on major OSes
13 years ago
rubidium
56f37d9386
(svn r23476) -Codechange: use the error queue to replace switch mode error strings, again making it possible to return multiple errors
13 years ago
rubidium
2bf0fc3c5c
(svn r23476) -Codechange: use the error queue to replace switch mode error strings, again making it possible to return multiple errors
13 years ago
rubidium
9aab2dc861
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
rubidium
58423b26d1
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
rubidium
b92c6ae0b7
(svn r23422) -Fix [FS#4863] (r22797): the default palette setting wasn't applied correctly anymore as the configuration file is loaded after the first NewGRF scan
13 years ago
rubidium
5891099f24
(svn r23422) -Fix [FS#4863] (r22797): the default palette setting wasn't applied correctly anymore as the configuration file is loaded after the first NewGRF scan
13 years ago
rubidium
0e5ade0907
(svn r23417) -Fix: wrong argument to printf
13 years ago
rubidium
a37e8ebe43
(svn r23417) -Fix: wrong argument to printf
13 years ago
michi_cc
85ec2f07af
(svn r23411) -Add: Company infrastructure counts for rail.
13 years ago
michi_cc
d30fcd4e35
(svn r23411) -Add: Company infrastructure counts for rail.
13 years ago
truebrain
bf803e40cc
(svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too
13 years ago
truebrain
cc12942d70
(svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too
13 years ago
rubidium
17db686187
(svn r23275) -Codechange: allow loading of the monospace (freetype) font at another moment than the other fonts
13 years ago
rubidium
9512838a5e
(svn r23275) -Codechange: allow loading of the monospace (freetype) font at another moment than the other fonts
13 years ago
rubidium
1713d1ad3e
(svn r23273) -Codechange: allow passing a MissingGlyphSearcher to CheckForMissingGlyphs (default to the language pack strings)
13 years ago
rubidium
0a4a75b0af
(svn r23273) -Codechange: allow passing a MissingGlyphSearcher to CheckForMissingGlyphs (default to the language pack strings)
13 years ago
rubidium
c2ea904860
(svn r23271) -Codechange: don't repeatedly initialise and free the freetype library
13 years ago
rubidium
542c61397c
(svn r23271) -Codechange: don't repeatedly initialise and free the freetype library
13 years ago
rubidium
8961575ef9
(svn r23246) -Codechange: move searching/loading music/sound sets/drivers to later in the process so we could get rid of errors related to that being dumped onto the console
13 years ago
rubidium
ea54c38e2c
(svn r23246) -Codechange: move searching/loading music/sound sets/drivers to later in the process so we could get rid of errors related to that being dumped onto the console
13 years ago
rubidium
4509f814b3
(svn r23244) -Feature: if the installation is ananas, try to get the b without b installed
13 years ago
rubidium
02b884d923
(svn r23244) -Feature: if the installation is ananas, try to get the b without b installed
13 years ago
rubidium
67d90f1174
(svn r23241) -Codechange: make the decision when to go to the custom drawn cursor more prominently during the initialisation of OpenTTD
13 years ago
rubidium
6e31c2f068
(svn r23241) -Codechange: make the decision when to go to the custom drawn cursor more prominently during the initialisation of OpenTTD
13 years ago
rubidium
cebe2eac6b
(svn r23224) -Codechange: first load the config file partially so we can push scanning AIs to later in the process (when the GUI is showing the progress bar)
13 years ago
rubidium
834eac49fd
(svn r23224) -Codechange: first load the config file partially so we can push scanning AIs to later in the process (when the GUI is showing the progress bar)
13 years ago
rubidium
023d530ead
(svn r23222) -Codechange: reduce tar scanning calls to the bare minimum
13 years ago
rubidium
4ae8bbea07
(svn r23222) -Codechange: reduce tar scanning calls to the bare minimum
13 years ago
rubidium
4d281cce97
(svn r23217) -Codechange: introduce the concept of scanning only in a limited set of sub directories
13 years ago
rubidium
6d991b3b10
(svn r23217) -Codechange: introduce the concept of scanning only in a limited set of sub directories
13 years ago
rubidium
33d71b45fe
(svn r23198) -Codechange: introduce a free that takes const pointers so we don't need to cast to void/non-const before being able to free
13 years ago
rubidium
7fd1e1df81
(svn r23198) -Codechange: introduce a free that takes const pointers so we don't need to cast to void/non-const before being able to free
13 years ago
rubidium
413c92444a
(svn r23123) -Fix [FS#4790] (r22792): variable was initialised at the wrong moment making things with the cursor go wrong
13 years ago
rubidium
1f823f89a1
(svn r23123) -Fix [FS#4790] (r22792): variable was initialised at the wrong moment making things with the cursor go wrong
13 years ago
yexo
047957487a
(svn r23065) -Add: -q option to read a savegame, write some general info and exit
13 years ago
yexo
433f74edd9
(svn r23065) -Add: -q option to read a savegame, write some general info and exit
13 years ago
michi_cc
7b35dd4f54
(svn r23000) -Feature: Base graphics sets can now specify a preferred blitter which OpenTTD uses to decide which blitter to load.
13 years ago
michi_cc
c575b5bbd7
(svn r23000) -Feature: Base graphics sets can now specify a preferred blitter which OpenTTD uses to decide which blitter to load.
13 years ago
michi_cc
7c325fcb78
(svn r22874) -Fix [FS#4747]: Check size of various buffers before allocation. (monoid)
13 years ago