dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,812 Commits 1 Branch 0 Tags
9000d74f3c80edb9d325bb6980f9391b14c9ab93
Commit Graph

517 Commits

Author SHA1 Message Date
Jonathan G Rennison
ea3948aa2d Merge branch 'cpp-btree' into infrastructure_sharing 2018-01-26 18:26:24 +00:00
Jonathan G Rennison
093bd804cd Merge branch 'save_ext' into infrastructure_sharing 2018-01-26 18:18:46 +00:00
Jonathan G Rennison
5abd7ad788 Merge branch 'cpp-11' into save_ext 2018-01-26 18:18:36 +00:00
Jonathan G Rennison
124d9a753e Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2017-10-05 18:16:37 +01:00
frosch
0d1f88c09a (svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files 2017-09-24 17:38:03 +00:00
frosch
6120e69f21 (svn r27919) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files 2017-09-24 17:35:51 +00:00
frosch
b9ed60d307 (svn r27918) -Fix (r27917): Next attempt for MSVC 2017 2017-09-24 16:19:29 +00:00
frosch
db3410e196 (svn r27917) -Add: MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled. 2017-09-24 16:00:29 +00:00
Jonathan G Rennison
509e20406f Merge branch 'master' into cpp-11 2017-09-04 01:22:19 +01:00
Jonathan G Rennison
19e62d089f Merge branch 'master' into save_ext 2017-09-04 00:57:48 +01:00
frosch
30a25f45ce (svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88) 2017-08-24 14:50:55 +00:00
Jonathan G Rennison
f3a0aace0c Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2017-08-15 18:44:17 +01:00
Jonathan G Rennison
48bbe0325d Merge branch 'cpp-11' into save_ext 2017-03-29 19:49:29 +01:00
Jonathan G Rennison
fae4ac1a5d Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
 2017-03-19 12:12:52 +00:00
michi_cc
9a62317dfc (svn r27791) -Fix (r27790) [FS#6366]: Try #2. Now also for Visual Studio 2010. 2017-03-13 21:56:38 +00:00
michi_cc
2d45d55925 (svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input. 2017-03-13 20:21:40 +00:00
Jonathan G Rennison
f3b1059930 Fix order removal due to shared-infra company deletion. 
Order totals were not updated correctly, implicit orders not handled
properly, etc.
Create generic function for vehicle order filtering.
Use for station deletion and infra sharing company deletion.
 2017-02-22 20:58:24 +00:00
Jonathan G Rennison
8f3e0c4fe5 Add a custom arena allocator utility. 2017-02-08 21:46:50 +00:00
Jonathan G Rennison
3d0ed3547b Update source.list and project files with btree headers. 2017-02-07 19:16:20 +00:00
Jonathan G Rennison
a6e0b1ac7d Merge branch 'cpp-11' into save_ext 2016-09-05 23:17:02 +01:00
Jonathan G Rennison
6e9ea59ab5 Add a simple scope guard include file. 2016-09-05 23:16:47 +01:00
Jonathan G Rennison
e6c7134935 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
 2016-09-02 22:21:28 +01:00
frosch
b21e13a2a4 (svn r27553) -Update: Project files 2016-04-30 14:33:36 +00:00
frosch
e7e6b45d89 (svn r27542) -Fix (r27367) [FS#6427]: ICU got disabled for Windows builds. 2016-04-17 16:50:37 +00:00
Jonathan G Rennison
248ac0e263 Merge branch 'save_ext' into infrastructure_sharing-sx 2016-01-31 11:45:19 +00:00
Jonathan G Rennison
e5894b3948 Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 2016-01-31 11:45:08 +00:00
Jonathan G Rennison
6992312702 Merge branch 'master' into infrastructure_sharing 2016-01-31 11:44:54 +00:00
Jonathan G Rennison
ddcb3bf560 Update project files. 2015-09-11 15:16:19 +01:00
Jonathan G Rennison
ef5ecdb2c7 Merge branch 'git_findversion_fix' into save_ext 2015-08-16 14:27:46 +01:00
michi_cc
f4cd0198f4 (svn r27382) -Add: [Win32] Project files for Visual Studio 2015. 2015-08-10 20:36:57 +00:00
Jonathan G Rennison
037cce3b38 Merge branch 'save_ext' into infrastructure_sharing-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-06 23:01:01 +01:00
Jonathan G Rennison
a4ad4130a6 Merge branch 'master' into infrastructure_sharing 
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
 2015-08-06 22:55:09 +01:00
patch-import
ee791055f9 Import infrastructure sharing patch 
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
 2015-08-06 22:24:28 +01:00
Jonathan G Rennison
36d5b874da Update project files 2015-08-01 17:22:34 +01:00
frosch
67ae231f1b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 2015-07-26 09:47:17 +00:00
frosch
4b39e3d98c (svn r27152) -Fix: Generated files. 2015-02-15 14:56:21 +00:00
frosch
3ea4eebe9a (svn r26995) -Fix: Add missing files to source.list 2014-10-11 21:38:32 +00:00
planetmaker
ff71a8f5c9 (svn r26993) -Feature: Latin translation (Supercheese) 2014-10-11 21:30:33 +00:00
rubidium
8ab4f746f2 (svn r26864) -Codechange: bring a bit more OO into the disaster vehicles 2014-09-20 15:46:44 +00:00
rubidium
6a1ed21342 (svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use 2014-09-19 20:06:51 +00:00
michi_cc
7f9e7b1a08 (svn r26654) -Fix (r26482): Header file missing from sources.list. 2014-06-17 20:09:00 +00:00
michi_cc
616da05c3e (svn r26339) -Revert (r26305): Accidental changes to the VS9.0 solution file disabling the x64 build. 2014-02-15 15:01:32 +00:00
zuu
ea7483a419 (svn r26305) -Add: [nogo] ScriptStoryPageElementList() - a list of all story page elements for a given page 2014-02-06 19:41:56 +00:00
zuu
a6e0f162ed (svn r26303) -Add: [nogo] ScriptStoryPageList() - a list of all story pages 2014-02-06 19:25:39 +00:00
rubidium
4585f74faa (svn r26258) -Codechange: deduplicate Draw methods (MJP) 2014-01-13 18:12:33 +00:00
rubidium
3df799c1c6 (svn r26257) -Codechange: replace most of the SSE macros by functions 2014-01-13 18:09:21 +00:00
zuu
1672714d0f (svn r26227) -Fix: [Windows] generate.vbs didn't include SSE source files 2014-01-05 10:19:59 +00:00
rubidium
793dc27096 (svn r26214) -Add: specialised animated SSE4 blitter (MJP) 
With 32bpp base set about 15-20% faster in the Draw function (slower with 8bpp base set). Overall, with 32bpp base set, about 5% faster.
 2014-01-02 23:52:13 +00:00
rubidium
e25733c417 (svn r26213) -Add: specialised non-animated SSE4 blitter (MJP) 
With 32bpp base set about 40% faster than 32bpp-optimized, or about 10% for 8bpp base sets in the Draw function. Respectively about 8 and 1% of total run time
 2014-01-02 23:21:07 +00:00
rubidium
730127b67e (svn r26212) -Add: specialised non-animated SSSE3 blitter (MJP) 
With 32bpp base set about 35% faster than 32bpp-optimized, or about 10% for 8bpp base sets in the Draw function. Respectively about 6 and 1% of total run time
 2014-01-02 23:17:01 +00:00