8581808952
Merge tag '14.0-beta2' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/cargotype.cpp
# src/console_cmds.cpp
# src/graph_gui.cpp
# src/industry_cmd.cpp
# src/industrytype.h
# src/misc_gui.cpp
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_town.cpp
# src/object_cmd.cpp
# src/openttd.cpp
# src/pathfinder/water_regions.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/table/build_industry.h
# src/table/engines.h
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
3 months ago
7ce06e22b8
Split date types into calendar and economy dates
...
See: 735abfe1
4 months ago
cfebbfac8c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/autoreplace_cmd.cpp
# src/company_base.h
# src/company_gui.cpp
# src/cpu.cpp
# src/debug.h
# src/group.h
# src/group_cmd.cpp
# src/house.h
# src/industry.h
# src/newgrf_house.cpp
# src/news_type.h
# src/openttd.cpp
# src/saveload/company_sl.cpp
# src/settings_type.h
# src/sl/oldloader_sl.cpp
# src/story.cpp
# src/table/town_land.h
# src/viewport.cpp
4 months ago
2fd9096070
Change: Decouple and remove landscape-dependent cargo types. ( #11719 )
...
Cargo types of default engines, industries and houses are now specified in terms of label.
4 months ago
c0ab436077
Codechange: Store Colours in Colours type. ( #11625 )
...
This reduces casts, some magic numbers, and introduces a bit of type-safety.
4 months ago
77173a6a10
Codechange: Move date consts and functions to CalendarTime and TimerGameCalendar classes
9 months ago
3d7e5d5369
Avoid unnecessary viewport redraws for unused tile loop house triggers
2 years ago
860c270c73
Codechange: Replace assert_compile macro with static_assert
3 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
48b334cf97
Add: Houses can accept up to 16 different cargo types via NewGRF.
...
New Action0 property 23 for feature 07, variable length, format B n*(B B). Initial byte is number of structures following. First byte in structure is cargo id, second is acceptance level in 1/8 units.
5 years ago
f292a87dc4
(svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w
11 years ago
fa51dee557
(svn r24177) -Fix (r0) [FS#5148]: The arctic "shops and offices" used the "church" sprite in one of its four views.
12 years ago
e094d7db62
(svn r23072) -Feature: [NewGRF] House callback 0x148.
13 years ago
e2e26190d5
(svn r20623) -Codechange: unify the storing of animation related information
14 years ago
6d6939f844
(svn r20401) -Codechange: let HouseSpec use GRFFileProps
14 years ago
4bd32799f1
(svn r20286) -Codechange: Unify end of doxygen comments.
14 years ago
ed4f806f1d
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
e5a3900d37
(svn r19802) -Codechange: Replace some more magic numbers by corresponding constants
14 years ago
e91165ef6e
(svn r19800) -Codechange: Replace magic number by corresponding constant
14 years ago
6260d243ee
(svn r18888) -Codechange: Rename PALETTE_59[EF] to something more meaningful.
15 years ago
ee3a44e74f
(svn r18567) -Fix [FS#2613]: [NewGRF] House property 15 did not work
15 years ago
65b3e38bea
(svn r18403) -Codechange: Re-arrange header of table _original_house_specs
15 years ago
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
59d45a04d6
(svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible.
15 years ago
d72273d1f3
(svn r15717) -Cleanup: apply some documentation coding style upon the stuff in table/
15 years ago
4b4e73c1dd
(svn r13368) -Codechange: give house's min/max_date a better name, as it is really year, not date
16 years ago
d03994098b
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
16 years ago
00f0bf98ee
(svn r12751) -Codechange: do what has been done in r11862 in a different way so it uses less memory.
16 years ago
26c621945d
(svn r11862) -Fix [FS#1559]: when two NewGRFs 'fight' to define the same cargo it could happen that the strings are defined by one cargo and the 'action2' by another and when one assumes that both come from the same NewGRF... So store the GRF ID with the strings. To be extra sure add the same protection mechanism to industries and towns too.
17 years ago
6f296b9870
(svn r11102) -Codechange: remove some pointless addition+substractions. Patch by frosch.
17 years ago
3cc31aae86
(svn r9823) -Feature: Add support for house property 1F - minimum life span.
17 years ago
fc6cf587cd
(svn r9650) -Documentation: Finalize doxygen comments for town_land.h
17 years ago
83c269d071
(svn r9642) -Documentation: Having a different macro name for _original_house_specs (MS) than for _town_tile_data (M) might teach doxygen that we are dealing with two entities...
17 years ago
39735f7b54
(svn r9619) -Documentation: Comments on drawing arrays of houses and industries
17 years ago
b82ed41a19
(svn r9366) -Codechange: Unify the different houses acceptances attributes on their cargo counterpart, as well as specifying cargo slot.
17 years ago
73ff939ddb
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
...
the newhouses grf specs, so all newhouses grfs will be playable in the game.
Many thanks to everyone who contributed code and ideas, and all the testers
who found things we missed.
17 years ago
24c4d5b06d
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
17 years ago
4b4c5a403b
(svn r8129) -Codechange: Change data tables to use split off palette map. And
...
include a file missed last time...
18 years ago
66bbf336c6
(svn r7759) -Merge: makefile rewrite. This merge features:
...
- A proper ./configure, so everything needs to be configured only once, not for every make.
- Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
- A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
- Proper support for OSX universal binaries.
- Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
- Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
18 years ago
Jonathan G Rennison
Peter Nelson
Tyler Trahan
Charles Pigott
S. D. Cloudt
Niels Martin Hansen
rubidium
frosch
michi_cc
belugas
maedhros