1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Commit Graph

9768 Commits

Author SHA1 Message Date
Alexander Overvoorde
55d3ab8cc8 Fix #3062: Backtick ` opens console when inputting text into chat or other things
For some reason SDL_IsTextInputActive() returns SDL_TRUE before any call to SDL_StartTextInput(). This may be an SDL bug, but I've worked around it for this feature by also checking if there is a valid gTextInput.buffer. I've made an exception for the console itself, where the backtick should probably continue to close it.
2016-10-12 21:52:33 +01:00
Ted John
0f695b3120 Merge pull request #4597 from IntelOrca/refactor/cursors
Refactor cursors to C++ and improve isolation
2016-10-12 16:29:14 +01:00
zaxcav
7718300881 Correct mistakes in merging conflicts. 2016-10-12 16:17:36 +02:00
wolfreak99
bea3803917 Log IP address to console 2016-10-12 10:03:15 -04:00
zaxcav
113c41b976 Moved declaration of rideIndex to before first use. 2016-10-12 15:57:55 +02:00
zaxcav
e2b830f7b9 Pathfinding checks all map elements on each tile.
Use of zero clearance will no longer block the path finding when paths and other map elements are placed in the same tile at the same height.

Pathfinding recognises map elements for shops, so peeps can find shops again.

Pathfinding recognises the park entrance, so peeps can leave the park again.
2016-10-12 15:10:34 +02:00
Ted John
62de531b4a Forward declare C functions for GCC's sake 2016-10-12 12:50:17 +01:00
Marijn van der Werf
ea801efd93 Decompile metal_b_supports_paint_setup 2016-10-12 08:19:30 +01:00
Marijn van der Werf
4e9738e6a3 Decompile path_b_supports_paint_setup 2016-10-12 08:19:20 +01:00
Michał Janiszewski
a80461da80 Fix #4553: crash due to accessing invalid sprite
Assertion gets hit when trying to get invalid sprite from
remove_peep_from_queue
2016-10-12 08:18:41 +01:00
OpenRCT2 git bot
2e35073ee7 Merge Localisation/master into OpenRCT2/develop. 2016-10-12 04:00:23 +00:00
LRFLEW
9b552ea6e2 Update Xcode Project 2016-10-11 23:18:28 +01:00
Broxzier
b80e63788b Add myself to 'Additional implementation' and changed changelog entry 2016-10-11 23:36:29 +02:00
Broxzier
1fcca773aa Resolves left-shift warning for signed variables 2016-10-11 23:35:00 +02:00
Broxzier
b9e7786a53 [ci skip] Removes unused variables 2016-10-11 23:27:15 +02:00
Broxzier
9fdad31be2 Tile inspector raises surface when all corners are raised. Removes printf. 2016-10-11 23:27:14 +02:00
Broxzier
2ad5ef3c5f fix path corner checksbox values 2016-10-11 23:27:13 +02:00
Broxzier
52beb417e7 Cleanups 2016-10-11 23:27:12 +02:00
Broxzier
2b87dcf71a Fix crash when moving selected tile with spinners 2016-10-11 23:27:11 +02:00
Broxzier
75326ba0c1 Add toggle for blocked paths - even works when the banner is non-blocking 2016-10-11 23:27:10 +02:00
Broxzier
e078c032dd Add banner text info. Fix rotating banners (they are never rotated, but have a position) 2016-10-11 23:27:09 +02:00
Broxzier
5ee1fc294d Use rotation mask instead of modulo operator to get indices 2016-10-11 23:27:08 +02:00
Broxzier
4243545faa Large scenery info 2016-10-11 23:27:07 +02:00
Broxzier
1e4de56baf Clipping strings in list to fit their column 2016-10-11 23:27:06 +02:00
Broxzier
3ac29b20c0 Disables fence slope setting for entries that do not allow sloped fences
- Replaces places where the first element was requested to use the same function
2016-10-11 23:27:05 +02:00
Broxzier
a68dc7afb8 Add fence and banner info to tile inspector
This commit also renamed a flag, and corrected the use of one. The
flags in question are WALL_SCENERY_BANNER, WALL_SCENERY_2_FLAG4, and
WALL_SCENERY_2_FLAG5.
2016-10-11 23:27:04 +02:00
Broxzier
34a7ab5c63 Reordered widget defines
These defines are used to calculate the edges of the widgets. They are
now ordered in the same way the widgets are listed for the pages.
This commit also adds some extra defines, to make it more easy to tweak
the sizes and padding of widgets.
2016-10-11 23:27:03 +02:00
Broxzier
0de8b4f1f5 Add dropdown for changing fence slopes 2016-10-11 23:27:02 +02:00
Broxzier
545da27201 Add clamp button for corrupt elements 2016-10-11 23:27:01 +02:00
Broxzier
3eb4d8c182 Add raise/lower for remaining elements, fix sort button not switching page 2016-10-11 23:27:00 +02:00
Broxzier
f5423f7586 Entrance details
@todo: For park entrances, the left and right tile do not show the entrance ID. Will solve this later.
2016-10-11 23:26:59 +02:00
Broxzier
af59bf3c2b Add entrance type detail and raise/lower ability 2016-10-11 23:26:58 +02:00
Broxzier
a9654213c9 Improve corrupt element insertion, code formatting
Corrupt elements are now placed right under the selected element
Local tile-inspector variables now all use camelCaseNames
Removed unused string, and shifted string IDs
2016-10-11 23:24:43 +02:00
Broxzier
7eb4c72e94 Moved new strings to end of file, and formatting
strings should be in order, and code formatted was to make it more consistant
2016-10-11 23:21:43 +02:00
Broxzier
1871f4290a Add raise/lower option for surface and fix clearance height 2016-10-11 23:21:42 +02:00
Broxzier
8707cea1b4 Add surface corner properties 2016-10-11 23:21:41 +02:00
Broxzier
5807291b30 scenery page and some changes to the other pages 2016-10-11 23:21:40 +02:00
Broxzier
eeca2eb976 Removes unneeded variables from track block functions 2016-10-11 23:21:39 +02:00
Broxzier
0d48418c5f Add path name to path details 2016-10-11 23:21:38 +02:00
Broxzier
e45470ad89 Fix 'RCT2_GLOBAL undefined' build error 2016-10-11 23:21:37 +02:00
Broxzier
dbe5ad1bb1 Fix 'type defaults' build error 2016-10-11 23:21:36 +02:00
Broxzier
40bb41d15d pinner for fence height, apply-all works for lift hill & cleanups
- Removes old (now unused) string
- Cleans up includes in tile_inspector.c
- Properly invalidating widgets upon changes made
- Invalidates tile when lift hill is changed
- Makes 'apply to all' works for lift hills
2016-10-11 23:21:35 +02:00
Broxzier
a894fa44d4 Add toggle to raise/lower entire track block, and to raise fances
On top of that, added the definition of one of the map flags, and an
assert that I placed while debugging, which wouldn't hurt leaving there.
2016-10-11 23:21:34 +02:00
Hielke Morsink
2beccc1e84 Added 2 pixel transparent border to icon for its offset 2016-10-11 23:21:33 +02:00
Hielke Morsink
874ccb4c6c Added sort button, cleaned up page switching. 2016-10-11 23:21:32 +02:00
Hielke Morsink
5b57e3e5e9 Corrected comments 2016-10-11 23:21:31 +02:00
Hielke Morsink
863aa236a3 Displaying track ID and sequence 2016-10-11 23:21:30 +02:00
Hielke Morsink
6b16c18532 Solved string allocation issue by passing two arguments now (thanks Ted)! 2016-10-11 23:21:29 +02:00
Hielke Morsink
263c64dfba Added ride information for tracks, and some minor fixes
- Displaying ride infoormation for track pieces (type, ID, name)
- Allowing to change height of a track piece
- Allowing to set and upset wether a track piece is a lift hill
- Consistent text colouring for all labels and widgets
- Making use of the chain flag instead of magic numbers
- Fixed 'insert corrupt element' not working (button was not enabled
  anymore)
- Formatting: ordered includes, consistent variable naming, comments for
  closing switches
2016-10-11 23:20:18 +02:00
Hielke Morsink
8f94976409 Added land ownership status to details. 2016-10-11 23:12:08 +02:00