mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Code Issues Releases Wiki Activity
5,665 Commits 8 Branches 59 Tags
d29faf25c41ea64ed5f1b398b3e000ea63abc720
Commit Graph

5665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Janiszewski
d29faf25c4 Remove tests 
Tests were quite old, used very simple framework which did not allow
much fidelity and were probably never executed.
 2016-01-09 21:50:06 +00:00
IntelOrca
c7128a95ed remove libs VS project 2016-01-09 21:50:06 +00:00
IntelOrca
27c8cf126f update build / publish scripts for new VS dependencies 2016-01-09 21:50:05 +00:00
IntelOrca
df279b178b clean up VS solution and project 2016-01-09 21:50:04 +00:00
IntelOrca
00f0f06e83 update VS project to use new dependencies 2016-01-09 21:50:03 +00:00
IntelOrca
25237bf810 fix #2679: game_command_set_ride_appearance did not work correctly for non-apply flag 2016-01-09 21:15:51 +00:00
IntelOrca
635fae15da move assertion outside of loop, rowBytes does not change 2016-01-09 15:17:02 +00:00
IntelOrca
f84c659010 fix #2670: title was not being loaded when a scenario failed to load 2016-01-09 15:11:12 +00:00
Ted John
842484eff5 Merge pull request #2672 from LRFLEW/xcode-noloadpng 
Removed loadpng from Xcode project to prevent building it
 2016-01-09 14:55:54 +00:00
LRFLEW
106cf8d501 Removed loadpng from Xcode project to prevent building it 2016-01-08 23:40:14 -07:00
IntelOrca
19c38e0b34 move RCT2 paths to C file and remove file integrity checking 2016-01-09 00:34:34 +00:00
IntelOrca
3073bc64fd remove rct2_endupdate 2016-01-09 00:25:30 +00:00
Ted John
20697ac2bc Merge pull request #2671 from janisozaur/extern-c 
Specify C linkage for log functions
 2016-01-08 22:16:31 +00:00
Michał Janiszewski
687bac4699 Specify C linkage for log functions 2016-01-08 22:20:37 +01:00
IntelOrca
15bc414581 add stopwatch class for profiling 2016-01-08 20:50:23 +00:00
IntelOrca
0012470504 change last two rct_realloc to realloc 2016-01-08 19:04:38 +00:00
Ted John
a83807d58e Merge pull request #2665 from janisozaur/font-outline 
shadows for fonts
 2016-01-08 18:07:33 +00:00
Ted John
8a575a945d Merge pull request #2669 from janisozaur/osx-travis 
OS X job for Travis CI
 2016-01-08 16:31:54 +00:00
Michał Janiszewski
7520bde6d3 Add support for OS X 10.10 in Travis CI builds 
This downloads OS X 10.10 SDK, installs it and uses for compilation.

According to https://www.gosquared.com/global/mac/el-capitan/, current
market share among OS X versions is:
* 10.11 — 41.53%
* 10.10 — 38.65%
* 10.9  — 14.72%
* 10.8  — 5.60%
* 10.7  — 5.62%

I tried adding 10.9 SDK, but it fails to compile. With this change, we
should cover around 80% of OS X users.
 2016-01-08 15:01:02 +01:00
Michał Janiszewski
683033d3f2 OS X job for Travis CI 
This adds automated builds for OS X to our CI infrastructure.

XCode's `xcodebuild` tool is quite spammy by default, so I used a
prettifier for its output. Since this could potentially cover errors
from XCode due to piping of commands, I enabled `pipefail` option which
would cause all of pipe construct fail, should any of its commands exit
with non-zero code.

The created app bundle is packaged into dmg and uploaded to transfer.sh,
if the build was successful. To the best of my knowledge, this is *the*
way of packaging and distributing OS X applications.
 2016-01-08 11:45:12 +01:00
IntelOrca
17c01a36a7 don't paint track of an invalid ride, should help reduce crashes 2016-01-07 23:16:17 +00:00
IntelOrca
43a5cc92cc define STR_NONE as a rct_string_id 2016-01-07 22:14:53 +00:00
IntelOrca
5e071ed032 change more rct2_malloc / rct_free to malloc / free 2016-01-07 22:10:08 +00:00
IntelOrca
053f4f4f38 fix object list memory error, rct2_malloc being used instead of malloc 2016-01-07 22:10:07 +00:00
Ted John
474d6757e3 Merge pull request #2666 from janisozaur/address-fix 
Fix erroneous address
 2016-01-07 20:31:35 +00:00
Michał Janiszewski
abf0801725 Fix erroneous address 2016-01-07 21:26:38 +01:00
IntelOrca
8f4c8006b5 Merge branch 'refactor-object-paint' into develop 2016-01-07 19:24:36 +00:00
IntelOrca
569026f36b fix #1333: added missing logic from finance_pay_ride_upkeep to make rides safe again 2016-01-07 19:20:11 +00:00
IntelOrca
48ad1314a9 refactor object_desc 2016-01-07 19:12:59 +00:00
IntelOrca
40a4bd1fa8 remove old object_paint calls, replace with new 2016-01-07 19:01:19 +00:00
Michał Janiszewski
2d82bf344e shadows for fonts 2016-01-07 15:48:52 +01:00
Ted John
73b0e403c4 Merge Localisation/master into OpenRCT2/develop. 2016-01-07 04:00:19 +00:00
IntelOrca
01c67b6146 refactor object_paint, part 1 2016-01-07 00:34:15 +00:00
IntelOrca
ab38828e03 integrate object list variables: 
- gInstalledObjectsCount
- gInstalledObjects
- gNumInstalledRCT2Objects
- gNumInstalledCustomObjects
- gLastLoadedObjectChunkData
 2016-01-06 20:41:21 +00:00
IntelOrca
c0eeefa609 integrate variables: _currentScrollIndex, _currentScrollArea 2016-01-06 18:47:55 +00:00
IntelOrca
29397ebcc5 fix #2658: fix dragging on land and water tools 2016-01-06 18:31:25 +00:00
Ted John
b80cb15639 Merge pull request #2657 from Gymnasiast/object-loading-improvements 
Improve object loading
 2016-01-06 08:31:25 +00:00
Gymnasiast
b89025ae62 Improve object loading 2016-01-06 08:58:56 +01:00
Ted John
de99a6c3dc Merge Localisation/master into OpenRCT2/develop. 2016-01-06 04:00:20 +00:00
IntelOrca
023ac79494 optimise object_calculate_checksum 2016-01-06 00:59:07 +00:00
Ted John
61dfc57fb1 Merge pull request #2655 from Schlumpf/fix-gitignore 
Fixed .gitignore
 2016-01-05 23:49:34 +00:00
Martin Kröll
2ed8940c76 Fixed .gitignore 
- Add last newline
 - filter only ".directory" and not "*.directory"
 2016-01-06 00:39:12 +01:00
IntelOrca
2b343838e0 fix scrollbar scrolling 2016-01-05 23:37:57 +00:00
IntelOrca
50eaa99eac fix widget index size & size for consistency 2016-01-05 23:16:09 +00:00
IntelOrca
f4f07ae5bb integrate variable: gInputPlaceObjectModifier 2016-01-05 22:33:47 +00:00
IntelOrca
94ae72f228 integrate variable: gHoverWidget 2016-01-05 22:05:00 +00:00
Ted John
923b3daf40 Merge pull request #2644 from LRFLEW/invalid-entrance-fix 
Resolved leaving guests searching for invalid entrance
 2016-01-05 21:49:17 +00:00
IntelOrca
586e5ef9cd integrate variable: gPressedWidget 2016-01-05 21:46:38 +00:00
IntelOrca
c181f18309 remove left over RCT2 drag variables 2016-01-05 21:37:15 +00:00
LRFLEW
63ddfa53cd Resolved leaving guests searching for invalid entrance 2016-01-05 14:36:49 -07:00