dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,921 Commits 1 Branch 0 Tags
55d78a23be3a64d53cf9519e6a1dad702e484da9
Commit Graph

113 Commits

Author SHA1 Message Date
Jonathan G Rennison
24b3424ca3 Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/economy.cpp
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
 2017-01-21 01:44:05 +00:00
Jonathan G Rennison
285ba41699 TBTR: Fix spelling issues in comment and a method name. 2017-01-21 01:39:59 +00:00
Jonathan G Rennison
23a1c07378 Merge branch 'master' into template_train_replacement 
Fix Template creation window vehicle drag cursor.
 2016-08-26 00:00:20 +01:00
Jonathan G Rennison
09291a3b74 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-05-23 18:41:00 +01:00
frosch
9aa33862a7 (svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect. 2016-05-22 10:07:48 +00:00
frosch
14c1a7ad0b (svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect. 2016-05-22 10:07:48 +00:00
Jonathan G Rennison
0779c7b7a9 Merge branch 'template_train_replacement-sx' into jgrpp 
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/saveload/afterload.cpp
 2016-02-16 21:08:21 +00:00
Jonathan G Rennison
98fc4493c8 TBTR: Delete duplicated build vehicle window. 
Add a virtual train mode to the existing build vehicle window.
Simplify some of the inter-window notify logic.
Disable all buttons when a new template/edit is in progress.
 2016-02-15 19:17:30 +00:00
Jonathan G Rennison
580b2f7584 Merge branch 'template_train_replacement-sx' into jgrpp 
Remove a duplicated declaration.

# 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/group_gui.cpp
#	src/lang/english.txt
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/window_type.h
 2016-02-14 17:55:51 +00:00
Jonathan G Rennison
6be2efc084 Update from KeldorKatarn branch 
This approximately corresponds to 971ba4928a5c7c7916fea55d91a3b6dd5bba140c,
excluding the different virtual train build GUI, but including the basic
changes to the original train build GUI for multiplayer to work.

Fixup
 2016-02-14 03:32:42 +00:00
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
 2015-08-05 21:24:30 +01:00
michi_cc
83a0b3cf1d (svn r24139) -Add: Creating a new vehicle group by drag and drop. (Based on patch by Juanjo) 2012-04-17 19:44:16 +00:00
michi_cc
37e321044a (svn r24139) -Add: Creating a new vehicle group by drag and drop. (Based on patch by Juanjo) 2012-04-17 19:44:16 +00:00
truebrain
f66f27d249 (svn r23604) -Add: initial support for GameScripts 2011-12-19 20:50:54 +00:00
truebrain
12aa5b6a58 (svn r23604) -Add: initial support for GameScripts 2011-12-19 20:50:54 +00:00
truebrain
ff5775638c (svn r23361) -Codechange: move multiplayer DoCommand callback code so other script users can call their own 2011-11-29 23:21:42 +00:00
truebrain
ae8540f5e0 (svn r23361) -Codechange: move multiplayer DoCommand callback code so other script users can call their own 2011-11-29 23:21:42 +00:00
rubidium
1cd3dac854 (svn r23215) -Codechange: stricter type safety for CommandFlags 2011-11-14 20:38:56 +00:00
rubidium
f600429424 (svn r23215) -Codechange: stricter type safety for CommandFlags 2011-11-14 20:38:56 +00:00
rubidium
f0ad5fd749 (svn r21844) -Codechange: move documentation towards the code to make it more likely to be updates [a-c]. 2011-01-18 22:17:15 +00:00
rubidium
6c9078fd30 (svn r21844) -Codechange: move documentation towards the code to make it more likely to be updates [a-c]. 2011-01-18 22:17:15 +00:00
rubidium
78054d7ad5 (svn r21427) -Add: helper function to determine whether a command may be executed 2010-12-07 21:08:35 +00:00
rubidium
e170b1d83e (svn r21427) -Add: helper function to determine whether a command may be executed 2010-12-07 21:08:35 +00:00
rubidium
c7066d00af (svn r21358) -Codechange: make some network function names conform to coding style 2010-11-30 13:38:46 +00:00
rubidium
b6c2216749 (svn r21358) -Codechange: make some network function names conform to coding style 2010-11-30 13:38:46 +00:00
smatz
691261674a (svn r19714) -Feature: ctrl+click on a vehicle to start/stop it 2010-04-24 20:55:51 +00:00
smatz
e3c89df398 (svn r19714) -Feature: ctrl+click on a vehicle to start/stop it 2010-04-24 20:55:51 +00:00
rubidium
ea7aececf8 (svn r19602) -Codechange: add the name of the command to the desync logs 2010-04-11 10:11:26 +00:00
rubidium
5c7aaf11ba (svn r19602) -Codechange: add the name of the command to the desync logs 2010-04-11 10:11:26 +00:00
alberth
72d62fd6fc (svn r19494) -Codechange: Remove _error_message. 2010-03-20 17:58:24 +00:00
alberth
05d705e077 (svn r19494) -Codechange: Remove _error_message. 2010-03-20 17:58:24 +00:00
alberth
68213d25ab (svn r19423) -Codechange: Move error message reporting of industry build in SE to a callback. 2010-03-14 19:59:45 +00:00
alberth
db1c6b7a81 (svn r19423) -Codechange: Move error message reporting of industry build in SE to a callback. 2010-03-14 19:59:45 +00:00
terkhen
6ccd15fd08 (svn r19227) -Codechange: Reorganization of parameters at CmdBuildRoadStop. 2010-02-24 21:45:23 +00:00
terkhen
524a10b375 (svn r19227) -Codechange: Reorganization of parameters at CmdBuildRoadStop. 2010-02-24 21:45:23 +00:00
rubidium
f618acfb7d (svn r18866) -Codechange: remove the CmdFailed(ret)/CmdSucceeded(ret) wrapper functions 2010-01-18 22:57:21 +00:00
rubidium
4d93b704d9 (svn r18866) -Codechange: remove the CmdFailed(ret)/CmdSucceeded(ret) wrapper functions 2010-01-18 22:57:21 +00:00
rubidium
8343a34805 (svn r18785) -Codechange: rewrite/rework DoCommandP in order to simplify it, reduce duplication and remove gotos. 2010-01-11 20:39:38 +00:00
rubidium
2365819312 (svn r18785) -Codechange: rewrite/rework DoCommandP in order to simplify it, reduce duplication and remove gotos. 2010-01-11 20:39:38 +00:00
rubidium
7f1bf45c03 (svn r18784) -Codechange: make NetworkSend_Command accept a company instead of using _local_company to pass that information, with the whole mess when you don't want the company to be _local_company. 2010-01-11 20:32:32 +00:00
rubidium
ebe99fd493 (svn r18784) -Codechange: make NetworkSend_Command accept a company instead of using _local_company to pass that information, with the whole mess when you don't want the company to be _local_company. 2010-01-11 20:32:32 +00:00
rubidium
26b203e3ff (svn r18781) -Codechange: pass the CommandCost to the callback instead of whether it succeeded or not. 
-Fix: AIs did update their last cost incorrectly in network games if the cost of the DC_EXEC phase differed from the ~DC_EXEC phase.
 2010-01-11 18:46:09 +00:00
rubidium
2b97f38cd1 (svn r18781) -Codechange: pass the CommandCost to the callback instead of whether it succeeded or not. 
-Fix: AIs did update their last cost incorrectly in network games if the cost of the DC_EXEC phase differed from the ~DC_EXEC phase.
 2010-01-11 18:46:09 +00:00
rubidium
8bdeb2cab6 (svn r18779) -Codechange: merge the command callbacks of the primary vehicles; they are identical 2010-01-11 18:34:02 +00:00
rubidium
833c6f36f3 (svn r18779) -Codechange: merge the command callbacks of the primary vehicles; they are identical 2010-01-11 18:34:02 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
5c8cf85613 (svn r15434) -Codechange: bit of type safety for the DC_xxx flags. 2009-02-09 21:20:05 +00:00
rubidium
d846eef0b6 (svn r15434) -Codechange: bit of type safety for the DC_xxx flags. 2009-02-09 21:20:05 +00:00
Yexo
e3c69b7c4e (svn r15190) -Feature: Allow terraforming of the tiles at the edges of the map. 2009-01-21 02:31:55 +00:00