miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,106 Commits 14 Branches 28 Tags
5be853ed096240719db6589718aa138992273ef5
Commit Graph

427 Commits

Author SHA1 Message Date
Sergii Pylypenko
7defb52028 Merge branch upstream/master 2021-11-28 03:16:36 +02:00
peter1138
c56fce70b4 Codechange: Replace CMD_SET_GROUP_REPLACE_PROTECTION with generic CMD_SET_GROUP_FLAG. 2021-04-22 22:57:00 +02:00
pelya
3a82c97aa1 Merge remote-tracking branch 'upstream/master' 2021-01-25 00:50:42 +02:00
dP
bab7de6cf2 Feature: Allow GameScripts to add additional text to Industry view window 2021-01-22 09:50:53 +00:00
Charles Pigott
860c270c73 Codechange: Replace assert_compile macro with static_assert 2020-12-27 10:55:42 +00:00
Niels Martin Hansen
b7751c483e Feature: Influence industry production changes from GS (#7912) 2020-12-22 14:21:31 +01:00
frosch
d8182b7e15 Change: Allow command cost-estimation while paused. 2020-06-18 08:59:27 +01:00
Niels Martin Hansen
800ade7702 Feature: Push-buttons on storybook pages (#7896) 
Allow more direct player-initiated interaction for Game Scripts, by letting the GS put push-buttons on storybook pages. These buttons can either trigger an immediate event, or require the player to first select a tile on the map, or a vehicle.

Additionally this reworks how the storybook pages are layouted and rendered, to allow for slightly more complex layouts, and maybe speeding drawing up a bit.
 2020-05-22 22:22:55 +02:00
pelya
351e6d5600 Fixed bad merge 2020-03-20 21:45:54 +02:00
pelya
798fbc3466 Merge branch 'origin/master' commit 'a499e9acdd385b57dd43caf88af3a6f7f53716ba' 2020-03-20 00:10:46 +02:00
Pavel Stupnikov
d7a928a08b Feature: GS method to control engine availability for a specific company (#7791) 
* Feature: GS method to allow company to use an engine before its introduction date

* Feature: GS method to retire an engine early for a specific company
 2020-01-15 18:46:26 +01:00
Niels Martin Hansen
f401622149 Feature: Script API to change town rating of companies 2020-01-04 19:07:13 +01:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
Max Maton
e4414471dd Add: Allow GameScript to demolish without a company 
This allows GameScripts to shrink towns as well as grow them.
 2019-09-08 10:09:19 +02:00
glx22
b3fd787959 Fix #7188: check the validity of command callback for scripts (#7701) 2019-09-07 17:37:01 +01:00
peter1138
c02ef3e456 Feature: Add NotRoadTypes (NRT) 2019-05-01 21:36:27 +02:00
Charles Pigott
5b34c8019f Codechange: Remove Company/OwnerByte types 2019-04-29 17:40:22 +01:00
Sergii Pylypenko
3ba683874b Merge remote-tracking branch 'origin/master' into HEAD 2019-04-23 18:16:24 +03:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Henry Wilson
bfd79e59dc Codechange: Replace SmallVector::Clear() with std::vector::clear() 2019-03-26 20:15:57 +00:00
Patric Stout
7a9782e6f4 Revert: "Fix #7151: Hang when concurrently starting AIs in multiplayer, or with shift pressed." 
This reverts commit b1e40b6b56.

This is a fix for a patch that will be reverted in the next commit.
 2019-03-24 17:16:15 +01:00
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.
 2019-03-20 19:24:55 +01:00
Peter Nelson
b1e40b6b56 Fix #7151: Hang when concurrently starting AIs in multiplayer, or with shift pressed. 2019-02-05 14:49:04 +01:00
PeterN
23960d0f2c Feature: Group liveries, and livery window usability enhancements. (#7108) 
* Change: Replace checkbox in livery selection window with Default option in drop down selection.

This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.

* Feature: Add vehicle group liveries.
 2019-01-31 14:57:44 +01:00
Charles Pigott
f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Pavel Stupnikov
8e4bce58ea Feature: GS methods to scroll viewport for players (#6745) 2018-04-24 19:19:00 +02:00
Sergii Pylypenko
96501e9f08 Warning: crashes! Confirmation dialog will also show estimated cost 2017-03-17 22:40:04 +02:00
pelya
3ef1c1baff Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5' 
These merges are becoming more awful every time

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/error_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/signs_gui.cpp
	src/station_gui.cpp
	src/table/settings.ini
	src/terraform_gui.cpp
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/viewport.cpp
	src/widget.cpp
	src/widgets/settings_widget.h
 2016-03-27 22:33:11 +03:00
alberth
44d2f6a988 (svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo). 2014-09-07 16:12:58 +00:00
alberth
f72ad87540 (svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo). 2014-09-07 16:12:58 +00:00
Sergii Pylypenko
2603e6b5e3 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/os/unix/unix.cpp
	src/widgets/dropdown.cpp
 2014-08-19 19:21:47 +03:00
frosch
592cf107d1 (svn r26716) -Fix: CMD_CLEAR_ORDER_BACKUP should not be suppressed by pause modes. 2014-08-03 14:26:32 +00:00
frosch
b996c24387 (svn r26716) -Fix: CMD_CLEAR_ORDER_BACKUP should not be suppressed by pause modes. 2014-08-03 14:26:32 +00:00
Sergii Pylypenko
91ebce1a9c Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h
 2014-06-04 17:09:23 +03:00
Sergii Pylypenko
41da4be66b Removed remainder of the 'touchscreen mode' code 2014-06-03 20:27:45 +03:00
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 2014-04-23 20:13:33 +00:00
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 2014-04-23 20:13:33 +00:00
peter1138
ed8f6f1a0f (svn r26450) -Feature: Hierarchical vehicle subgroups. 2014-04-08 21:09:06 +00:00
peter1138
567d0ff3a7 (svn r26450) -Feature: Hierarchical vehicle subgroups. 2014-04-08 21:09:06 +00:00
Sergii Pylypenko
25630ab4c7 Moved touchscrren buttons to main toolbar, now it crashes 2014-03-19 23:49:08 +02:00
Juanjo
f70dbfdc32 Set selection tiles dirty when erasing a queued command. 2014-03-15 22:52:35 +02:00
Juanjo
4f60841795 Base functions for a confirm action mode. 2014-03-15 22:52:14 +02:00
frosch
8771a19768 (svn r26371) -Fix [FS#5831]: Calling DoCommandP during the gameloop cleared pending persistent storage changes. 2014-02-23 22:03:08 +00:00
frosch
a32d18cbb9 (svn r26371) -Fix [FS#5831]: Calling DoCommandP during the gameloop cleared pending persistent storage changes. 2014-02-23 22:03:08 +00:00
zuu
6a571811c7 (svn r26306) -Add: [nogo] More story APIs: RemovePageElement, GetCompany, GetDate, SetDate 2014-02-06 19:48:19 +00:00
zuu
1dbd59e6ab (svn r26306) -Add: [nogo] More story APIs: RemovePageElement, GetCompany, GetDate, SetDate 2014-02-06 19:48:19 +00:00
zuu
82173b7dbc (svn r26299) -Fix: [nogo] CmdRemoveStoryPage does not use the string parameter 2014-02-06 19:03:04 +00:00
zuu
425197a19c (svn r26299) -Fix: [nogo] CmdRemoveStoryPage does not use the string parameter 2014-02-06 19:03:04 +00:00
frosch
7b238142b8 (svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack. 2014-01-12 18:00:39 +00:00