dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,177 Commits 1 Branch 0 Tags
d730cfd51d6414d833818c2895d5a416e53db613
Commit Graph

50 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
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
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
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
75cf518a7d (svn r25770) -Fix [Admin]: the frame of a command packet wasn't set for the packets that were sent via de admin interface 2013-09-14 11:34:09 +00: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
rubidium
abdd5ebfa7 (svn r23843) -Fix: minor issue with replaying ;) 2012-01-22 21:27:15 +00:00
rubidium
752474cec3 (svn r23821) -Fix-ish: when replaying a command log, ignore the command limit 2012-01-17 21:12:19 +00:00
truebrain
f66f27d249 (svn r23604) -Add: initial support for GameScripts 2011-12-19 20:50:54 +00:00
truebrain
2b381d0765 (svn r23603) -Add: support for control commands in strings, in both network and safe/load (Rubidium) 2011-12-19 20:50:44 +00:00
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 2011-12-01 12:03:34 +00:00
rubidium
8c335b8db6 (svn r22845) -Fix [FS#4745]: perform stricter checks on some commands (monoid) 2011-08-26 16:39:02 +00:00
rubidium
eb2197f4c8 (svn r22410) -Document: some more bits ;) 2011-05-02 16:14:23 +00:00
frosch
c5fd92a37b (svn r22123) -Fix [FS#4522]: CommandQueue::Pop() did not update 'last'; popping the last item caused the queue to disconnect unless there was only one item. 2011-02-20 21:00:24 +00:00
rubidium
81643f49e1 (svn r22121) -Fix: In case of high frame_freq one could get commands executed after a new network game was started 2011-02-20 20:55:21 +00:00
rubidium
05199a641a (svn r21890) -Cleanup: remove some unneeded includes 2011-01-22 14:52:20 +00:00
rubidium
72a4dc53d9 (svn r21668) -Feature: command logging using the admin interface (dihedral) 2010-12-30 18:14:37 +00:00
rubidium
b469b1dc51 (svn r21429) -Fix [FS#3771]: the server didn't check for the paused state when allowing to execute commands 2010-12-07 21:12:23 +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
242110b8cb (svn r21030) -Codechange: move ClientStatus into the network server socket class 2010-10-24 20:07:32 +00:00
rubidium
66087c5e60 (svn r20935) -Codechange: only let the server side use a pool of connected sockets 2010-10-15 19:58:56 +00:00
rubidium
8f4638ed0f (svn r20925) -Codechange: make the client send commands have a slightly more sensible name 2010-10-15 14:29:13 +00:00
rubidium
6d3c747d05 (svn r20553) -Feature: allow rate limiting of incoming commands 2010-08-19 08:59:36 +00:00
rubidium
8f82b2b588 (svn r20549) -Codechange: centralise the handling of the incoming commands (from clients and the server) 2010-08-18 22:40:17 +00:00
rubidium
3ed6ca0aed (svn r20548) -Codechange: rename some variables giving them slightly more meaningful names 2010-08-18 21:30:38 +00:00
rubidium
6f81fa7215 (svn r20510) -Codechange: unify packet queue handling and make insertion O(1) instead of O(n) 2010-08-15 23:44:45 +00:00
alberth
603c33efc1 (svn r20269) -Codechange: Use IsLocalCompany() everywhere, document the function and two company globals. 2010-07-31 21:43:07 +00:00
rubidium
858bd09623 (svn r20035) -Fix [FS#3909]: under some circumstances you could get into an infinite loop 2010-06-29 21:15:40 +00:00
frosch
65d058723e (svn r19933) -Fix [FS#3804]: Keep _current_company and _local_company in sync during GUI operation. 2010-06-05 13:32:42 +00:00
smatz
691261674a (svn r19714) -Feature: ctrl+click on a vehicle to start/stop it 2010-04-24 20:55:51 +00:00
rubidium
34cdcaf8b2 (svn r19620) -Fix: desync when a command is received and in the queue while a client starts joining, i.e. save the game state. This can happen in two ways: with frame_freq > 1 a command received in a previous frame might not be executed yet or when a command is received in the same frame as the join but before the savegame is made. In both cases the joining client would not get all commands to get in-sync with the server (and the other clients). 2010-04-13 18:55:31 +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
terkhen
6ccd15fd08 (svn r19227) -Codechange: Reorganization of parameters at CmdBuildRoadStop. 2010-02-24 21:45:23 +00:00
rubidium
1c494c6f71 (svn r19081) -Codechange: make it possible to disable compilation of the AI+Squirrel 2010-02-10 16:24:05 +00:00
rubidium
9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +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
89443276b1 (svn r18782) -Codechange: move the content of callback_table.cpp to network_command.cpp; it's only ever used there. 2010-01-11 20:00:14 +00:00
rubidium
982b8ee5fc (svn r17693) -Cleanup: remove some unneeded includes 2009-10-04 17:16:41 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
smatz
ce7dff4acc (svn r16269) -Codechange: use gcc's ability to check parameters sent to printf-like functions 
-Fix: wrong number of parameters or wrong parameter types sent to printf-like functions at several places
 2009-05-10 17:27:25 +00:00
smatz
9021c20b5e (svn r15299) -Cleanup: remove many redundant includes 2009-01-31 20:16:06 +00:00
rubidium
78c43297e2 (svn r14916) -Codechange: make it possible to send CommandContainers directly to DoCommand(P). 2009-01-08 14:55:28 +00:00
rubidium
0e1127e8b5 (svn r14915) -Codechange: unify the receiving and sending of commands, and thus unifying most of the validity checking too. 2009-01-08 14:40:18 +00:00
belugas
da7da4c1c8 (svn r14914) -Documentation: Correct doxygen comment for file name. <nitpicked> by Swallow 2009-01-08 14:38:21 +00:00
rubidium
4df86694a7 (svn r14910) -Codechange: merge the command queue handling into a single location 2009-01-08 13:57:50 +00:00