dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,019 Commits 1 Branch 0 Tags
e1e7b67270bcd858c0727a0cc58bb2624e526e01
Commit Graph

2374 Commits

Author SHA1 Message Date
Jonathan G Rennison
a3d0fc5817 Remove an unused extern declaration, update comment. 2016-09-05 23:31:34 +01:00
Jonathan G Rennison
a6e0b1ac7d Merge branch 'cpp-11' into save_ext 2016-09-05 23:17:02 +01:00
Jonathan G Rennison
871d26098e Move Order::cargo_type_flags into a separately allocated object. 
Change savegame format, add a new chunk for cargo_type_flags.
 2016-09-05 00:12:48 +01:00
Jonathan G Rennison
c1c983ea16 Import cargo type orders patch 
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749

Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
 2016-09-04 23:00:10 +01:00
alberth
f286ba8db2 (svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit. 2016-09-04 16:06:50 +00:00
alberth
0adfb1ac6f (svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit. 2016-09-04 16:06:50 +00:00
alberth
0b8869930f (svn r27652) -Fix(r27650): Use the file operation being performed to set the _sl.action variable. 2016-09-04 15:10:41 +00:00
alberth
4001f6215e (svn r27652) -Fix(r27650): Use the file operation being performed to set the _sl.action variable. 2016-09-04 15:10:41 +00:00
alberth
e735bbebce (svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload. 2016-09-04 12:58:04 +00:00
alberth
6f201ce4a8 (svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload. 2016-09-04 12:58:04 +00:00
alberth
a959c0c965 (svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType. 2016-09-04 12:57:43 +00:00
alberth
597380e099 (svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType. 2016-09-04 12:57:43 +00:00
alberth
c3bed437ee (svn r27649) -Codechange: Introduce detailed file type enum, rebuild FiosType with it. 2016-09-04 12:57:20 +00:00
alberth
df9a9f074a (svn r27649) -Codechange: Introduce detailed file type enum, rebuild FiosType with it. 2016-09-04 12:57:20 +00:00
alberth
b6c29ae4eb (svn r27639) -Codechange: Also always set the abstract FileToSaveLoad::filetype when setting a mode. 2016-09-04 12:47:39 +00:00
alberth
c6ac071619 (svn r27639) -Codechange: Also always set the abstract FileToSaveLoad::filetype when setting a mode. 2016-09-04 12:47:39 +00:00
alberth
e78627f2f1 (svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function. 2016-09-04 12:47:07 +00:00
alberth
2fa0fdb176 (svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function. 2016-09-04 12:47:07 +00:00
alberth
b5eb50da7b (svn r27637) -Codechange: Don't use _saveload_mode for scenario loading detection. 2016-09-04 12:46:29 +00:00
alberth
3b8ede5ebe (svn r27637) -Codechange: Don't use _saveload_mode for scenario loading detection. 2016-09-04 12:46:29 +00:00
alberth
757bc0a97b (svn r27636) -Codechange: Rename FileType to AbstractFileType. 2016-09-04 12:46:07 +00:00
alberth
087ed1e999 (svn r27636) -Codechange: Rename FileType to AbstractFileType. 2016-09-04 12:46:07 +00:00
alberth
a35e970ab0 (svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions. 2016-09-04 12:45:40 +00:00
alberth
9135f7130e (svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions. 2016-09-04 12:45:40 +00:00
Jonathan G Rennison
e6c7134935 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
 2016-09-02 22:21:28 +01:00
Jonathan G Rennison
761463d134 Merge branch 'template_train_replacement-sx' into jgrpp 
# Conflicts:
#	src/window.cpp
 2016-08-26 00:19:11 +01:00
Jonathan G Rennison
1af23b7caa Merge branch 'template_train_replacement' into template_train_replacement-sx 
# Conflicts:
#	src/saveload/saveload.cpp
 2016-08-26 00:18:10 +01: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
frosch
2337d169e8 (svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy. 2016-08-15 18:32:48 +00:00
frosch
4d1843a95e (svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy. 2016-08-15 18:32:48 +00:00
Jonathan G Rennison
80e3af6bf5 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-06-30 20:25:22 +01:00
Jonathan G Rennison
71aa4c75cb Bump tracerestrict version due to weight/power/TE conditionals. 2016-06-30 20:17:45 +01:00
Jonathan G Rennison
74ff8b9e8e Merge branch 'crashlog_improvements' into jgrpp 
# Conflicts:
#	Makefile.src.in
 2016-06-12 21:21:55 +01:00
Jonathan G Rennison
abbc960e96 Linux crashlog: Use sigaction to get more info on fatal signals. 2016-06-10 23:39:26 +01:00
Jonathan G Rennison
5b7eb46fe4 Merge branch 'improved_breakdowns-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2016-06-05 23:21:55 +01:00
Jonathan G Rennison
0d20a54606 Fix broken-down aircraft stuck at 0 speed on load. 
Bump improved breakdowns version.
 2016-06-05 23:20:25 +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
2de4652d09 (svn r27572) -Fix [FS#6442]: Convenience savegame bump to distinguish 1.6 savegames from 1.5 savegames. 2016-05-22 10:10:17 +00:00
frosch
13a86497ea (svn r27572) -Fix [FS#6442]: Convenience savegame bump to distinguish 1.6 savegames from 1.5 savegames. 2016-05-22 10:10:17 +00:00
Jonathan G Rennison
d8a083b666 Allow timetable start dates to be set with full precision. 
This avoids rounding of start dates when using minutes and
day length > 1.
 2016-05-11 21:31:31 +01:00
Jonathan G Rennison
4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
 2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b Timetable auto separation is now per vehicle, with a company default. 
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
 2016-05-08 01:12:07 +01:00
Jonathan G Rennison
d0aa4a53ed Improve performance of updating railtypes when reloading NewGRFs. 
Now O(N) instead of O(N log N), and only traverses map once.
 2016-04-08 20:38:32 +01:00
keldorkatarn
75396c9b5f - Make sure we clear the additional railtype bit only for the correct tiles. 
- Backup and restore the correct railtype for tiles when newGRFs are reloaded during a game.

(cherry picked from commit f5bf8e69b4fe95519513b934dc1057dc304ce3da)
 2016-04-08 20:38:31 +01:00
keldorkatarn
5cc56d6ad9 Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array. 
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)

Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
 2016-04-08 20:38:31 +01:00
Jonathan G Rennison
0d26da998b Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-04-05 20:12:09 +01:00
Jonathan G Rennison
faf8dab12a Bump tracerestrict version due to group conditional. 2016-04-05 19:45:01 +01:00
Jonathan G Rennison
13c88dcef2 Merge branch 'template_train_replacement-sx' into jgrpp 2016-03-21 21:19:46 +00:00
Jonathan G Rennison
5519bf33b3 Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-03-21 21:18:56 +00:00
Jonathan G Rennison
31136bac50 Fix AfterLoadTemplateVehiclesUpdateImage clobbering the random seeds. 
This broke MP games with template replacement trains.
 2016-03-21 21:18:22 +00:00