mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,455 Commits 8 Branches 40 Tags 367 MiB
Commit Graph

927 Commits

Author SHA1 Message Date
clang-format 16720f0182 clang-format UI drawing 2018-07-23 16:00:13 +02:00
clang-format ebb17929a7 clang-format UI audio 2018-07-23 16:00:12 +02:00
Hielke Morsink 4d38475f12 Undefine keywords to fix macOS build 2018-07-23 15:58:01 +02:00
Hielke Morsink ce59ed0ba2 Fix include order and defines for Windows builds 2018-07-23 15:57:59 +02:00
Michał Janiszewski 4a77801cb3
Increase the allowed aspect ratio epsilon (#7775) 2018-07-18 22:33:20 +01:00
Ted John 3d85ec4ea1
Fix #7786: Crash when importing a track design (#7790) 2018-07-18 21:19:25 +01:00
Brian Callahan 66bfd42551 Do not print which(1) errors to the console 
On first launch of the game, OpenRCT2 tries to find Gnome or KDE eyecandy dialog programs zenity and kdialog to inform the user to set the `game_path`. It will fall back to an SDL popup with manual instructions if neither is found, which looks fine. However, if OpenRCT2 is launched from the command line, which will print "file not found" errors if you don't have zenity and/or kdialog installed, which might potentially confuse the user.

This patch routes the error messages to `/dev/null`, as we don't really care if those programs are not found.

See this thread on the OpenBSD mailing list: https://marc.info/?l=openbsd-ports&m=153020454402268&w=2
 2018-07-07 20:53:50 +02:00
muemart 6365eaba66 Fix #3177: Wrong keys displayed in shortcut menu 
SDL_GetScancodeName doesn't actually translate the scancode to the physical key, so first we need to convert the scancode to a keycode and then turn the keycode into a string.
 2018-07-03 20:48:28 +02:00
Ted John fe76c807aa Fix #7707: Opening scenario editor closes game 
Ensure w is updated after closing the dropdown window.
 2018-06-27 11:11:50 +02:00
Michael Steenbeek 1b08fb4e69 Replace our own integer types with standard ones 2018-06-20 17:30:40 +02:00
Michael Steenbeek ec3a1e575e
Replace Math::Min and Max with std variants 2018-06-20 17:11:35 +02:00
Ted John 98905fdbc3 Change g_window_list to use the heap for windows 2018-06-16 16:04:01 +01:00
Ted John 0f6138f8b6 Convert g_window_list to a std::vector 2018-06-16 16:04:01 +01:00
Ted John a716b4aa28 Remove use of window list in Viewport.cpp 2018-06-16 16:04:01 +01:00
Aaron van Geffen 1f5572fe28 Fix #7701: Strings overflow in drawing debug windows. (#7702) 
The last widget was not taken into account.
 2018-06-16 14:41:18 +01:00
Ted John 26666b1da9 Remove empty function: viewport_update_pointers 2018-06-15 23:15:52 +01:00
Hielke Morsink 14d6625c15
Merge pull request #7695 from Broxzier/wide-path-debug 
Add debug option to visualize wide path flags.
 2018-06-15 17:07:50 +02:00
Hielke Morsink 0528a455e9 Automatically resize debug window to fit strings 2018-06-15 16:13:47 +02:00
Hielke Morsink 0fda25d365 Add debug option to visualize wide path flags. 
This implements #7694
 2018-06-15 16:08:25 +02:00
Hielke Morsink 0cf256ac9e Ready copyright notice for clang-format 
Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier.

I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
 2018-06-15 14:07:34 +02:00
Michael Steenbeek 74dd8a4eac
Merge pull request #5993 from wolfreak99/improved_window_inputs/ride_price_textinput 
Make ride window prices allow text input
 2018-06-15 10:09:37 +02:00
Michael Steenbeek 7bd4244797
Merge pull request #7628 from Chaosmeister/unpickable-research-items 
make always researched researchitems unpickable.
 2018-06-15 09:47:08 +02:00
Aaron van Geffen ee64daae58 Fix event list. 2018-06-15 09:36:17 +02:00
Gymnasiast fe54cf5ee6 Allow forcing decimals 2018-06-15 09:36:17 +02:00
wolfreak99 961d25dbb9 Make ride window prices allow text input 2018-06-15 09:36:17 +02:00
Ted John fdb1d98868
Move rain window loop to libopenrct2ui (#7684) 2018-06-15 07:46:04 +01:00
Hielke Morsink c3cff07b91 Disallow placing items in-between always researched items 
This adds a loop that iterates down the list, until it reaches either a researched item or the end.
 2018-06-15 00:34:30 +02:00
Hielke Morsink c437f438f1 Remove invalid cast 2018-06-15 00:34:30 +02:00
Hielke Morsink 30b9d3a338 Move always_researched checks and add comments 2018-06-15 00:34:30 +02:00
Chaosmeister 308ae4b357 Make always-researched research items unpickable. 2018-06-15 00:34:30 +02:00
Michael Steenbeek 8a9dfa6033
Stop ride type dropdown state sharing among ride windows 
This eliminates the _rideType variable, which was necessary when we still used a spinner and an Apply button, but is now no longer needed.
 2018-06-14 20:15:31 +02:00
Michael Steenbeek 9436dab66c
Fix #7655: Large portions of the screen do not invalidate properly 
Also fixes #7676.
Error was introduced during refactoring in 85dc161c5a.
 2018-06-14 12:01:55 +02:00
Ted John 9e9c2c072e Fix #7678: Crash when Loading or starting a new game... 
...while having object selection window open

Close the object manager window before loading the next park.
 2018-06-13 23:29:05 +01:00
Hielke Morsink 6b22a9d38b
Merge pull request #7586 from Broxzier/refactor/banner-ride-index 
Banner code cleanups
 2018-06-13 21:48:04 +02:00
Andy Ford 2ab3bd515d Fix #7673: Vehicle names cut in invention list (#7675) 
* Fix #7673: Vehicle names cut in invention list

The string formatting was formatting based on the size of the
pointer to the buffer, not the buffer itself, this truncated all
vehicle names to 8 characters.

* Adjust Long Vehicle Names For Vertical Scrollbar

The ellipsis in long vehicle names were being cut off by
the scrollbar. Reduced the string formatting length by
vertical scrollbar size - 1. The extra 1 is for the fact
that the second column starts + 1 from the middlepoint of the box.
 2018-06-13 21:44:25 +02:00
Ted John 86ca6be58b Fix #7674: Rides show up as random numbers in guest's ride list 2018-06-13 18:32:00 +01:00
Ted John dea935314e Add null check for showing guest's favourite ride 2018-06-13 18:27:32 +01:00
Ted John 7373987f0a
Merge pull request #6978 from tobiaskohlbau/refactor/network 
HTTP: Refactor into modern C++
 2018-06-12 21:50:46 +01:00
pkubaj 7a65faa477 Add string include (#7667) 
LLVM 6.0 on FreeBSD needs it for basic_string template.
 2018-06-12 20:46:20 +01:00
Andy Ford ebf8c19272 Fix #7653: Loan spinner too small for big loans (#7663) 
On large loans in the millions (e.g. Alton Towers / BPB), the loan
amount can extend that it runs over the loan spinner widget. This change
enlarges the loan box to allow for large loans.
 2018-06-11 22:08:59 +02:00
Hielke Morsink 7355b497a1 Use new banner index type 
BannerIndex is defined in common.h (like some other types such as money32 and rct_string_id), so that banner.h wouldn't have to be includede everywhere. Later on, it may be nicer to have a custom types file instead of putting them all in common.h.
 2018-06-11 13:29:41 +02:00
Hielke Morsink ead97a4638 Split colour into union with ride index 
The colour field in the banner object is also used to store the ride index when a banner is linked to a ride. This commit turns this field into a union with both named fields, to make the code clearer.

It also changes the return types of related functions to uint8 instead of sint32, and makes use of the RIDE_ID_NULL define where applicable.
 2018-06-11 13:21:48 +02:00
Aaron van Geffen 7cfa6aa176 Fix non-network builds. 2018-06-11 11:49:45 +02:00
Aaron van Geffen f1d4e5b596 Rename Http namespace, add default initialisers. 2018-06-11 11:19:04 +02:00
Michał Janiszewski bcd4e9c50b
Merge pull request #6284 from janisozaur/compiler-warnings 
Compiler warnings
 2018-06-11 11:06:34 +02:00
Tobias Kohlbau 62c25d88fb HTTP: refactor http into modern C++ 
Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2018-06-11 10:24:19 +02:00
Ted John b043428cf0
Merge pull request #6998 from JeroenDStout/railway-crossings-wait 
Railway crossing behaviour for peeps and vehicles
 2018-06-11 09:09:07 +01:00
Michał Janiszewski 841fea1eb0 Revert "Update SDL2 includes to non-system" 
This reverts commit b43a9a6ccf, as SDL2
fails -Wdocumentation check
 2018-06-11 09:52:54 +02:00
Michał Janiszewski 1d28826b79 Fix -Wdocumentation and add it to default warnings 2018-06-11 09:52:54 +02:00
Aaron van Geffen 8ef5f4e02e Update Xcode project. 2018-06-11 01:22:24 +02:00
Ted John 3096c4de00 Remove window internals from TileInspector logic 2018-06-11 00:09:00 +01:00
Ted John 04da3be824 Move Widget.cpp to libopenrct2ui 2018-06-11 00:04:41 +01:00
Ted John a4d6a45e78 Move window_all_wheel_input to libopenrct2ui 2018-06-10 23:56:05 +01:00
Ted John 370a6300c0 Move ViewportInteraction to libopenrct2ui 2018-06-10 23:39:56 +01:00
Ted John ae6af47341 Move TitleSequencePlayer to libopenrct2ui 2018-06-10 23:39:56 +01:00
Ted John bc1d2252aa Remove window dependency from Ride.cpp 2018-06-10 23:34:36 +01:00
Ted John 5a368ce6d9 Move theme code to libopenrct2ui 2018-06-10 23:34:27 +01:00
Ted John e6e61c3a2f Move create window code to libopenrct2ui 2018-06-10 23:34:20 +01:00
Ted John e38f4df575 [wip] Move themes to libopenrct2ui 2018-06-10 23:34:12 +01:00
Ted John 85dc161c5a Add SetMainView to WindowManager 2018-06-10 23:33:52 +01:00
Ted John d1d9f0a86a Add debug drawing option for blocked tiles 
Replace old unused original drawing code toggle options with new option to show which tiles are blocked by vehicles.
 2018-06-10 22:59:58 +01:00
Hielke Morsink 36d123b272
Revert renaming of spinners (#7650) 2018-06-10 21:31:08 +02:00
Hielke Morsink 82370c36c6
Allow holding down spinners in tile inspector (#7647) 
This basically moves much of the event handling from mouseup to mousedown, and adds a new array with widget indices for the spinners. This automatically enables scrolling for them as well.
 2018-06-10 18:55:44 +02:00
Andy Ford 1acb1c4b35 Fix #7434: Diagonal ride segments cannot be deleted if they are isolated 
Mimic vanilla RCT2:

- If the isolated track is the last piece on the ride, delete and
set the construction mode to a straight piece. Rotate said piece
45 degrees anti-clockwise.
- If other track still exists, delete and rotate as above but
set the track type to station-platform.
- If banked, set track type to the turn that entered the previous
orientation. For example, north west banked track would continue
with a banked 45 degree turn starting facing west.
 2018-06-10 17:34:37 +02:00
Hielke Morsink 0fc4cad80f
Fix tile inspector errors for banner (#7640) 
This is likely the least used page of the tile inspector, since two things have been broken for months apparently.

- The checkboxes for the blocked edges weren't being positioned correctly
- Rotating a banner that has either 0 or more than 1 edges blocked, the blocked edges weren't updated correctly
 2018-06-09 17:16:04 +02:00
Aaron van Geffen e920871d67
Fix #7601: Always-researched items not rendered with inset. (#7638) 
This re-introduces the use of buffers to work around colours not being set properly.

For clipping strings, we also now manually invoke `gfx_clip_string` instead of relying
on `gfx_draw_string_left_clipped` to do it for us. The latter resets the current font,
meaning it prevents the use of `MEDIUM_EXTRA_DARK` bases. This issue should be addressed
in a later commit.
 2018-06-08 22:57:29 +02:00
Aaron van Geffen b2b997c328
Fix #6647: Prevent changelog window from painting lines out of view. (#7611) 2018-06-08 09:30:20 +02:00
Michał Janiszewski 320eee0d59
Fix -Wunreachable-code-break and add it to deafult warnings (#7634) 2018-06-06 22:30:21 +02:00
Michał Janiszewski cee74a06e1
Fix #7595: Docker image fails to build (#7633) 2018-06-06 22:23:01 +02:00
Michał Janiszewski 27b684e785
Merge pull request #7629 from Broxzier/missing-field-initializers 
Fix missing field initializers
 2018-06-06 20:28:41 +02:00
Hielke Morsink b9590f14b1
Merge pull request #7627 from Broxzier/scrolling-spin-uh-steppers 
Allow scrolling on spinners/steppers
 2018-06-06 20:00:38 +02:00
Hielke Morsink 184c46992c Fix remaining non-empty list initializers 2018-06-05 16:07:54 +02:00
Hielke Morsink de3cab59bb Fix warnings reported by travis 2018-06-05 16:07:54 +02:00
Hielke Morsink 8aa122f54e Use empty initializer lists in the openrct2ui project 2018-06-05 14:37:24 +02:00
Aaron van Geffen 5b6ae9d9cb Fix appearance of brake/booster speed widgets 2018-06-04 18:51:37 +02:00
Hielke Morsink 32c4dab6c8 Move cut-away stepper logic to mousedown handler 
This makes scrolling work for the stepper widget, and overrides behaviour for scrolling anywhere else in the window.
 2018-06-04 13:41:27 +02:00
Michał Janiszewski 30e6cf1787 Remove OpenGLAPIProc.h from headers check target 2018-06-04 12:05:54 +02:00
Michał Janiszewski 798a4fe1a7 Add header verification for openrct2-ui 2018-06-04 12:05:54 +02:00
Hielke Morsink 15c908e4af Remove no longer needed global widget indices 2018-06-04 01:11:00 +02:00
Michał Janiszewski b43a9a6ccf Update SDL2 includes to non-system 2018-06-03 22:32:10 +02:00
Michał Janiszewski 995d72f262 Remove function unused with HTTP disabled 2018-06-03 19:56:11 +02:00
Aaron van Geffen 35242f4815 Improve scrolling behaviour in object selection window (#7607) 2018-06-03 14:46:17 +02:00
Michał Janiszewski debb6cd46c Remove declarations of unimplemented functions (#7615) 2018-06-02 13:51:23 +02:00
Aaron van Geffen 9ee1a1f4df
Fix #7613: Improve scrolling behaviour in staff list. (#7614) 2018-06-02 13:06:38 +02:00
Aaron van Geffen 635eab3305
Merge pull request #7579 from AaronVanGeffen/widgets/spinners 
Make widget spinners horizontal
 2018-06-02 00:03:20 +02:00
Aaron van Geffen f2b0f7457e Terminology change: rename spinners to steppers. 2018-06-01 23:25:07 +02:00
Aaron van Geffen 0e930287c6 Change spinners for MapGen, Editor{Objective,Scenario}Options. 2018-06-01 23:25:07 +02:00
Ted John e40a8d2cf5
Merge pull request #7591 from OpenRCT2/performance/msbuild 
Improve msbuild performance

Ensure source file names are unique so that all object files can be written to a single directory which allows a single MSVC instance to compile all source files in parallel.
 2018-06-01 21:26:15 +01:00
Aaron van Geffen 03020530ef Order vehicle type dropdown orthographically. 2018-06-01 20:35:52 +02:00
Aaron van Geffen 9806ab878d Refactor current vehicle dropdown preparation into its own function. 
Splitting the lot off to window_ride_show_vehicle_type_dropdown.
 2018-06-01 18:48:27 +02:00
Aaron van Geffen af0d8fea36 Change spinners for Cheats and Map windows. 2018-06-01 15:29:56 +02:00
Aaron van Geffen e5f184b01b Spinners for CustomCurrency, RideConstruction, ServerStart, ViewClipping. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 64b04cccd1 Change spinners in Tile Inspector to new +/- buttons. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 88955543d1 Spinners for Finances, NewCampaign, Park windows. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 262409a8d4 Fix #7578: Clicking same price throughout park on accident. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 2181e35b95 Replace spinner widgets with horizontal +/- buttons. 
Limited to Options and Ride windows so far.
 2018-06-01 15:20:13 +02:00
Michael Steenbeek e91777bd7e
Small cleanup to ride window price box 2018-06-01 14:23:46 +02:00
Ted John 92f6ac7333 Rename header files to match renamed source files 2018-06-01 09:38:30 +02:00
Ted John b3c17b215f Use single output folder for msbuild obj files 
This requires unique named source files within a project.
 2018-06-01 09:37:49 +02:00
Hielke Morsink 2fed57d792
Check for ghost flag when removing track blocks (#7596) 2018-05-31 22:36:45 +02:00
Michał Janiszewski 3137469272
Merge pull request #7593 from janisozaur/remove-extra-decls 
Remove superfluous declarations
 2018-05-31 00:53:50 +02:00
Hielke Morsink f805c8db1a Fix #7589: Error in ride window's hold_down_widgets 2018-05-31 00:24:48 +02:00
Michał Janiszewski 58ea1b3446 Add missing #pragma once 2018-05-31 00:22:19 +02:00
Aaron van Geffen bf44007197 Allow fine-tuning the virtual floor style (#7577) 
The virtual floor by @JeroenDStout, introduced in the v0.1.2 release, has generally been well-received. However, some players find it too intrusive in its current appearance (cf. #7221). This PR gives them the option of a toned-down version, rather than having to turn it off completely.

![screenshot_20180528_221350](https://user-images.githubusercontent.com/604665/40628292-6e71358e-62c4-11e8-9293-e166e75d0da6.png)

The clear/transparent style, introduced by this PR, looks like the virtual floor as originally introduced in #6338:
![](https://user-images.githubusercontent.com/14242454/31050274-e3f0e62e-a645-11e7-9b10-ec26b733d631.gif)

The glassy/translucent style is the virtual floor as we've come to know it since the v0.1.2 release, and remains the default setting.
 2018-05-30 13:09:50 +02:00
Aaron van Geffen 2127a0170e
Merge pull request #7567 from IntelOrca/performance/park-loading 
Improve performance of park loading
 2018-05-30 11:51:16 +02:00
Ted John f5e77a9e15 Load objects for title editor and scenario editor 2018-05-29 18:39:12 +01:00
Aaron van Geffen 6eadf00a33 Order ride type dropdown orthographically. 2018-05-29 19:09:56 +02:00
Aaron van Geffen 8a1de9d8fd Turn ride type selection into a normal dropdown. 
This removes the spinner aspect that previously worked around dropdown item limits.
 2018-05-29 19:09:56 +02:00
Park Joon-Kyu 30fa405eb3 Make Twitch integration API URL configurable. (#7555) 2018-05-28 22:01:37 +02:00
Hielke Morsink 617372fd38 Check for page correctly 2018-05-27 18:07:05 +02:00
Hielke Morsink 15ae358946
Fix #7569: Assertion hit when using the XY spinners (#7570) 
The X/Y spinners change the currently tile selected, and reset the element selection index. Previously this would also set the page to default immediately, but since that's now done on invalidation instead, the page would not be correct. This is fixed by checking the index of the selected element too, instead of only the selected page, in the mouse_up event.
 2018-05-27 18:03:34 +02:00
Hielke Morsink f5c8ad2189
Merge pull request #7562 from AaronVanGeffen/windows/inventions-resize 
Resizeable invention list window
 2018-05-27 15:28:18 +02:00
Ted John cce37698e8 Fix #7454: Rides list windows has weird strings... 
The ride list assumed the ride structure had 0 packing. Format the name by explicitly setting format arguments to the ride's name arguments.
 2018-05-27 13:27:43 +01:00
Aaron van Geffen 1a2958df84 Make text painting adapt to scrollview width as well. 2018-05-27 00:45:50 +02:00
Aaron van Geffen 248585281c Fix #6221: Make invention list resizeable. 2018-05-27 00:37:45 +02:00
Aaron van Geffen 7a107264df Tile inspector: clip overly long object name strings. 2018-05-26 01:20:46 +02:00
Aaron van Geffen 146235931f Tile inspector: use SCROLLABLE_ROW_HEIGHT constant. 
The tile inspector window was using its own LIST_ITEM_HEIGHT constant,
instead of the SCROLLABLE_ROW_HEIGHT constant commonly used in other windows.

This fixes CJK text overlapping.
 2018-05-26 01:20:29 +02:00
Hielke Morsink 1a9dc7beee
Fix #7564 Some buttons are not greyed out when they should (#7565) 2018-05-25 23:09:52 +02:00
Aaron van Geffen 8a724c3983 Hide speed and length statistics for flat ride TD6 files (#7563) 
This hides the speed and length statistics in the track design list when viewing designs for non-tracked rides.

Fixes #7507.
 2018-05-25 23:01:27 +02:00
Aaron van Geffen a2f39079a7
Merge pull request #7556 from Gymnasiast/tile-element-cleanup 
Replace all occurrences of tile_element_is_last_for_tile()
 2018-05-25 13:34:28 +02:00
Hielke Morsink c50011aa3e Re-add zebra stripes and light text 2018-05-25 00:46:21 +02:00
Hielke Morsink 59c7b097ee Add Ctrl + Click to select tile elements 
Co-authored-by: wolfreak99 <jbminor1991@gmail.com>
 2018-05-25 00:46:20 +02:00
Hielke Morsink 0d77c279aa Fix: buttons sometimes stay pressed 
In the invalidate function of the tile inspector, the checkboxes get checked to match the selected tile element. Some of those checkboxes share their widget index with buttons from other pages. When a checkbox is checked, the it's set to be "pressed", which causes the butons in the other tabs so appear that way. This behaviour is fixed by unpressing widgets when switching to another page.
 2018-05-25 00:46:20 +02:00
Hielke Morsink fe40005372 Automatically set the correct page 
Instead of having to set the page and setup the widgets correctly when a new elements gets selected, it now switches automatically on invalidation to the correct tab. This fixes the issue where pasted elements were selected but the page for them not shown, and removes two of the intents that were made for the tile inspector.
 2018-05-25 00:46:20 +02:00
Hielke Morsink 4b25a71924 #5832 Resize tile inspector automatically when selecting a tile element 2018-05-25 00:46:19 +02:00
Hielke Morsink f79589527d Adjust list style to match other lists 
- No odd/even checked colours
- Black text (white on hover)
- Darker background
- Solid fill background for hovered and selected element
 2018-05-25 00:46:19 +02:00
Hielke Morsink 4c1097d5b1 Minor code cleanups 2018-05-25 00:46:19 +02:00
Michael Steenbeek b573bd49b3 Replace all occurrences of tile_element_is_last_for_tile() 2018-05-24 11:44:53 +02:00
Aaron van Geffen ca16fe8e62 Fix refurbishment confirmation window not closing in multiplayer mode. 2018-05-23 16:33:37 +02:00
jensj12 3f0308a517 Fix Travis builds 2018-05-23 16:33:37 +02:00
jensj12 50e3f8b4f6 Cleanup of ride_demolish 2018-05-23 16:33:37 +02:00
jensj12 23dc6bb9d3 Add button to refurbish ride 
Add a button to refurbish the selected ride. The cost for this is 35% of the
build price and may only be done if the ride is closed and empty.
 2018-05-23 16:33:37 +02:00
deurklink 996ca5a880 Fix #7528: Tab changing in park pricing window happens on mousedown instead of mouseup (#7542) 2018-05-19 14:57:05 +02:00
wolfreak99 8c9b56d0f2 Keep "Save track design" dropdown open (#7531) 2018-05-19 14:13:08 +02:00
Ted John 34531f7afb
Fix signed/unsigned mismatch warnings (#7529) 
Unignore MSVC warning: C4245:
'conversion_type': conversion from 'type1' to 'type2', signed/unsigned mismatch
 2018-05-16 21:22:17 +01:00
Michał Janiszewski a2ef4bd699
Exclude pre-formatted blocks from clang-format (#7520) 
[ci skip]
 2018-05-16 20:41:29 +02:00
Aaron van Geffen 829ac11bec
Merge pull request #7519 from IntelOrca/refactor/new-object-types-prep 
Refactor code around object types
 2018-05-15 15:10:16 +02:00
Aaron van Geffen 19442eb6c2
Merge pull request #7510 from Broxzier/feature/horizontal-clipping 
Horizontal Clipping
 2018-05-15 14:55:05 +02:00
Aaron van Geffen 59e682a835
Merge pull request #6807 from ZehMatt/ga-removewall 
Refactors GAME_COMMAND_REMOVE_WALL to a GameAction.
 2018-05-15 09:54:37 +02:00
Ted John 6f00e6aafe Make ObjectRepositoryItem C++ 2018-05-15 00:36:35 +01:00
Ted John f8271e93b0 Refactor code base to allow easy addition of new object types 2018-05-15 00:32:36 +01:00
Michael Steenbeek fcf507e051
Spin off shop item stuff to separate files 2018-05-14 19:21:43 +02:00
Hielke Morsink 9f0d820b7c Use TileCoordsXYZD for wall locations 2018-05-14 12:36:45 +02:00
Ted John f0348dafb7 Fix MSVC warning 2018-05-13 01:11:56 +01:00
Ted John 7eb1703f36 Remove old bitmap code via UiContext 2018-05-13 01:11:56 +01:00
Ted John 229c50dff9 Add bitmap reading support 2018-05-13 01:11:56 +01:00
Hielke Morsink 5b64abd7aa Keep 'select area' button pressed while the tool is active 2018-05-12 14:48:22 +02:00
Hielke Morsink 1324b6ae8f Add group boxes and clear button 2018-05-12 14:26:03 +02:00
Hielke Morsink 4e5f5de1a3 Update the year in copyright notice for changed files 2018-05-12 14:24:51 +02:00
Hielke Morsink 9034a0bce9 Restore old selection when the tool gets interupted 
And re-type the selection variables to use LocationXY8 instead of storing them separately.
 2018-05-12 14:24:47 +02:00