Commit Graph

112 Commits

Author SHA1 Message Date
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
edfd378e93 Merge branch 'master' into jgrpp
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
2019-10-05 21:45:54 +01:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
Jonathan G Rennison
90cd312428 Merge branch 'master' into jgrpp
# Conflicts:
#	src/fios.h
2017-01-17 19:11:09 +00:00
frosch
1aedadb49b (svn r27730) -Change: Split openttd.grf into openttd.grf and orig_extra.grf
openttd.grf is now always loaded and provides all extra graphics in case the (possibly outdated) baseset does not.
  orig_extra.grf contains graphics specific to the original baseset only.
2017-01-14 15:48:19 +00:00
frosch
79027cbf9d (svn r27730) -Change: Split openttd.grf into openttd.grf and orig_extra.grf
openttd.grf is now always loaded and provides all extra graphics in case the (possibly outdated) baseset does not.
  orig_extra.grf contains graphics specific to the original baseset only.
2017-01-14 15:48:19 +00:00
Jonathan G Rennison
73367d7209 build: include win32/win64 in output bundle name for mingw target. 2015-11-17 18:56:57 +00:00
rubidium
7fea190641 (svn r25595) -Fix-ish: move the Doxygen .tag files into objs, so they are automatically ignored and removed upon mrproper/distclean. Furthermore remove the gamedocs folder too 2013-07-13 06:44:22 +00:00
rubidium
8f89cd6dd3 (svn r25595) -Fix-ish: move the Doxygen .tag files into objs, so they are automatically ignored and removed upon mrproper/distclean. Furthermore remove the gamedocs folder too 2013-07-13 06:44:22 +00:00
frosch
e4c87948c5 (svn r25205) -Feature: Translations of baseset descriptions via lang files. 2013-04-24 20:30:02 +00:00
frosch
df63cb6cef (svn r25205) -Feature: Translations of baseset descriptions via lang files. 2013-04-24 20:30:02 +00:00
planetmaker
57d452df50 (svn r24569) -Fix (r23817): Naming of bundles was somewhat broken 2012-10-03 09:12:51 +00:00
planetmaker
8259649381 (svn r24569) -Fix (r23817): Naming of bundles was somewhat broken 2012-10-03 09:12:51 +00:00
matthijs
29dac5506f (svn r23907) -Fix: [Makefile] Let "make clean --dry-run" not delete Makefiles. 2012-02-07 09:57:08 +00:00
matthijs
1d937e8581 (svn r23907) -Fix: [Makefile] Let "make clean --dry-run" not delete Makefiles. 2012-02-07 09:57:08 +00:00
rubidium
57afd9e9e8 (svn r23220) -Change: move the baseset files to their new location 2011-11-14 21:38:36 +00:00
rubidium
79b82b56a8 (svn r23220) -Change: move the baseset files to their new location 2011-11-14 21:38:36 +00:00
rubidium
0ed88d732f (svn r20752) -Change: move removal of bin/data/openttd.grf from distclean to maintainer-clean 2010-09-05 21:50:59 +00:00
rubidium
d2572f94d2 (svn r20752) -Change: move removal of bin/data/openttd.grf from distclean to maintainer-clean 2010-09-05 21:50:59 +00:00
rubidium
36c1c1bdb5 (svn r20490) -Change: merge the extra GRF sources so updating them becomes a bit easier.
The (prebuilt) grf will still remain, so if you don't have NFORenum and GRFCodec it will still work.
2010-08-14 14:50:06 +00:00
rubidium
7d11c392a4 (svn r20490) -Change: merge the extra GRF sources so updating them becomes a bit easier.
The (prebuilt) grf will still remain, so if you don't have NFORenum and GRFCodec it will still work.
2010-08-14 14:50:06 +00:00
rubidium
27e8dc1bb0 (svn r19884) -Feature: translatable desktop shortcut comments 2010-05-22 19:59:37 +00:00
rubidium
45440063b5 (svn r19884) -Feature: translatable desktop shortcut comments 2010-05-22 19:59:37 +00:00
rubidium
1d6bfd2a6c (svn r19018) -Change: [Makefile] Make test an alias for regression, distclean an alias for mrproper and update mrproper to really delete all generated files/directories. 2010-02-05 16:20:04 +00:00
rubidium
a80eb0a1c0 (svn r19018) -Change: [Makefile] Make test an alias for regression, distclean an alias for mrproper and update mrproper to really delete all generated files/directories. 2010-02-05 16:20:04 +00:00
smatz
6a944f06b3 (svn r17454) -Codechange: some alignment in Makefile*.in 2009-09-07 13:33:45 +00:00
smatz
6e3591700f (svn r17454) -Codechange: some alignment in Makefile*.in 2009-09-07 13:33:45 +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
5d2b6f8474 (svn r16318) -Change: use !! instead of @@ in src/*.in too.
-Change: use @ instead of ~ in configure/Makefiles so Debian's build system(s) can also build RC binaries.
2009-05-16 12:36:33 +00:00
rubidium
a34d5bb6ab (svn r16318) -Change: use !! instead of @@ in src/*.in too.
-Change: use @ instead of ~ in configure/Makefiles so Debian's build system(s) can also build RC binaries.
2009-05-16 12:36:33 +00:00
truebrain
c2406cd42d (svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
NoAI is an API (a framework) to build your own AIs in. See:
   http://wiki.openttd.org/wiki/index.php/AI:Main_Page
 With many thanks to:
  - glx and Rubidium for their syncing, feedback and hard work
  - Yexo for his feedback, patches, and AIs which tested the system very deep
  - Morloth for his feedback and patches
  - TJIP for hosting a challenge which kept NoAI on track
  - All AI authors for testing our AI API, and all other people who helped in one way or another
-Remove: all old AIs and their cheats/hacks
2009-01-12 17:11:45 +00:00
truebrain
a3dd7506d3 (svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
NoAI is an API (a framework) to build your own AIs in. See:
   http://wiki.openttd.org/wiki/index.php/AI:Main_Page
 With many thanks to:
  - glx and Rubidium for their syncing, feedback and hard work
  - Yexo for his feedback, patches, and AIs which tested the system very deep
  - Morloth for his feedback and patches
  - TJIP for hosting a challenge which kept NoAI on track
  - All AI authors for testing our AI API, and all other people who helped in one way or another
-Remove: all old AIs and their cheats/hacks
2009-01-12 17:11:45 +00:00
rubidium
5dd4735da1 (svn r14636) -Add: DOS port of OpenTTD, without network support though. 2008-11-26 13:12:45 +00:00
rubidium
a614dd7174 (svn r14636) -Add: DOS port of OpenTTD, without network support though. 2008-11-26 13:12:45 +00:00
truebrain
570c998c60 (svn r14474) -Add: allow --binary-name to set the name of the binary, icon, desktop file, etc. when installing. Useful to get a stable next to a trunk-nightly 2008-10-16 11:12:18 +00:00
truebrain
1fc852cb31 (svn r14474) -Add: allow --binary-name to set the name of the binary, icon, desktop file, etc. when installing. Useful to get a stable next to a trunk-nightly 2008-10-16 11:12:18 +00:00
smatz
ab00ea7393 (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell 2008-10-14 19:47:28 +00:00
smatz
14d8689e66 (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell 2008-10-14 19:47:28 +00:00
skidd13
91665fd7e4 (svn r14443) -Change: Unify the delimiters used in config* and make* 2008-10-06 17:05:44 +00:00
skidd13
5b8af7db3b (svn r14443) -Change: Unify the delimiters used in config* and make* 2008-10-06 17:05:44 +00:00
truebrain
113fbb8cb3 (svn r14244) -Fix: add 'Auto-generated' text when autogenerated, not in template (complain by blathijs ;)) 2008-09-04 19:15:52 +00:00
truebrain
2f350316b6 (svn r14244) -Fix: add 'Auto-generated' text when autogenerated, not in template (complain by blathijs ;)) 2008-09-04 19:15:52 +00:00
truebrain
ea19a10dd2 (svn r14227) -Fix [configure]: detect if we are in a new directory, and rerun configure in those cases. Should avoid confusion (idea by Eddi) 2008-09-02 16:28:31 +00:00
truebrain
aaf1d78220 (svn r14227) -Fix [configure]: detect if we are in a new directory, and rerun configure in those cases. Should avoid confusion (idea by Eddi) 2008-09-02 16:28:31 +00:00
truebrain
ee67c64c67 (svn r14224) -Fix: copy Makefile.bundle too to your working dir, so you don't need to run ./configure in the root of OpenTTD 2008-09-02 15:34:38 +00:00
truebrain
ded6434502 (svn r14224) -Fix: copy Makefile.bundle too to your working dir, so you don't need to run ./configure in the root of OpenTTD 2008-09-02 15:34:38 +00:00
rubidium
7f272e11ae (svn r14074) -Codechange: split the bundle generation out of the main makefile so it can be reused for making bundles from MSVC compiles. 2008-08-15 11:58:15 +00:00
rubidium
3a529ce878 (svn r14074) -Codechange: split the bundle generation out of the main makefile so it can be reused for making bundles from MSVC compiles. 2008-08-15 11:58:15 +00:00