mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,300 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

9300 Commits

Author SHA1 Message Date
Ted John 4a0a93d003 Merge pull request #4449 from duncanspumpkin/gl2 
OpenGL Palettes
 2016-09-23 21:41:09 +01:00
Ted John ce0f6aefea Merge pull request #4465 from duncanspumpkin/refactor_paint 
Refactor paint
 2016-09-23 21:39:42 +01:00
wolfreak99 b7212d32ed Remove unrelated changelog modification 2016-09-23 06:04:10 -04:00
Michał Janiszewski fd6d4e2fd7 Add variable to identify crashes in original code 2016-09-22 22:41:10 +01:00
Aaron van Geffen d52add4486 Removed reference to deprecated NSWarningAlertStyle. 2016-09-22 22:20:42 +02:00
Manuel Vögele c531898c3b Peeps no longer interact with provisional paths 
In most cases peeps treaded provisional paths like paths that were
already built. Since provisional paths aren't synced in muliplayer mode
this caused a lot of desync.
 2016-09-21 21:23:38 +02:00
duncanspumpkin 5b01653c11 Add friction help command to rides set 2016-09-21 19:25:40 +01:00
duncanspumpkin 48086503a6 Fix zooming size for opengl sprites 2016-09-21 19:06:45 +01:00
wolfreak99 9a708cd9d2 auto-disable lightning without modifying config. 2016-09-21 10:37:50 -04:00
wolfreak99 c8714b7b62 Formatting improvements 
Formatting improvement pt 2
 2016-09-21 10:37:43 -04:00
wolfreak99 ce85e0e743 Make lightning disabled while weather effects are disabled (Gymnasiast 
suggestion)

Interpreting Gymnasiast part 2
 2016-09-21 10:36:35 -04:00
wolfreak99 98eb272c71 Break long lines for readability 2016-09-21 10:36:23 -04:00
wolfreak99 c60396cb53 Add option to disable weather gloom and rain effects 2016-09-21 10:35:02 -04:00
Ted John 843d865f01 Fix passing defines for msbuild proj 2016-09-21 00:06:24 +01:00
LRFLEW 0cc33d7780 Fix usage of paint_entry in 64-bit builds (#12) 2016-09-20 21:32:04 +01:00
Ted John 0f0e9ce7df Merge pull request #4464 from IntelOrca/refactor/language-pack 
Refactor LanguagePack to interface / implementation
 2016-09-20 19:18:26 +01:00
duncanspumpkin 7561921b9c Refactor to use paint_entry union 2016-09-20 18:27:50 +01:00
duncanspumpkin 9840a73cc1 Refactor naming of paint global vars 
Removed EDF81C from none viewport files this previously was used to pass image flags to the sprite renderer.
gUnkF1A4CC replaced with address reference to paint struct array to allow for non rct builds
Renamed _paint_structs to _paint_struct_quadrants. This array is used for working out which paint struct is at which quadrant and is not the main paint struct array
 2016-09-20 18:08:45 +01:00
Ted John 5519365fe0 Clean up parsing work data after parse 2016-09-20 12:48:35 +01:00
Ted John f31bf03ee9 Refactor LanguagePack to interface / implementation 
This reduces the required amount of includes and definitions necessary in LanguagePack.h and having to declare private signatures twice.
 2016-09-20 12:29:38 +01:00
OpenRCT2 git bot 6496895e40 Merge Localisation/master into OpenRCT2/develop. 2016-09-20 04:00:21 +00:00
Manuel Vögele 88ee99db82 Replaced (1 << 6) with constant GAME_COMMAND_FLAG_GHOST 2016-09-20 02:04:37 +02:00
Ted John 6aee80193e Merge pull request #4456 from Gymnasiast/add-bm-mini 
Add drawing for missing B&M and mini RC pieces
 2016-09-19 21:31:07 +01:00
Gymnasiast ffcd0cacd1 Convert tabs to spaces and split off switches into own function 2016-09-19 22:04:08 +02:00
Michał Janiszewski c4a97af854 Rework CMakeLists.txt for newly standalone target (#4451) 2016-09-19 21:23:10 +02:00
Ted John dd66ae39ae Clean up LanguagePack and fix memory leak 2016-09-19 19:42:27 +01:00
Michał Janiszewski 6a86f007f3 Fix #4437: Crash in Network::Server_Handle_AUTH 2016-09-19 19:25:00 +01:00
duncanspumpkin 56fddac199 Fix broken zoomed textures and palettes 
Zoomed textures were failing to pass the image flags to the zoomed version of the texture. This would cause corrupted data to be passed as a tertiary colour to the palette function.
Also due to not recording the image flags in the palette hash map a tertiary colour of zero would be ignored and unremaped pink colour would be shown
 2016-09-19 19:00:26 +01:00
Michał Janiszewski b90f27a971 Plug memory leak in ObjectRepository 2016-09-19 18:34:08 +01:00
Gymnasiast 5610b72394 Add drawing for missing B&M and mini RC pieces 2016-09-19 19:15:31 +02:00
Michał Janiszewski 8afaf33b1c Fix #4453: path separators being mishandled 2016-09-19 17:59:06 +01:00
OpenRCT2 git bot 4b5e6f01cb Merge Localisation/master into OpenRCT2/develop. 2016-09-19 04:00:22 +00:00
Ted John 6ed84ddabd Fix #3936: 'Close all windows' shortcut leaves one window when top toolbar is hidden 
Close all windows was missing out the last window in the list. Normally this would be the toolbar which is why the bug only appears when toolbars are hidden.
 2016-09-18 23:27:02 +01:00
Ted John 23b5af6145 Close #3981: Global configuration option/argument for RCT2 data path 
Add the command line option --rct2-data-path which allows the RCT2 data path to be set irrespective of the config file.
 2016-09-18 22:25:49 +01:00
Ted John 529f189832 Use sprintf for object_create_identifier_name 2016-09-18 21:53:00 +01:00
Ted John a3be4d68f3 Merge branch 'janisozaur-duck_move_offset' into develop 2016-09-18 21:50:13 +01:00
Ted John 2258652e83 Wrap direction in vehicle_update_motion_collision_detection 2016-09-18 21:49:58 +01:00
duncanspumpkin 5f7a6fb369 Fixed OpenGL palette drawing 
Added palettes to the texture atlas and now correctly use them to generate
images. Transparency semi supported but the colours are not quite
correct.
 2016-09-18 20:28:46 +01:00
Michał Janiszewski 453e508716 Check access to duck_move_offset 2016-09-18 20:01:22 +02:00
Ted John 8ffe9cdcf6 Pass build properties to openrct2.sln 2016-09-18 11:24:46 +01:00
OpenRCT2 git bot b3ef319dc9 Merge Localisation/master into OpenRCT2/develop. 2016-09-18 04:00:21 +00:00
Ted John 011f3eecd0 Merge pull request #4444 from OpenRCT2/x64-full-no-rct2 
Make NO_RCT2 fully stand alone without segment loading
 2016-09-17 23:30:28 +01:00
Ted John d786e57914 Move registers struct to common.h 
So that it can still be used in x64 builds
 2016-09-17 23:12:25 +01:00
Michał Janiszewski 2d5de506f4 Fix guards for NO_RCT2 builds 2016-09-17 22:59:32 +01:00
Ted John 20863bce52 Guard segments definition in USE_MMAP 2016-09-17 21:07:17 +01:00
Marijn van der Werf 487d6d8f15 Remove unnecessary addresses.h imports 2016-09-17 20:59:55 +01:00
Ted John 7c05ceb275 Make x64 fully stand alone without segment loading 2016-09-17 19:29:39 +01:00
Ted John 665f5e794b Merge pull request #4442 from marijnvdwerf/integrate/vehicle 
Integrate vehicle data
 2016-09-17 19:15:27 +01:00
Marijn van der Werf 65919029ae Integrate data at 0x0098DA64 2016-09-17 19:14:06 +01:00
Marijn van der Werf a3a8484059 Complete integration of 0x009A3B04 2016-09-17 19:54:44 +02:00