OpenRCT2 git bot
2dc87469fd
Merge Localisation/master into OpenRCT2/develop.
2017-08-05 04:00:29 +00:00
Marijn van der Werf
c1598c269c
Update Xcode project
2017-08-04 18:12:54 +02:00
duncanspumpkin
18d082053e
Rename cpp files to use TitleCase
2017-08-04 18:12:54 +02:00
jensj12
1faa2726c7
Update all windows after changing colour scheme
2017-08-04 13:18:29 +02:00
Ted John
4221e5f9b7
Merge pull request #6098 from wolfreak99/about_openrct2_fix
...
About OpenRCT2 window redesigned to show two tabs, one for OpenRCT2 information and one for RCT2 information.
2017-08-04 08:49:01 +01:00
Gymnasiast
ca77c75a56
Improve tabs, alignment, remove now-unnecessary information and strings
...
Removes RCT2 version string, Infogrames credits and logo, removes strings for aforementioned info.
Moves OpenRCT2 version string to under the Changelog... button, rewords and fixes some of the strings
2017-08-04 08:41:46 +02:00
wolfreak99
ffc1dc6376
Add OpenRCT2 information and changelog to About window
2017-08-04 08:38:35 +02:00
Gymnasiast
12354e1f2a
Fix #6113 : track list preview shows incorrect heighest drop height
2017-08-03 11:58:00 +02:00
Michał Janiszewski
cc24978ea5
Fix broken assert in decode_chunk_repeat
2017-08-03 08:41:34 +02:00
OpenRCT2 git bot
2934a10d58
Merge Localisation/master into OpenRCT2/develop.
2017-08-03 04:00:18 +00:00
Michał Janiszewski
e9e37d2aac
Validate more inputs to SawyerChunk handlers
2017-08-03 00:29:56 +02:00
Richard Jenkins
dabc52b036
Merge pull request #6088 from Chaosmeister/develop
...
prevent infinite loop while fixing invalid research items
2017-08-02 23:10:44 +01:00
Michał Janiszewski
c956ccc4d4
Reset the string builder rather than overwrite it
2017-08-02 23:54:49 +02:00
Michał Janiszewski
ede8054726
Make multilaunch retest ride count after some updates
2017-08-02 23:50:49 +02:00
Michał Janiszewski
b3b2a1ece2
Improve multilaunch test to delete the load result
2017-08-02 23:50:38 +02:00
Michał Janiszewski
6ee9bf6799
Free listen_address when releasing config
2017-08-02 23:16:00 +02:00
Ted John
bdf8993c48
Fix #6111 : Mute button always visible in editor
2017-08-02 21:28:23 +01:00
Duncan
77330ac257
Fix #5890 . Primary and secondary colours now work in zoomed opengl. ( #6109 )
...
Mistake made due to a missunderstanding of how the software renderer works. At this point in the software renderer the primary and secondary colours are already calculated into the palette so can be ignored. In opengl the colours still need to be passed to the command queue. Fixes #4715 as well.
Update changelog
2017-08-02 20:58:11 +01:00
Michał Janiszewski
01271f68d8
Call game_load_init() in multilaunch test
2017-08-02 19:39:52 +02:00
Michał Janiszewski
c3dd3f193f
Extend multilaunch test to perform game_logic_updates
2017-08-02 19:39:52 +02:00
Richard Jenkins
1d473fb9c6
Merge pull request #6105 from wolfreak99/patch-1
...
Update CONTRIBUTING.md
2017-08-02 13:57:33 +01:00
wolfreak99
e77730a3b4
Update CONTRIBUTING.md
2017-08-02 08:52:27 -04:00
Tomas Dittmann
b330c4032f
ensure validity instead of asserting invalidity.
2017-08-01 21:45:04 +02:00
Michael Steenbeek
2f3a30f22b
Fix cast to bool in map element functions
2017-08-01 13:42:50 +02:00
Michał Janiszewski
ee443818a8
Verify size of objects sent/requested ( #6076 )
2017-08-01 12:29:16 +01:00
Michał Janiszewski
1fed4f0b2d
Check validity of dropdown indices ( #6087 )
...
Happens e.g. in server list browser
2017-07-31 23:56:52 +01:00
Tomas Dittmann
a5df985a05
prevent infinite loop while fixing invalid research items
...
research_remove() does not expect any items between RESEARCHED_ITEMS_END & RESEARCHED_ITEMS_END_2, so make sure, the next item is RESEARCHED_ITEMS_END_2
fix infinite loop while loading the save file RR_60glitch.zip from #5311
2017-08-01 00:20:37 +02:00
Michał Janiszewski
0fe60663bf
Verify decoded SawyerChunks
2017-07-31 23:19:48 +02:00
Brian Callahan
9ef629a47d
Reduce strength of an OpenBSD-specific comment
...
[ci skip]
Change "must" to "may have to," pointed out by a user.
2017-07-31 22:43:41 +02:00
Richard Jenkins
84eebb19aa
Fix #6050 : Crash on placing scenery clusters on water near map edge ( #6053 )
...
Guard against null map elements when placing small scenery.
2017-07-31 12:34:30 +01:00
Michael Steenbeek
9c7c553ccc
Clean up vehicle flags ( #6058 )
2017-07-31 11:27:04 +01:00
OpenRCT2 git bot
84d273ac54
Merge Localisation/master into OpenRCT2/develop.
2017-07-31 04:00:18 +00:00
Ted John
6699d0885b
Merge pull request #6065 from IntelOrca/refactor/remove-rct2.c
...
Move remaining functions out rct2.c
2017-07-30 18:09:26 +01:00
wolfreak99
df35ffa3cb
Add to changelog
2017-07-30 19:00:30 +02:00
wolfreak99
675028d173
Bump network version
2017-07-30 19:00:30 +02:00
wolfreak99
6f7ce9300e
Format game_command_demolish_ride
2017-07-30 19:00:30 +02:00
wolfreak99
ef74f56335
Fix #6071 : quick demolish can delete protected ride
2017-07-30 19:00:30 +02:00
Michał Janiszewski
9eb0dc6ea9
Fix wrong mouse button being released on FingerUp event
2017-07-30 17:57:07 +02:00
Michał Janiszewski
4c6412d4fd
Delete ParkLoadResult after it's been used
2017-07-30 17:41:55 +02:00
Michał Janiszewski
eb76b188ae
Ensure UiContext deletes allocated resources
2017-07-30 17:34:30 +02:00
Michał Janiszewski
427009e9bb
Ensure DummyUiContext deletes allocated resources
2017-07-30 17:27:45 +02:00
Michał Janiszewski
d5e6ab3111
Properly dispose of AudioMixer to plug memleak
2017-07-30 17:21:36 +02:00
Michał Janiszewski
a90dce018d
Properly dispose of TitleSequencePlayer to plug memleak
2017-07-30 16:46:56 +02:00
Michał Janiszewski
1ea5a902df
Initialise various fields and variables
2017-07-30 15:28:16 +02:00
Richard Jenkins
2782c49a1e
Xcode fix
2017-07-30 13:16:06 +01:00
Ted John
0d52030b4e
Merge pull request #6070 from jensj12/landscaping-v4
...
Implement #2225 : Change mountain tool to ignore higher surrounding tiles
2017-07-29 23:07:29 +01:00
jensj12
b0f93a08d9
Use sint32 instead of int
2017-07-29 23:13:13 +02:00
ζeh Matt
7a5f9e8300
Refactored openrct2_assert to not rely on inlining. ( #6061 )
2017-07-29 20:31:54 +01:00
Ted John
8b2eb8a13e
Move screen variables to OpenRCT2.h
2017-07-29 20:29:29 +01:00
Ted John
e6e503a853
Move path related functions to Context.cpp
...
- rct2_init_directories
- get_file_path
2017-07-29 20:29:26 +01:00
