Commit Graph

172 Commits

Author SHA1 Message Date
Jonathan G Rennison
5b78090a61 Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/saveload/town_sl.cpp
#	src/screenshot.h
#	src/script/api/ai/ai_date.hpp.sq
#	src/script/api/ai/ai_marine.hpp.sq
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_date.hpp.sq
#	src/script/api/game/game_marine.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/game/game_window.hpp.sq
#	src/script/api/script_window.hpp
#	src/script/api/template/template_window.hpp.sq
#	src/signal.cpp
#	src/statusbar_gui.cpp
#	src/toolbar_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
2020-08-27 18:31:09 +01:00
TechGeekNZ
a10013dd00 Codechange: Spell 'Viewport' consistently
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
2020-07-27 17:31:29 +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
b3431512ee Add modifier key window for toggling shift/ctrl key states using mouse 2019-09-05 23:21:41 +01:00
Jonathan G Rennison
49e922daa6 Remove stub HandleOnEditText and now unused global variables. 2017-03-02 00:09:35 +00:00
zuu
92f25b4f8a (svn r25372) -Add: Allow opening a goal list window specific to a company 2013-06-09 13:23:03 +00:00
zuu
eaede14b8f (svn r25372) -Add: Allow opening a goal list window specific to a company 2013-06-09 13:23:03 +00:00
zuu
88e4221d5a (svn r25369) -Add: allow opening a story window specific to a company 2013-06-09 13:13:47 +00:00
zuu
8980cb427d (svn r25369) -Add: allow opening a story window specific to a company 2013-06-09 13:13:47 +00:00
zuu
141c08166d (svn r25352) -Feature: GameScript API for selecting a story page to view 2013-06-09 12:57:22 +00:00
zuu
33ad9774fb (svn r25352) -Feature: GameScript API for selecting a story page to view 2013-06-09 12:57:22 +00:00
zuu
7a5cedf078 (svn r25344) -Feature: GUI for viewing story pages 2013-06-09 12:48:27 +00:00
zuu
a2d84868e7 (svn r25344) -Feature: GUI for viewing story pages 2013-06-09 12:48:27 +00:00
frosch
5d80d59aa6 (svn r24791) -Remove: Difficulty settings window. 2012-12-05 19:37:15 +00:00
frosch
ff6880f9dd (svn r24791) -Remove: Difficulty settings window. 2012-12-05 19:37:15 +00:00
alberth
9f8184e71e (svn r24763) -Feature: Add industry type and cargo dropdown selection for easier navigating in the industry chain window. 2012-11-25 15:24:02 +00:00
alberth
fb892f4b20 (svn r24763) -Feature: Add industry type and cargo dropdown selection for easier navigating in the industry chain window. 2012-11-25 15:24:02 +00:00
frosch
70d3206320 (svn r24309) -Codechange: Split some functions from gui.h to settings_gui.h 2012-06-01 10:44:45 +00:00
frosch
198de5397e (svn r24309) -Codechange: Split some functions from gui.h to settings_gui.h 2012-06-01 10:44:45 +00:00
rubidium
d79328ec86 (svn r23827) -Feature [FS#4992]: [NoGo] Allow to chose the goal question window's title from a (small) set of options 2012-01-21 12:03:55 +00:00
rubidium
9f162e7115 (svn r23827) -Feature [FS#4992]: [NoGo] Allow to chose the goal question window's title from a (small) set of options 2012-01-21 12:03:55 +00:00
frosch
b986a1133c (svn r23757) -Codechange: Unify the drawing of toggle buttons for boolean settings. 2012-01-05 19:32:51 +00:00
frosch
69e197c87f (svn r23757) -Codechange: Unify the drawing of toggle buttons for boolean settings. 2012-01-05 19:32:51 +00:00
rubidium
0cfe86cead (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 2012-01-03 20:26:05 +00:00
rubidium
e40eb8177a (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 2012-01-03 20:26:05 +00:00
truebrain
59de5e9570 (svn r23731) -Add: add GSGoal::Question(), to ask a question to a(ll) company(ies). It can contain random text, and at most 3 buttons from a collection of 17 2012-01-03 16:36:24 +00:00
truebrain
34d90da509 (svn r23731) -Add: add GSGoal::Question(), to ask a question to a(ll) company(ies). It can contain random text, and at most 3 buttons from a collection of 17 2012-01-03 16:36:24 +00:00
truebrain
ccf9b01f5d (svn r23630) -Add: a Goal GUI to show your current goals 2011-12-19 21:03:17 +00:00
truebrain
3ada3b9cc5 (svn r23630) -Add: a Goal GUI to show your current goals 2011-12-19 21:03:17 +00:00
rubidium
9aab2dc861 (svn r23474) -Codechange: move the declaration error related functions to error.h 2011-12-10 13:54:10 +00:00
rubidium
58423b26d1 (svn r23474) -Codechange: move the declaration error related functions to error.h 2011-12-10 13:54:10 +00:00
frosch
ef5b18ab3b (svn r22629) -Fix [FS#4599]: Remove all usages of the ErrorRefStack. It was continuously overwritten by e.g. industry prospection without closing the old error window; also StopTextRefStackUsage() was not called for errors returned by commands (which caused FS#4599). Now return in the CommandCost result whether the textref stack needs to be used, and store a copy of the stack values in the error window just like for the normal string parameters. 2011-07-03 14:32:15 +00:00
frosch
2a55273291 (svn r22629) -Fix [FS#4599]: Remove all usages of the ErrorRefStack. It was continuously overwritten by e.g. industry prospection without closing the old error window; also StopTextRefStackUsage() was not called for errors returned by commands (which caused FS#4599). Now return in the CommandCost result whether the textref stack needs to be used, and store a copy of the stack values in the error window just like for the normal string parameters. 2011-07-03 14:32:15 +00:00
alberth
03aa5395ac (svn r21589) -Codechange: Move PlaceLandBlockInfo() to the right file, introduce a ShowLandInfo() function. 2010-12-21 21:46:19 +00:00
alberth
35a8e91d01 (svn r21589) -Codechange: Move PlaceLandBlockInfo() to the right file, introduce a ShowLandInfo() function. 2010-12-21 21:46:19 +00:00
frosch
0571d871d4 (svn r20962) -Fix [FS#4166](r20956): Determine tile under cursor before opening the new viewport. It might appear just below the cursor. 2010-10-17 13:54:05 +00:00
frosch
12a7e2fde0 (svn r20962) -Fix [FS#4166](r20956): Determine tile under cursor before opening the new viewport. It might appear just below the cursor. 2010-10-17 13:54:05 +00:00
rubidium
3744fda3c1 (svn r20189) -Codechange: unVARDEF _display_opt and move it to a more logical location 2010-07-19 17:13:46 +00:00
rubidium
51ca546a9d (svn r20189) -Codechange: unVARDEF _display_opt and move it to a more logical location 2010-07-19 17:13:46 +00:00
frosch
d19a8038f4 (svn r20071) -Codechange: Consistently return the toolbar window for ShowBuildXxxToolbar(). 2010-07-04 09:27:15 +00:00
frosch
397d1186d7 (svn r20071) -Codechange: Consistently return the toolbar window for ShowBuildXxxToolbar(). 2010-07-04 09:27:15 +00:00
frosch
d12e364952 (svn r19937) -Codechange: Move some fios related prototypes to fios.h 2010-06-05 19:02:29 +00:00
frosch
13d43b8dab (svn r19937) -Codechange: Move some fios related prototypes to fios.h 2010-06-05 19:02:29 +00:00
smatz
5504b1105e (svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit 2010-02-24 14:46:15 +00:00
smatz
f051066bc4 (svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit 2010-02-24 14:46:15 +00:00
terkhen
01f8bc2578 (svn r19076) -Codechange: Move graph functions to their own header. 2010-02-10 15:24:48 +00:00
terkhen
2329eacfe8 (svn r19076) -Codechange: Move graph functions to their own header. 2010-02-10 15:24:48 +00:00
terkhen
c39a4b22aa (svn r19062) -Codechange: Move smallmap related functions to their own header. 2010-02-08 21:19:41 +00:00
terkhen
b9f06f3f29 (svn r19062) -Codechange: Move smallmap related functions to their own header. 2010-02-08 21:19:41 +00:00