Jonathan G Rennison
|
483e3172af
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/strong_typedef_type.hpp
# src/gfx.cpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/map_func.h
# src/newgrf_debug_gui.cpp
# src/order_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/rail_cmd.cpp
# src/road_cmd.cpp
# src/road_gui.cpp
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/strings.cpp
# src/tile_type.h
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
|
2023-02-10 17:19:35 +00:00 |
|
Rubidium
|
b7a5d8e296
|
Codechange: add annotation to selectively force inlining in debug build
|
2023-01-28 20:32:45 +01:00 |
|
Rubidium
|
fe2bcd2a58
|
Codechange: migrate size related functions to Map structure
|
2023-01-21 17:11:40 +01:00 |
|
Jonathan G Rennison
|
29a1e49c28
|
Change various asserts to not be included in release builds
|
2022-10-22 12:34:54 +01:00 |
|
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
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
Jonathan G Rennison
|
281d346fe2
|
Merge branch 'master' into jgrpp
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
|
2019-01-29 02:28:14 +00:00 |
|
Johannes E. Krause
|
c33596fe4a
|
Codechange: Unify tile height model in all functions (Patch by adf88, #6583)
|
2019-01-24 21:17:17 +01:00 |
|
Johannes E. Krause
|
43852baace
|
Codechange: Remove unused GetTilePixelZOutsideMap and GetTileMaxPixelZOutsideMap functions (Patch by adf88, #6583)
|
2019-01-24 21:17:17 +01:00 |
|
Jonathan G Rennison
|
f763b5d5e0
|
Remove some assertions on tile accessors in non-debug builds
|
2019-01-19 04:28:06 +00:00 |
|
Jonathan G Rennison
|
e3d167f9f0
|
Merge branch 'save_ext' into jgrpp
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
|
2019-01-14 00:01:44 +00:00 |
|
nikolas
|
4fc1b2baae
|
Fix: Grammar in a bunch of comments (#7054)
|
2019-01-13 07:38:48 +00:00 |
|
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
|
2018-11-05 12:53:36 +00:00 |
|
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
2018-10-31 12:35:54 +01:00 |
|
Jonathan G Rennison
|
f42cc19aad
|
Merge branch 'cpp-11' into crashlog_improvements
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
|
2018-04-27 00:33:44 +01:00 |
|
TrueBrain
|
66f67ac5ac
|
Fix #6550: minor spelling mistake in comment (juanjo)
|
2018-04-11 20:08:08 +02:00 |
|
Jonathan G Rennison
|
4e020d4aa2
|
Increase verbosity of tile_map.h assertions.
|
2016-03-10 00:10:34 +00:00 |
|
frosch
|
2e1be6081d
|
(svn r27148) -Fix: Rounding and unit-conversion inconsistencies in calls to MarkAllViewportsDirty.
|
2015-02-14 12:53:07 +00:00 |
|
frosch
|
891e4c40ce
|
(svn r27148) -Fix: Rounding and unit-conversion inconsistencies in calls to MarkAllViewportsDirty.
|
2015-02-14 12:53:07 +00:00 |
|
rubidium
|
47852f119e
|
(svn r26875) -Codechange: move TropicZone information from m6 to type
|
2014-09-21 11:18:10 +00:00 |
|
rubidium
|
f82c07b582
|
(svn r26875) -Codechange: move TropicZone information from m6 to type
|
2014-09-21 11:18:10 +00:00 |
|
rubidium
|
04e2324b8f
|
(svn r26873) -Change: split type_height into a type and height array (ic111)
|
2014-09-21 11:14:58 +00:00 |
|
rubidium
|
337af973b0
|
(svn r26873) -Change: split type_height into a type and height array (ic111)
|
2014-09-21 11:14:58 +00:00 |
|
rubidium
|
9caf6b4537
|
(svn r26868) -Add: methods for getting a (theoretical) slope and tile height of tiles outside of the map array (ic111)
|
2014-09-21 07:48:18 +00:00 |
|
rubidium
|
feab521cd5
|
(svn r26868) -Add: methods for getting a (theoretical) slope and tile height of tiles outside of the map array (ic111)
|
2014-09-21 07:48:18 +00:00 |
|
zuu
|
dfb5663313
|
(svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro)
|
2013-10-12 22:07:58 +00:00 |
|
zuu
|
e124838db5
|
(svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro)
|
2013-10-12 22:07:58 +00:00 |
|
zuu
|
b35b8aa5bb
|
(svn r25848) -Codechange: Refactor check for if a tile is not an edge tile to new IsInnerTile method (cirdan, LordAro)
|
2013-10-12 22:03:13 +00:00 |
|
zuu
|
e428c27a54
|
(svn r25848) -Codechange: Refactor check for if a tile is not an edge tile to new IsInnerTile method (cirdan, LordAro)
|
2013-10-12 22:03:13 +00:00 |
|
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
2013-01-08 22:46:42 +00:00 |
|
planetmaker
|
f00d9976f9
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
2013-01-08 22:46:42 +00:00 |
|
rubidium
|
19eabdba2c
|
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
|
2011-11-04 11:30:37 +00:00 |
|
rubidium
|
70faeeaba9
|
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
|
2011-11-04 11:30:37 +00:00 |
|
rubidium
|
a36551dbb4
|
(svn r23092) -Codechange: create a non-pixel version of some of the Get*PixelZ functions, and let Get*PixelZ wrap around the new function (multiplying the Z by TILE_HEIGHT) just like TileHeight and TilePixelHeight
|
2011-11-04 10:20:24 +00:00 |
|
rubidium
|
5bc8a72377
|
(svn r23092) -Codechange: create a non-pixel version of some of the Get*PixelZ functions, and let Get*PixelZ wrap around the new function (multiplying the Z by TILE_HEIGHT) just like TileHeight and TilePixelHeight
|
2011-11-04 10:20:24 +00:00 |
|
rubidium
|
7757a2ed40
|
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
|
2011-11-04 10:18:13 +00:00 |
|
rubidium
|
de980ef0f9
|
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
|
2011-11-04 10:18:13 +00:00 |
|
rubidium
|
4efa2efdbb
|
(svn r20622) -Codechange: unify [GS]et[Statation|Object|Industry|House]AnimationFrame
|
2010-08-26 14:45:45 +00:00 |
|
rubidium
|
5a7d6249af
|
(svn r20622) -Codechange: unify [GS]et[Statation|Object|Industry|House]AnimationFrame
|
2010-08-26 14:45:45 +00:00 |
|
rubidium
|
ab5b0ceff2
|
(svn r20446) -Codechange: unify the location of the water class
|
2010-08-11 14:14:06 +00:00 |
|
rubidium
|
8975ef1f7b
|
(svn r20446) -Codechange: unify the location of the water class
|
2010-08-11 14:14:06 +00:00 |
|
rubidium
|
1dbd2223ad
|
(svn r20443) -Codechange: more TileHash to a more generic location
|
2010-08-10 23:31:43 +00:00 |
|
rubidium
|
bd4524646c
|
(svn r20443) -Codechange: more TileHash to a more generic location
|
2010-08-10 23:31:43 +00:00 |
|
frosch
|
5b77a63ecf
|
(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.
|
2010-05-08 14:43:59 +00:00 |
|
frosch
|
aeb5a099ce
|
(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.
|
2010-05-08 14:43:59 +00:00 |
|
rubidium
|
82fc28f77f
|
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
|
2010-01-15 16:41:15 +00:00 |
|