Michał Janiszewski
30cccce98b
try libsdl2-dev:i386
2015-09-18 14:43:43 +02:00
Ted John
a762390abe
Merge pull request #1936 from Gymnasiast/operating-modes
...
Add cheat option to show all operating modes; cleanup
2015-09-18 12:44:38 +01:00
Ted John
0a1604b099
Merge pull request #1937 from janisozaur/travis-matrix
...
Create a matrix of jobs for easier configuration testing
2015-09-18 12:41:26 +01:00
Michał Janiszewski
b4a9132105
Create a matrix of jobs for easier configuration testing
...
Right now it will post two jobs, one regular and the other one
with network disabled, so both get tested on future commits.
2015-09-18 12:01:00 +02:00
Gymnasiast
e2ec6e0970
Move 'show all operating modes' to Cheats window
2015-09-18 11:55:52 +02:00
Ted John
5358b566fe
Merge pull request #1933 from janisozaur/memory
...
make sure strings are properly terminated
2015-09-18 10:39:50 +01:00
Gymnasiast
4909272a44
Add cheat option to show all operating modes; cleanup
2015-09-18 10:54:48 +02:00
Ted John
338855ba50
Merge Localisation/master into OpenRCT2/develop.
2015-09-15 04:00:15 +01:00
Michał Janiszewski
ee96aaec8e
reduce amount of times the pointer is freed to one
...
track_list_cache is being free()d as part of track_load_list, which
is a better place to do so, as it has full ownership of that pointer.
2015-09-15 00:23:46 +02:00
Michał Janiszewski
3ea534f758
make sure strings are properly terminated
2015-09-15 00:03:47 +02:00
Ted John
1d6c3baf24
Merge pull request #1932 from janisozaur/memory
...
Memory
2015-09-14 22:17:33 +01:00
Michał Janiszewski
02d83f860e
In case any memory was allocated for lang pack, free it
2015-09-14 23:03:03 +02:00
Michał Janiszewski
34f56a262b
Null-terminate buffer read from language packs
2015-09-14 22:59:44 +02:00
Ted John
5abc574593
Merge pull request #1930 from janisozaur/memory
...
memory safeness
2015-09-13 21:25:35 +01:00
Michał Janiszewski
d58b4e3589
memory safeness
...
Just some more memory checks.
One memset appears to be wrong, is fixed now.
I think this might fix #1928 , but please check.
2015-09-13 21:45:57 +02:00
Ted John
597c9e19de
Merge Localisation/master into OpenRCT2/develop.
2015-09-13 04:00:15 +01:00
IntelOrca
f988f69ae0
implement sub_6D31A6
2015-09-13 03:00:03 +01:00
Ted John
5e58dc9789
Merge pull request #1929 from janisozaur/hwnd-twisting
...
workaround for mingw bug
2015-09-12 22:59:03 +01:00
Michał Janiszewski
42691726fc
workaround for mingw bug
...
For some reason mingw or sdl has trouble providing proper HWND, which
in turn prevents opening up a window for selecting file to save when
trying to convert save game to scenario.
Fixes #1486 .
2015-09-12 23:46:40 +02:00
IntelOrca
72398151a7
implement ride_create_cable_lift
2015-09-12 18:17:35 +01:00
Ted John
f081f8430a
Merge Localisation/master into OpenRCT2/develop.
2015-09-12 13:59:21 +01:00
Ted John
daf61d0ca5
Merge pull request #1920 from Gymnasiast/fix-warnings-2
...
Fix more warnings
2015-09-12 13:54:22 +01:00
Ted John
70c88edb5d
Merge pull request #1925 from janisozaur/memory
...
Memory access fixes
2015-09-11 23:40:55 +01:00
Michał Janiszewski
788e988992
Memory access fixes
2015-09-12 00:16:05 +02:00
Ted John
967fccdac9
Merge pull request #1924 from janisozaur/painter-fix
...
Incrementation of paint_struct pointer looks bogus
2015-09-11 22:13:05 +01:00
Michał Janiszewski
27ea266de1
Incrementation of paint_struct pointer looks bogus
...
Since the value incremented is a pointer, pointer arithmetics apply,
so instead of incrementing by 52, incrementation by 52^2 = 2704 takes
place, which was confirmed by inspecting generated listing.
2015-09-11 22:53:01 +02:00
Ted John
94fe643b4c
Merge pull request #1921 from Gymnasiast/fix-filters-in-rc-designer-2
...
Fix filter buttons in RC designer and TD manager, clean up some strings
2015-09-11 17:40:34 +01:00
Ted John
642a90cd63
Merge pull request #1919 from Gymnasiast/entrances-exits-while-paused
...
Extend build-in-pause-mode to entrances and exits, clear up some flags, fix ghost sticking in pause mode, fixes #1918
2015-09-11 17:39:23 +01:00
Gymnasiast
a6ee08de11
Fix filter buttons in RC designer and TD manager, clean up some strings
2015-09-11 16:21:27 +02:00
Gymnasiast
68fc066fc5
Fix two more warnings
2015-09-11 15:23:11 +02:00
Gymnasiast
6bd003c67f
Fix more warnings
2015-09-11 15:13:54 +02:00
Gymnasiast
7e67f0381e
Extend build-in-pause-mode to entrances and exits, clear up some flags, fix ghost sticking in pause mode, fixes #1918
2015-09-11 14:38:45 +02:00
Ted John
408665e4a4
Merge Localisation/master into OpenRCT2/develop.
2015-09-11 04:00:15 +01:00
IntelOrca
4dd95c650b
implement RideData4 data
2015-09-10 22:16:41 +01:00
IntelOrca
bda7550e33
fix #1913
2015-09-10 20:06:13 +01:00
Ted John
70e14360ce
Merge pull request #1916 from Gymnasiast/patch-2
...
Fix Condor Ride description, fixes #1021
2015-09-10 17:41:58 +01:00
Michael Steenbeek
2c71e8c419
Fix Condor Ride description, fixes #1021
2015-09-10 14:39:49 +02:00
Ted John
f516028413
Merge pull request #1915 from janisozaur/type-fixes
...
In C++11 use actual pointer types instead of C's defines
2015-09-10 12:37:03 +01:00
Michał Janiszewski
17e635b8af
In C++11 use actual pointer types instead of C's defines
...
This is mostly `NULL` -> `nullptr` in cpp files, but I only noticed
because `LanguagePack::GetObjectOverride` and
`LanguagePack::GetScenarioOverride` were returning false instead of real
pointer.
Also fixes some whitespaces, you can `w=1` to github's URL to make it
skip these.
2015-09-10 08:22:36 +02:00
Ted John
85bbdde056
Merge Localisation/master into OpenRCT2/develop.
2015-09-10 04:00:15 +01:00
IntelOrca
72b153115b
fix #1909
2015-09-09 22:56:40 +01:00
IntelOrca
b55d81e561
implement ride_set_start_finish_points
2015-09-09 22:14:43 +01:00
IntelOrca
88db4f12aa
fix #1910
2015-09-09 20:25:34 +01:00
IntelOrca
289555c082
fix #1908
2015-09-09 19:22:41 +01:00
Ted John
f271bc0721
Update .travis.yml
2015-09-09 18:27:01 +01:00
Ted John
7c81d6b38c
Update readme.md
2015-09-09 18:25:48 +01:00
Ted John
acf27afb3e
Merge pull request #1907 from OpenRCT2/language-dat
...
Localisation for objects and scenarios.
2015-09-09 17:50:33 +01:00
Ted John
7d6291ad26
Merge pull request #1906 from janisozaur/language-dat
...
fix travis builds by forcing it to ubuntu 14.04
2015-09-09 08:20:46 +01:00
Michał Janiszewski
cc6832cf48
fix travis builds by forcing it to ubuntu 14.04
...
This (for now) will force Travis' hand to use ubuntu 14.04 which has
mingw 4.8 available. It is enough to compile the project as it stands.
2015-09-09 09:08:28 +02:00
Ted John
d7a7a81cd0
Merge Localisation/master into OpenRCT2/develop.
2015-09-09 04:00:15 +01:00