838b166726
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_base.h
# src/debug.cpp
# src/debug.h
# src/economy.cpp
# src/engine_type.h
# src/graph_gui.cpp
# src/misc_cmd.cpp
# src/misc_cmd.h
# src/network/core/os_abstraction.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings_type.h
# src/ship_cmd.cpp
# src/stdafx.h
# src/tests/bitmath_func.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
3 months ago
5a88027a19
Feature: Infinite money mode ( #11902 )
4 months ago
55d78a23be
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/3rdparty/squirrel/include/squirrel.h
# src/blitter/32bpp_sse_func.hpp
# src/bridge_map.h
# src/clear_map.h
# src/company_manager_face.h
# src/console_func.h
# src/core/bitmath_func.hpp
# src/core/endian_func.hpp
# src/core/random_func.hpp
# src/depot_map.h
# src/elrail_func.h
# src/fontcache.h
# src/industry_map.h
# src/map_func.h
# src/newgrf_spritegroup.h
# src/object_map.h
# src/rail.h
# src/rail_map.h
# src/road_func.h
# src/road_map.h
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/settings_gui.cpp
# src/sl/oldloader.h
# src/sprite.h
# src/spritecache.h
# src/station_func.h
# src/station_map.h
# src/story_base.h
# src/strings_func.h
# src/tile_cmd.h
# src/tile_map.h
# src/tile_type.h
# src/town.h
# src/town_map.h
# src/tree_map.h
# src/tunnel_map.h
# src/tunnelbridge_map.h
# src/vehicle_func.h
# src/viewport_func.h
# src/void_map.h
# src/water.h
# src/water_map.h
# src/widget_type.h
4 months ago
3a676a5af0
Codechange: replace static inline with static for non-class functions
5 months ago
7f6b1d6b94
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/company_func.h
# src/core/overflowsafe_type.hpp
# src/engine.cpp
# src/music/midifile.cpp
# src/network/network_command.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_roadstop.h
# src/newgrf_spritegroup.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/pathfinder/yapf/yapf_common.hpp
# src/road_gui.cpp
# src/saveload/engine_sl.cpp
# src/script/api/script_depotlist.cpp
# src/script/api/script_roadtypelist.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/strings.cpp
# src/table/settings/game_settings.ini
5 months ago
e3f49ee7a0
Codechange: coding style fixes
5 months ago
ffff696b4e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/cheat_gui.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/date_gui.cpp
# src/engine.cpp
# src/group_cmd.cpp
# src/landscape.cpp
# src/network/network_gui.cpp
# src/newgrf.cpp
# src/saveload/afterload.cpp
# src/script/api/script_date.cpp
# src/sl/oldloader_sl.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/strings.cpp
# src/subsidy_gui.cpp
# src/survey.cpp
# src/timer/timer_game_calendar.cpp
# src/timer/timer_game_calendar.h
5 months ago
bfb4254226
Fix: Changing default livery did not propagate to group liveries.
...
#11614 attempted to address this but did not handle 2CC properly, and changes to the default livery were not handled.
5 months ago
3436e0a781
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/error.h
# src/error_gui.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/misc_gui.cpp
# src/newgrf_gui.cpp
# src/news_gui.cpp
# src/rail_cmd.cpp
# src/saveload/gamelog_sl.cpp
# src/script/api/script_text.cpp
# src/script/script_instance.cpp
# src/statusbar_gui.cpp
# src/strings.cpp
# src/strings_func.h
# src/strings_internal.h
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/textbuf_gui.h
6 months ago
3e3e083770
Merge branch 'master' into jgrpp
...
Hostile takeover feature
# Conflicts:
# src/company_base.h
# src/company_cmd.cpp
# src/company_gui.cpp
# src/economy.cpp
# src/script/api/script_event_types.cpp
8 months ago
82b434b589
Codechange: rename function to better describe what it is doing
11 months ago
3b1407d240
Feature: allow to do a hostile takeover of an AI company (in singleplayer) ( #10914 )
...
With the removal of the share-system, you could no longer make an
AI disappear in a single player game. At least, not without going
into the console.
12 months ago
ec90fb4c99
Fix #6544 : Don't join AI company when loading network game in singleplayer
2 years ago
b0990fcff7
Codechange: Make TileIndex a "strong" typedef to give it a distinct type.
...
This is accomplished by changing it to a single member struct with the
appropriate operator overloads to make it all work with not too much
source modifications.
2 years ago
5721790c5d
Fix assert failure in DoStartupNewCompany when called from AfterLoadGame
3 years ago
4763f441f6
On load, use previous local company or first usable company
...
Instead of always using the first company slot
4 years ago
4552b17691
Codechange: Avoid copying function parameters by using const references
4 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
5b34c8019f
Codechange: Remove Company/OwnerByte types
5 years ago
ef8d491d8f
(svn r24996) -Change: Apply default service interval changes to vehicles without custom interval (peter1138)
11 years ago
e40eb8177a
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
13 years ago
750d369a2a
(svn r22013) -Codechange: move some functions out of functions.h
13 years ago
eab47d2227
(svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company
14 years ago
ae20cb4f3d
(svn r20970) -Add: company change notification to remote admins (dihedral)
14 years ago
422a1ad242
(svn r20392) -Fix [FS#3993]: Prevent buying bankrupt companies when you'd get too many vehicles.
14 years ago
dc6ed2c2c0
(svn r20279) -Doc: Doxygen additions/improvements.
14 years ago
7aabb887d4
(svn r20269) -Codechange: Use IsLocalCompany() everywhere, document the function and two company globals.
14 years ago
82fc28f77f
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
4c84db1636
(svn r17345) -Fix [FS#2769]: one wasn't offered to take over bankrupt companies anymore; caused by the introduction NoAI, although NewAI had the same problem too.
15 years ago
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
bea3fe2b8b
(svn r16559) -Codechange: introduce Company::IsValidAiID() and Company::IsValidHumanID(), don't use IsHumanCompany() where possible
15 years ago
9907742a0f
(svn r15423) -Codechange: split widget related types to their own header and add a bit of type strictness.
15 years ago
09cd9a8017
(svn r14815) -Codechange: separate 'highscore' code from 'company' code
16 years ago
1906aa2bbb
(svn r14448) -Codechange [FS#2328]: rename a few variables (based on a patch by planetmaker)
16 years ago
b650a86e58
(svn r14422) -Codechange: also reflect the changes of r14421 in the filenames.
16 years ago
Jonathan G Rennison
merni-ns
Rubidium
Peter Nelson
Patric Stout
Tyler Trahan
Michael Lutz
Quipyowert2
S. D. Cloudt
Charles Pigott
alberth
smatz