mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into reorganise-src

Browse Source 
Conflicts:
	projects/openrct2.vcxproj
	src/interface/window.h
This commit is contained in:
IntelOrca
2014-10-07 20:07:15 +01:00
parent b828f678b8 b80abdc0c2
commit a32f73d27f
15 changed files with 481 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/localisation/string_ids.h
View File

@@ -287,9 +287,9 @@ enum {
STR_SLOPE_UP_TIP = 1188,
STR_CONSTRUCT_THE_SELECTED_FOOTPATH_SECTION_TIP = 1189,
STR_REMOVE_PREVIOUS_FOOTPATH_SECTION_TIP = 1190,
STR_COST = 1191,
STR_BLACK_STRING = 1191,
STR_LOSS = 1192,
STR_WINDOW_COLOUR_2_STRING = 1193,
STR_CLOSED = 1194,
STR_TEST_RUN = 1195,
STR_OPEN = 1196,
@@ -886,6 +886,15 @@ enum {
STR_REAL_NAME_TIP = 2488,
STR_HOTKEY = 2489,
STR_SHORTCUT_DESCRIPTION_0 = 2493,
STR_SHORTCUT_DESCRIPTION_31 = 2524,
STR_INDIVIDUAL_KEYS_BASE = 2525,
STR_SHORTCUT_ENTRY_FORMAT = 2781,
STR_SHIFT_PLUS = 2782,
STR_CTRL_PLUS = 2783,
STR_FINACNES_PARK_VALUE = 2787,
STR_ENTER_NAME_INTO_SCENARIO_CHART = 2790,