Commit Graph

316 Commits (b59f229723e9cf82f85287dcbe80028384799183)

Author SHA1 Message Date
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison 5242ec4642 Fix handling of GRF programmable signal graphics with trace restrict 5 years ago
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
6 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison 17257b9620 Add: 32bpp SSE2 blitter palette animator (#6795)
Create a new blitter mode: 32bpp-sse2-anim, which is 32bpp-anim + this.
32bpp-sse2-anim is now used by default where 32bpp-anim would have been.
Also use this with the 32bpp-sse4-anim blitter.

See issue #6469.
6 years ago
Jonathan G Rennison 1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 6 years ago
Ricardo N Feliciano e8de33a61f Cleanup: Use new filename for README file. (#6738) 6 years ago
frosch b1fe837b8e (svn r27775) -Fix [FS#6510]: Insufficient thread synchronisation when switching blitters. (JGR) 7 years ago
Jonathan G Rennison 2d473c05b0 Fix use-after-free when switching blitters in SDL and Win32 modes.
This mostly occurs when disabling pallete animation when fast-forward
is enabled.
7 years ago
Jonathan G Rennison 90cd312428 Merge branch 'master' into jgrpp
# Conflicts:
#	src/fios.h
8 years ago
frosch 7b553d255e (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 8 years ago
frosch 050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 8 years ago
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.
8 years ago
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.
8 years ago
Jonathan G Rennison 20a090b077 Show warning dialog if NewGRFs use too many string IDs.
Show when reloading/changing NewGRF config, or starting new game.
8 years ago
Jonathan G Rennison d00fa4d25b Implement a 32bpp SSE2 palette animator. This is ~4x faster than 32bpp-anim's.
Create a new blitter mode: 32bpp-sse2-anim, which is 32bpp-anim + this.
32bpp-sse2-anim is now used by default where 32bpp-anim would have been.
Also use this with the 32bpp-sse4-anim blitter mode.

Fix memory leak in current 32bpp animated blitters.
9 years ago
Jonathan G Rennison 69f3844d2e Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/settings_gui.cpp
	src/settings_type.h
	src/table/settings.ini
9 years ago
Jonathan G Rennison a93714a720 Add setting to show restricted electric signals using the default sprites.
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
9 years ago
Jonathan G Rennison 8edf5e0a34 Special case OpenGFX as a "base" set to allow recolouring signals. 9 years ago
Jonathan G Rennison 5b1fe71552 Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/rail_cmd.cpp
9 years ago
Jonathan G Rennison 4d484a858f Fix attempts to recolour signal sprites from GRFs. 9 years ago
Jonathan G Rennison f2d0c3a441 Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/gfxinit.cpp
	src/rail_cmd.cpp
	src/table/sprites.h
9 years ago
Jonathan G Rennison 8faead7e7a Graphically indicate restricted signals by recolouring the signal post.
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
9 years ago
Jonathan G Rennison 7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
9 years ago
patch-import 536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
Jonathan G Rennison 6596ba216c Merge branch 'zoning' into jgrpp
Conflicts:
	src/table/sprites.h
9 years ago
Jonathan G Rennison 03373c7ef4 Zoning: Remove unimplemented modes, fix some whitespace and style issues,
add missing licence headers, move/rename some declarations, fix sprite
ID allocation, update to build on trunk.
9 years ago
patch-import 6de087786c Import and rebase zoning patch
Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
9 years ago
patch-import fc0efe599e Port of the programmable signals patch to recent trunk
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
peter1138 d48a176f4c (svn r26919) -Fix [FS#6096]: Crash when enabling "Full animation" if multiplayer chat text is on screen. 10 years ago
peter1138 e5aec526a7 (svn r26919) -Fix [FS#6096]: Crash when enabling "Full animation" if multiplayer chat text is on screen. 10 years ago
rubidium beb540ec55 (svn r26538) -Codechange: remove double accounting of the drivers 10 years ago
rubidium b476086c39 (svn r26538) -Codechange: remove double accounting of the drivers 10 years ago
frosch b2c786ea68 (svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes.
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
10 years ago
frosch 631e8b45fd (svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes.
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
10 years ago
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
rubidium 59ab35bd4c (svn r26217) -Change: blitter autoselection based on full animation state, so the non-animated optimizations can actually be used in an easy manner (based on patch by MJP) 11 years ago
rubidium f480c5a623 (svn r26217) -Change: blitter autoselection based on full animation state, so the non-animated optimizations can actually be used in an easy manner (based on patch by MJP) 11 years ago
rubidium 6f4078a379 (svn r26216) -Change: the blitter selection to also consider the 32bpp-sse4-anim blitter (MJP) 11 years ago
rubidium 1d4565a666 (svn r26216) -Change: the blitter selection to also consider the 32bpp-sse4-anim blitter (MJP) 11 years ago
rubidium 4a911754b5 (svn r26209) -Codechange: remove some template magic and simplify some code 11 years ago
rubidium 2618d960e3 (svn r26209) -Codechange: remove some template magic and simplify some code 11 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
frosch fd986f651a (svn r23987) -Fix (r23000): Also reset the font glyph cache when switching blitters. 13 years ago
frosch df54f25efe (svn r23987) -Fix (r23000): Also reset the font glyph cache when switching blitters. 13 years ago
michi_cc 14094d00bf (svn r23887) -Feature: [NewGRF] Support for container version 2. 13 years ago
michi_cc 6db39410a1 (svn r23887) -Feature: [NewGRF] Support for container version 2. 13 years ago
michi_cc 3c23f1f776 (svn r23886) -Codechange: Allow limiting the MD5 file hash to the first x bytes of the file. 13 years ago
michi_cc a9b6c5cd86 (svn r23886) -Codechange: Allow limiting the MD5 file hash to the first x bytes of the file. 13 years ago
rubidium d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
rubidium 6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
rubidium 5879b4e39f (svn r23214) -Codechange: for base media sets pass the "search in tars" parameter to determine what to do 13 years ago
rubidium 15f671279d (svn r23214) -Codechange: for base media sets pass the "search in tars" parameter to determine what to do 13 years ago
michi_cc e07c107eb1 (svn r23001) -Feature: [NewGRF] Automatically switch to a 32 bpp blitter on NewGRF indication. 13 years ago
michi_cc 71bd681d87 (svn r23001) -Feature: [NewGRF] Automatically switch to a 32 bpp blitter on NewGRF indication. 13 years ago
michi_cc 7b35dd4f54 (svn r23000) -Feature: Base graphics sets can now specify a preferred blitter which OpenTTD uses to decide which blitter to load. 13 years ago
michi_cc c575b5bbd7 (svn r23000) -Feature: Base graphics sets can now specify a preferred blitter which OpenTTD uses to decide which blitter to load. 13 years ago
rubidium 60b96c051b (svn r22828) -Codechange: give some variables a better name and clean up the code of loading old style GRFs 13 years ago
rubidium 49d8852f3f (svn r22828) -Codechange: give some variables a better name and clean up the code of loading old style GRFs 13 years ago
rubidium af80e9106e (svn r22826) -Codechange: pass sub directory to NewGRF loading functions 13 years ago
rubidium 8e5f433b22 (svn r22826) -Codechange: pass sub directory to NewGRF loading functions 13 years ago
rubidium 26788cf363 (svn r22825) -Codechange: pass subdir to FioOpenFile 13 years ago
rubidium 2a12c9df2f (svn r22825) -Codechange: pass subdir to FioOpenFile 13 years ago
rubidium c8167de1c2 (svn r22822) -Codechange: make a distinction between base sets and newgrfs for their directory 13 years ago
rubidium 0061b5f184 (svn r22822) -Codechange: make a distinction between base sets and newgrfs for their directory 13 years ago
alberth a70556dac2 (svn r22459) -Doc: Typo fixes and doxygen markup improvements. 13 years ago
alberth 28092366ec (svn r22459) -Doc: Typo fixes and doxygen markup improvements. 13 years ago
frosch 74e71380ef (svn r22419) -Change: Always use the DOS palette for drawing.
-Remove: the '-i' option for palette selection.
13 years ago
frosch bbcd2bab5d (svn r22419) -Change: Always use the DOS palette for drawing.
-Remove: the '-i' option for palette selection.
13 years ago
frosch 3d0d0729af (svn r22418) -Fix (r22417): Messed up the palette detection of the extra base grf. 13 years ago
frosch c7a9c7dc92 (svn r22418) -Fix (r22417): Messed up the palette detection of the extra base grf. 13 years ago
frosch ad541cb188 (svn r22417) -Add: an advanced setting to specify the default palette to use for NewGRFs without action 14 palette information; this makes the default choice independent from the used base graphics and '-i' option. 13 years ago
frosch bfd09004fe (svn r22417) -Add: an advanced setting to specify the default palette to use for NewGRFs without action 14 palette information; this makes the default choice independent from the used base graphics and '-i' option. 13 years ago
rubidium 9fc2798baf (svn r22411) -Document: another bunch of bits 13 years ago
rubidium fb5ecb9499 (svn r22411) -Document: another bunch of bits 13 years ago
rubidium 360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
rubidium 30f2afac9b (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
frosch c8758fc7a7 (svn r20384) -Fix: Update cursor dimensions when reloading grfs resp. changing base graphics, so the cursor does not glitch if it becomes bigger. 14 years ago
frosch 01833039bd (svn r20384) -Fix: Update cursor dimensions when reloading grfs resp. changing base graphics, so the cursor does not glitch if it becomes bigger. 14 years ago
rubidium 6634d6ab82 (svn r20305) -Change: reduce OpenTTD's install size by roughly 460 KiB by only providing the "extra" base graphics in one palette and doing the conversion upon loading; the conversion has existed for a while, but now the NewGRF can tell its palette using Action 14 thus it can enable the conversion for only that NewGRF. 14 years ago
rubidium dfb0a2c9a5 (svn r20305) -Change: reduce OpenTTD's install size by roughly 460 KiB by only providing the "extra" base graphics in one palette and doing the conversion upon loading; the conversion has existed for a while, but now the NewGRF can tell its palette using Action 14 thus it can enable the conversion for only that NewGRF. 14 years ago
alberth 1743c86610 (svn r20266) -Doc: Mostly typo fixes, a few doxygen-related improvements. 14 years ago
alberth a825b4fa5f (svn r20266) -Doc: Mostly typo fixes, a few doxygen-related improvements. 14 years ago
rubidium d9393035ea (svn r20253) -Codechange: change GRFConfig::windows_paletted into a bitmask/bitset 14 years ago
rubidium e469a94a2d (svn r20253) -Codechange: change GRFConfig::windows_paletted into a bitmask/bitset 14 years ago
rubidium 54a204c108 (svn r19674) -Fix [FS#3774]: crash when the music/graphics metadata files were unreadable 14 years ago
rubidium 83e40b8ced (svn r19674) -Fix [FS#3774]: crash when the music/graphics metadata files were unreadable 14 years ago
yexo daf89297fe (svn r19256) -Codechange: use a constructor/destructor for GRFConfig to make sure all members are properly initialized 15 years ago
yexo 7ff55502f0 (svn r19256) -Codechange: use a constructor/destructor for GRFConfig to make sure all members are properly initialized 15 years ago
yexo 2eea7da8e6 (svn r19212) -Fix: base graphics set with an empty filename in the obg file caused segfaults 15 years ago
yexo 3b9da089e5 (svn r19212) -Fix: base graphics set with an empty filename in the obg file caused segfaults 15 years ago
rubidium 38aff74d42 (svn r19206) -Add: concept of fallback base sets, i.e. do not automatically load the NoMusic/NoSound sets when there is another set 15 years ago
rubidium 03e5434e63 (svn r19206) -Add: concept of fallback base sets, i.e. do not automatically load the NoMusic/NoSound sets when there is another set 15 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 42d7f30dcc (svn r18608) -Change: add the concept of music sets 15 years ago
rubidium a8d6d18b22 (svn r18608) -Change: add the concept of music sets 15 years ago