Commit Graph

63 Commits (016f0bdfaf1e551b60c1656df00bfc6ccd5bebc5)

Author SHA1 Message Date
Jonathan G Rennison 56be293107 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
6 years ago
PeterN 4cebebcf68
Change: Add CargoTypes type for cargo masks. (#6790) 6 years ago
Jonathan G Rennison 385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 6 years ago
frosch d9d669dcf8 (svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent. 6 years ago
frosch 29dca1be3b (svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent. 6 years ago
Jonathan G Rennison 740e4543c3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/industry_cmd.cpp
7 years ago
frosch 82ae414e8d (svn r27928) -Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers.
-Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shard triggers. This also includes multiple RA2 in the same A123 chain.
-Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry.
7 years ago
frosch ffdcbb8f21 (svn r27928) -Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers.
-Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shard triggers. This also includes multiple RA2 in the same A123 chain.
-Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry.
7 years ago
Jonathan G Rennison 95b65163e3 Revert back to v2 of house picking/placing patch. 8 years ago
patch-import 0fd34a17a5 Update to v4 of house placing patch. 8 years ago
patch-import 19dcbb1cb9 Import Picking and placing single houses in scenario editor patch
Minor whitespace fixes

http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
9 years ago
frosch 6c63c98d7f (svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL. 11 years ago
frosch db894b0b3f (svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL. 11 years ago
alberth 6c1ff5f772 (svn r24693) -Doc: Add some doxymentation into the newgrf code. 12 years ago
alberth 33ff55a8f1 (svn r24693) -Doc: Add some doxymentation into the newgrf code. 12 years ago
alberth 8a297ca5f1 (svn r24692) -Cleanup: Cleanup final parts of the old resolver code. 12 years ago
alberth 4c9bea2a71 (svn r24692) -Cleanup: Cleanup final parts of the old resolver code. 12 years ago
alberth 2609cce514 (svn r24682) -Codechange: Add resolver classes for houses. 12 years ago
alberth d7b62da87b (svn r24682) -Codechange: Add resolver classes for houses. 12 years ago
rubidium 3d605f6488 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 13 years ago
rubidium df16ebd730 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 13 years ago
michi_cc f0ffa534de (svn r23072) -Feature: [NewGRF] House callback 0x148. 13 years ago
michi_cc e094d7db62 (svn r23072) -Feature: [NewGRF] House callback 0x148. 13 years ago
terkhen 92c429e3ee (svn r22560) -Codechange: Remove constness from House in ResolverObject. 13 years ago
terkhen 76cd19f846 (svn r22560) -Codechange: Remove constness from House in ResolverObject. 13 years ago
rubidium 7107eef4de (svn r20627) -Codechange: unify the animation code of station, airport, house and industry tiles 14 years ago
rubidium ddf1510a23 (svn r20627) -Codechange: unify the animation code of station, airport, house and industry tiles 14 years ago
rubidium 3a6c4c2f85 (svn r20624) -Codechange: some constifying for NewGRF house 14 years ago
rubidium 9982b5fd00 (svn r20624) -Codechange: some constifying for NewGRF house 14 years ago
frosch bca1abe146 (svn r19744) -Add [FS#3477]: [NewGRF] Access to random bits of houses and industries from construction callbacks 17, 28 and 2F. That is: The randombits the house/industry will start with, if construction succeeds. 14 years ago
frosch 910aade284 (svn r19744) -Add [FS#3477]: [NewGRF] Access to random bits of houses and industries from construction callbacks 17, 28 and 2F. That is: The randombits the house/industry will start with, if construction succeeds. 14 years ago
frosch dc1a95a9fd (svn r19743) -Fix: NewGrfs could access map bits of not yet constructed industries and houses during construction callbacks. 14 years ago
frosch 7795303227 (svn r19743) -Fix: NewGrfs could access map bits of not yet constructed industries and houses during construction callbacks. 14 years ago
rubidium 9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
smatz d39c08fd9d (svn r16664) -Codechange: move house-related stuff from town.h and town_type.h to separate files 15 years ago
smatz e6a165881c (svn r16664) -Codechange: move house-related stuff from town.h and town_type.h to separate files 15 years ago
smatz 91233ea596 (svn r14828) -Codechange: move most of save/load-specific code to separate files 16 years ago
smatz 7368c740a6 (svn r14828) -Codechange: move most of save/load-specific code to separate files 16 years ago
rubidium 1ce0b03bf0 (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
rubidium 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
rubidium 5a17e6b395 (svn r12817) -Feature: the ability to play NewGRF sounds for industries and stations. 16 years ago
rubidium a40bba8bac (svn r12817) -Feature: the ability to play NewGRF sounds for industries and stations. 16 years ago
skidd13 49cf499cf2 (svn r12381) -Fix [FS1835] [FS1535] (r11855): The number of houses wasn't computed right. A few other things regaring the updating had to be changed. Big thanks for support to frosch123 and SmatZ, to name just a few. (Inspired by a patch of bilbo) 17 years ago
skidd13 a887b79f90 (svn r12381) -Fix [FS1835] [FS1535] (r11855): The number of houses wasn't computed right. A few other things regaring the updating had to be changed. Big thanks for support to frosch123 and SmatZ, to name just a few. (Inspired by a patch of bilbo) 17 years ago
glx 8344327a91 (svn r11855) -Fix [FS#1335]: recompute town population when removing a 'newhouses' grf, or when loading a game with missing 'newhouses' grfs 17 years ago
glx 8c13852373 (svn r11855) -Fix [FS#1335]: recompute town population when removing a 'newhouses' grf, or when loading a game with missing 'newhouses' grfs 17 years ago
rubidium 71d4004a85 (svn r11776) -Codechange: more header splittings to reduce the dependencies. 17 years ago