mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,553 Commits 8 Branches 39 Tags 361 MiB
Commit Graph

5553 Commits

Author SHA1 Message Date
Aaron van Geffen f49e3eea1c WIP: misery: adding scenario options to options screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen 15782b88c4 Experimental: optional unlocking of scenarios ("campaign mode") in scenario select screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen 3bb1588cfa Shrink window when showing scenarios by difficulty level. 2016-01-02 21:00:07 +00:00
Aaron van Geffen eb87c5284f Adapt scenario select screen based on scenario source game. 2016-01-02 21:00:06 +00:00
Aaron van Geffen 3bad0870fb Added routines to find scenario index and source from predefined listings. 2016-01-02 21:00:05 +00:00
Aaron van Geffen cf935d45c6 Add configuration bits for scenario select mode and unlocking. 
Note this lacks an interface in the options window as of yet.
 2016-01-02 21:00:05 +00:00
Aaron van Geffen e78d37f03c Add information on scenario source games. 2016-01-02 21:00:04 +00:00
Aaron van Geffen 3999ebd031 WIP: adding new tabs to scenario select window; extended window size. 2016-01-02 21:00:03 +00:00
Aaron van Geffen 448d4fb657 New string ids for scenario select screen. 2016-01-02 21:00:02 +00:00
Ted John f89d9c9695 Merge pull request #2625 from Broxzier/improved_path_related_functions 
More secure checks for removing and setting file extensions.
 2016-01-02 20:55:32 +00:00
Hielke Morsink bc2ac2e28b Split extension setter into two functions 2016-01-02 20:45:00 +01:00
Hielke Morsink f31a5f2248 More secure checks for removing and setting file extensions. 2016-01-02 18:57:11 +01:00
Ted John 9056d47378 Merge pull request #2621 from Broxzier/fix_saving_landscape 
fix #2620 and preventing names with dots from breaking.
 2016-01-02 14:48:02 +00:00
Hielke Morsink eadb03426e fix #2620 and preventing names with dots from breaking. 2016-01-02 14:59:16 +01:00
Duncan 7914ebd0e2 Merge pull request #2619 from Broxzier/fix_speed_hotkeys 
fix #2609 hotkeys for gamespeed work for client
 2016-01-02 10:53:33 +00:00
Ted John c0857dc210 Merge pull request #2617 from AaronVanGeffen/japanese 
Add Japanese to the list of available languages
 2016-01-02 10:52:55 +00:00
Ted John 367f1252c0 Merge pull request #2586 from techfreek/closest-engineer 
Improved mechanic selection for broken down rides
 2016-01-02 10:52:23 +00:00
Hielke Morsink b6c1f3a6c4 Fix #2609 disabling hotkeys for game speed while playing online. 2016-01-02 11:42:51 +01:00
Aaron van Geffen 89a2e32f28 Add Japanese to the list of available languages. 2016-01-02 13:45:21 +09:00
Ted John c1d33e7308 Merge Localisation/master into OpenRCT2/develop. 2016-01-02 04:00:17 +00:00
Ted John f896b04962 Merge pull request #2618 from janisozaur/config-fix 
Use strndup when setting last_run_version
 2016-01-01 23:25:31 +00:00
Michał Janiszewski 17e5a0d356 Use strndup when setting last_run_version 
gConfigGeneral.last_run_version should have the string value copied to,
otherwise the SafeFree in config_set_property could try freeing value
from stack if used.
 2016-01-02 00:11:34 +01:00
Duncan 5b9a98a0f9 Merge pull request #2588 from HaasJona/refactor2 
Refactor peep code
 2016-01-01 22:22:18 +00:00
Ted John b8ab05a638 Merge pull request #2590 from Broxzier/refactor_path_element 
Improved tile inspector and added map element helper functions
 2016-01-01 20:50:59 +00:00
Hielke Morsink 560a435748 Drawing checkmarks for set flags 2016-01-01 21:29:10 +01:00
Hielke Morsink 829c3a3339 Added correct tooltips for moving up/down buttons. 2016-01-01 21:29:09 +01:00
Hielke Morsink bf7e45939a Pixel correct paddings for list and column headers 2016-01-01 21:29:08 +01:00
Hielke Morsink ae4ff5fc6c Redesigned UI to be more consistent with the ride/staff windows. 2016-01-01 21:29:07 +01:00
Hielke Morsink a1f506df58 Fix all buttons after deleting a map element. 2016-01-01 21:29:06 +01:00
Hielke Morsink 2b7a88297f Moved some UI elements and changed default size. Updated changelog. 2016-01-01 21:29:05 +01:00
Hielke Morsink 05e807a9ca Displayng ride type for tracks 2016-01-01 21:29:04 +01:00
Hielke Morsink 389249abfd Better UI spacing. 2016-01-01 21:29:03 +01:00
Hielke Morsink 6f824c9c2e Resolved warnings. 2016-01-01 21:29:02 +01:00
Hielke Morsink 38867b7462 Fixed old typo in string ID name. 2016-01-01 21:29:00 +01:00
Hielke Morsink 64312957a0 Added column headers instead of labels, and added columns for the flags. 2016-01-01 21:28:59 +01:00
Hielke Morsink db270d85c2 automatically en/disabling buttons when needed. Selecting corrupt element when added. 2016-01-01 21:28:58 +01:00
Hielke Morsink 2a3aefdb4e fixed list issue after removing element. 2016-01-01 21:28:57 +01:00
Hielke Morsink d226012d94 Function to remove elements using the tile inspector. 2016-01-01 21:28:56 +01:00
Hielke Morsink d68ed36147 Recreated UI for tile inspector. Added swap functionality. 2016-01-01 21:28:55 +01:00
Hielke Morsink 35bf18bcb6 Added empty button that swaps the top two map elements 2016-01-01 21:28:54 +01:00
Hielke Morsink f04c97fbc1 Getting path scenery type and index using helper functions throughout the entire project. 2016-01-01 21:28:53 +01:00
Hielke Morsink 6f0d14b65f Using ghost helper funcitons for getting and setting the bit now. 2016-01-01 21:28:52 +01:00
Hielke Morsink b82504c5e4 Better consistensy with already existing helper functions 2016-01-01 21:28:51 +01:00
Hielke Morsink 370c08f796 Added comments to path info 2016-01-01 21:28:50 +01:00
Hielke Morsink 955bf7b26f Displaying more path info for queue. Added some helper functions. 2016-01-01 21:28:49 +01:00
Hielke Morsink 855e122b55 Printing path and addition names in tile inspector. 2016-01-01 21:28:48 +01:00
Ted John 928db1bf18 Merge Localisation/master into OpenRCT2/develop. 2016-01-01 04:00:18 +00:00
Jonathan Haas 4d26e4c4a1 Refactor peep code 
Name various fields and constants related to peeps. This includes:
  - Flags for flashing peeps in map window
  - Animation frames for picked up peeps
  - Function checking if peep should start to fall
  - Special sprite handling for slide boards and lawn mowers
  - Created array for peep sprite entries, renamed some variables and constants
 2015-12-31 13:57:06 +01:00
Ted John 8d3da0df36 Merge pull request #2604 from janisozaur/strict-aliasing 
Strict aliasing
 2015-12-31 12:41:50 +00:00
Michał Janiszewski 8a5d066efe Fix strict aliasing violations 
Compiler only guarantees proper accesses to variables when using
variable's native type or `char` (i.e. single byte type) [1].

This commit fixes violations of this rule. In most cases changing code
to a simple cast was enough, some required a bit deeper modifications.

This fixes #2596.

[1] http://blog.qt.io/blog/2011/06/10/type-punning-and-strict-aliasing/
 2015-12-31 13:27:26 +01:00