duncanspumpkin
f89b0927f6
Move Update state functions to correct files
2018-05-05 11:16:20 +01:00
Hielke Morsink
6e02d6af4c
Make peep_has_food, has_item and has_drink member functions
2018-05-05 11:13:22 +01:00
duncanspumpkin
a70301c114
Make it compile
2018-05-05 11:13:20 +01:00
duncanspumpkin
48acda4316
Fix functions after move
2018-05-05 11:13:19 +01:00
duncanspumpkin
40a88dc178
Move staff functions to staff.cpp
2018-05-05 11:08:20 +01:00
duncanspumpkin
8d37502c7a
Further use of SetState
2018-05-05 11:08:17 +01:00
duncanspumpkin
012a6b4df2
Use peep->SetState
2018-05-05 11:08:16 +01:00
Hielke Morsink
c47b9c65b0
Refactor peep logic for choosing rides
2018-05-05 11:08:15 +01:00
duncanspumpkin
cbefe633d0
Further fixing
2018-05-05 11:06:26 +01:00
duncanspumpkin
986b5a3f4d
Fix rebase issues
2018-05-05 11:06:24 +01:00
duncanspumpkin
c455ee0234
Continue with guest.cpp
2018-05-05 11:06:23 +01:00
Hielke Morsink
fae6b61496
Compile guest.cpp
2018-05-05 11:06:21 +01:00
Hielke Morsink
c3723f337f
Make peep.cpp compilable again
2018-05-05 11:04:52 +01:00
duncanspumpkin
80006cd4a0
Continue
2018-05-05 11:04:50 +01:00
duncanspumpkin
f245d049f1
Further fixing
2018-05-05 11:04:49 +01:00
duncanspumpkin
87b3e5a823
Start the big refactor
2018-05-05 11:04:46 +01:00
Hielke Morsink
d6fd840d1f
Merge pull request #7190 from Broxzier/remove-cpp-checks
...
Pack nested namespaces together and add closing comments
2018-05-05 10:39:33 +02:00
Hielke Morsink
8d10bfb5a1
Add namespace closing comments
2018-05-04 22:54:43 +02:00
Hielke Morsink
bc44792da9
Pack nested namespaces together
2018-05-04 22:54:43 +02:00
Ted John
dbbd5b89e6
Fix assert in SDL2 (debug)
2018-05-04 20:24:35 +01:00
Aaron van Geffen
e92264a2af
Fix #7484 : Incorrect label offsets in New Campaign window
2018-05-04 10:45:14 +02:00
Hielke Morsink
7168fb158f
Merge pull request #6510 from Despotico/LandLineTool
2018-05-04 00:22:51 +02:00
Hielke Morsink
c1a4f410c1
Add changelog entry
2018-05-03 23:10:16 +02:00
Hielke Morsink
11aeabdb2f
Bump network version
2018-05-03 23:10:12 +02:00
Hielke Morsink
a86482576f
Land Line Tools (select land edges/row of tiles)
...
(This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.)
This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles.
The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type.
Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com >
2018-05-03 23:03:07 +02:00
Michael Steenbeek
5f9d40be7a
Replace tile_element_get_type() with struct method
2018-05-02 19:27:04 +02:00
Michael Steenbeek
369d50feee
Merge pull request #7477 from Gymnasiast/cleanup-tile-element
...
Clean up tile element usage, introduce struct methods
2018-05-02 15:06:07 +02:00
Michael Steenbeek
6d6714aa0f
Fix setters
2018-05-02 14:24:57 +02:00
Michael Steenbeek
45ce5e1d7d
Turn elementsAreAt90DegAngle into a bool
2018-05-02 13:36:45 +02:00
Michael Steenbeek
e3ac097999
Use binary literals in TileElement.h
2018-05-02 13:30:15 +02:00
Michael Steenbeek
b725916808
Use TitleCase
2018-05-02 13:27:53 +02:00
Michael Steenbeek
b690f381fb
Merge pull request #7478 from Gymnasiast/build-cleanup
...
Build cleanup
2018-05-02 12:38:50 +02:00
Michael Steenbeek
b25394dd0b
Update Xcode IDEWorkspaceChecks
2018-05-02 12:00:51 +02:00
Michael Steenbeek
abc196a4d4
Add objectsversion to .gitignore
2018-05-02 12:00:36 +02:00
Michael Steenbeek
ef433df26a
Clean up tile element usage, introduce struct methods
2018-05-02 11:58:12 +02:00
Michael Steenbeek
cc694e27d8
Merge pull request #7472 from oli414/tile-element-refactor
...
Separate tile element and surface from map
2018-05-02 09:21:00 +02:00
OpenRCT2 git bot
e2212444d6
Merge Localisation/master into OpenRCT2/develop.
2018-05-02 04:01:34 +00:00
Aaron van Geffen
507989abdd
Add Surface and TileElement to Xcode project.
2018-05-01 22:39:42 +02:00
Gymnasiast
fd4df87a8d
Fix TestPaint
2018-05-01 20:38:57 +02:00
oli414
d859bcdbbe
[ci skip] Update contributors
2018-05-01 20:38:57 +02:00
Gymnasiast
350b777fe9
Fix includes
2018-05-01 20:38:57 +02:00
oli414
8beec7a238
Revert accidental deletion
2018-05-01 18:14:03 +02:00
oli414
126881cc8a
Move last_for_tile function to tile element
2018-05-01 18:08:11 +02:00
oli414
353c8bcf8d
Adhere to coding style
2018-05-01 17:48:34 +02:00
oli414
c5fd9e67eb
Seperate tile element from map
2018-05-01 17:47:00 +02:00
oli414
3bff12c081
Seperate surface tile element
2018-05-01 16:33:16 +02:00
oli414
27aa28749c
Move surface element to seperate file
2018-05-01 14:57:13 +02:00
Aaron van Geffen
735cc2df89
Take line height into account in scenario selection screen
2018-05-01 13:58:46 +02:00
Michał Janiszewski
e0b8ff0f69
Merge pull request #7469 from OpenRCT2/android-cpp17
...
Update Android CMake project for C++17
2018-05-01 11:41:22 +02:00
Michał Janiszewski
3a0e553cf5
Use c++1z for android
2018-05-01 10:49:22 +02:00
