dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,121 Commits 1 Branch 0 Tags
f5e9805b105f49d5589e25bdfccc7f92af2de7c3
Commit Graph

1251 Commits

Author SHA1 Message Date
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
Jonathan G Rennison
4a162c5502 Merge branch 'cpp-11' into save_ext 2019-01-13 23:30:52 +00:00
Jonathan G Rennison
0bed63b77f Merge branch 'master' into cpp-11 2019-01-13 22:49:55 +00:00
Peter Nelson
59fe4f28c8 Change: Animate text effects by real time instead of game ticks. 2019-01-11 11:56:21 +00:00
Peter Nelson
ead9c9eab5 Change: Switch various window timers to real time instead of game ticks. 2019-01-11 11:56:21 +00:00
Peter Nelson
2a8fa5fef9 Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks. 2019-01-11 11:56:21 +00:00
Gabda87
a0293d313d Add #4115: default company colour setting (#6998) 
Works only in single player.
 2019-01-10 10:45:38 +01:00
Jonathan G Rennison
0dba091d79 Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	config.lib
#	src/saveload/saveload.cpp
 2019-01-06 22:10:04 +00:00
Jonathan G Rennison
962a9c5430 Merge branch 'master' into cpp-11 
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/saveload/saveload.cpp
 2019-01-06 22:07:28 +00:00
Jonathan G Rennison
4f1d54564e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
 2019-01-02 16:09:44 +00:00
glx
c540d72445 Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32 2018-12-27 18:09:16 +01: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
SamuXarick
4703cd433d Fix #6460: [AI] Add start_date parameter for Random AIs on new game 2018-11-01 17:56:09 +01:00
Charles Pigott
f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Jonathan G Rennison
3a640af71d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
 2018-10-29 18:33:15 +00:00
Niels Martin Hansen
50efaa2372 Fix e00908f: Visual C++ 2015 compile error 
Microsoft Visual C++ 2015 Update 3 (and possibly other versions) consider a struct member undefined in a
static_assert in the struct body. Moving the static_assert to a member function solves the issue.
 2018-10-27 10:30:24 +02:00
Miguel Horta
e00908f5e9 Fix #6898: Replace atoi() with strtoul() 
Normalize type and parsing of generation_seed across all files
Add assert_compile() to ensure correct type
 2018-10-11 20:22:31 +01:00
Jonathan G Rennison
3d60f2a4cf Merge branch 'crashlog_improvements' into jgrpp 2018-08-26 22:25:26 +01:00
Jonathan G Rennison
743432e7f0 Try to do non-main thread crash save/screenshot in main thread 2018-08-26 22:23:11 +01:00
Jonathan G Rennison
9490f33a6c Merge branch 'master' into crashlog_improvements 
# Conflicts:
#	src/console_cmds.cpp
#	src/openttd.cpp
#	src/vehicle.cpp
 2018-07-26 20:01:08 +01:00
Jonathan G Rennison
5661763d6a Merge branch 'crashlog_improvements' into jgrpp 2018-07-26 19:04:34 +01:00
Jonathan G Rennison
7f027f8dca Add tile info dump function and assert variants 2018-07-26 18:48:53 +01:00
Jonathan G Rennison
035f5622b9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
 2018-07-24 18:30:42 +01:00
Niels Martin Hansen
2a868b9f3b Feature: Framerate display window (#6822) 
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
 2018-07-19 21:17:07 +02:00
Jonathan G Rennison
373ff3dd4e Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/table/settings.h.preamble
 2018-07-02 18:41:39 +01:00
Jonathan G Rennison
4d1bd8e4b4 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/music.cpp
#	src/table/settings.ini
#	src/town_cmd.cpp
#	src/train_cmd.cpp
 2018-06-25 18:57:48 +01:00
Niels Martin Hansen
6298b96571 Change: Modernise music control logic implementation (#6839) 
Rewrite of almost the entire music control logic to a more modern style, hopefully also easier to understand. The old playlist handling made it look like arcane magic, which it doesn't have to be.

- Playlists are now stored in std::vector of objects instead of arrays of bytes with magic sentinel values, that need to be rotated around all the time. Position in playlist is stored as a simple index.
- The theme song is now reserved for the title screen, it doesn't play on any of the standard playlists, but is still available for use on custom playlists.
- When the player enters/leaves the game from the main menu, the music always restarts.
- Playback state (playing or not) is kept even if music becomes unavailable due to an empty playlist (or an empty music set), so it can restart immediately if music becomes available again.
- The shuffle algorithm was changed to a standard Fisher-Yates.
- Possibly better behavior when editing a custom playlist while it's playing.
- Custom playlists should be compatible.
- Framework for supporting custom playlists with songs from multiple music sets.
 2018-06-24 20:06:05 +02:00
Jonathan G Rennison
fa304cdb75 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
 2018-05-25 19:09:20 +01:00
Jonathan G Rennison
6342099c4d Allow 256 NewGRFs in multiplayer 
Add extended network format for server info
Add general UDP packet fragmentation system
Fix map dimensions >= 64k
Increase length of server revision string
Maintain backwards compatibility with trunk for advertisement/server listing
 2018-05-12 09:11:41 +01:00
Jonathan G Rennison
ad1c402ad8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
 2018-05-03 23:54:51 +01:00
Patric Stout
aef69443e7 Remove: WinCE support 2018-04-29 15:32:16 +02:00
Patric Stout
85adde7485 Remove: PSP support 2018-04-29 15:32:16 +02:00
Jonathan G Rennison
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
Jonathan G Rennison
4bcd05a620 Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	findversion.sh
 2018-04-27 01:33:39 +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
Jonathan G Rennison
b90c5b9618 Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2018-04-26 23:59:13 +01:00
Ricardo N Feliciano
e8de33a61f Cleanup: Use new filename for README file. (#6738) 2018-04-21 11:05:38 +02:00
Jonathan G Rennison
8c0c9274ea Merge branch 'infrastructure_sharing' into jgrpp 
# Conflicts:
#	src/economy.cpp
#	src/misc.cpp
#	src/openttd.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-01-26 18:47:08 +00:00
Jonathan G Rennison
9000d74f3c Pay all cargo payment incomes when cargo finally delivered 2018-01-26 18:28:57 +00:00
Jonathan G Rennison
38fb8c1b84 Zoning: Cache expensive zoning overlay values 2018-01-22 17:49:53 +00:00
Jonathan G Rennison
e54a7189fd Add debug command line switch to quit after fixed number of days 2018-01-15 21:47:10 +00:00
Jonathan G Rennison
4a6ddb2d50 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	config.lib
 2017-09-04 01:22:54 +01:00
Jonathan G Rennison
f3a0aace0c Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2017-08-15 18:44:17 +01:00
Jonathan G Rennison
3813b3ca09 Dump infrastructure totals when mismatch detected in CheckCaches. 2017-02-22 02:51:25 +00:00
Jonathan G Rennison
2fbeb29277 Merge branch 'crashlog_improvements' into jgrpp 
# Conflicts:
#	src/misc.cpp
#	src/openttd.cpp
 2017-02-21 21:50:08 +00:00
Jonathan G Rennison
349ddd90b7 Maintain a circular buffer of recent commands, add to crashlog. 
Add console command to dump command log.
Increase max crashlog size.
 2017-02-21 21:49:56 +00:00
Jonathan G Rennison
3b45419a16 Merge branch 'master' into save_ext 2017-02-02 20:41:48 +00:00
Jonathan G Rennison
90cd312428 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios.h
 2017-01-17 19:11:09 +00:00
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. 2017-01-14 18:30:26 +00:00
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. 2017-01-14 18:30:26 +00:00