mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-07 07:04:36 +01:00
Code Issues Releases Wiki Activity
5,547 Commits 8 Branches 59 Tags
60920a2d10719dd32723e36435c5d0ab5574992d
Commit Graph

5547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Osler
60920a2d10 Add /usr/local/share to search path for data files 
`/usr/local` should be examined before `/var/lib,` since it allows for
overriding data files that might come from the package manager.
 2016-01-15 22:47:12 -05:00
Ted John
4889033658 Merge pull request #2631 from janisozaur/travis-jobs 
Limit travis jobs
 2016-01-03 00:49:10 +00:00
Michał Janiszewski
5a17d6d2ec Limit travis jobs 
Leave all passing jobs commented out for future reference in hopes they
will be tested with large changes or when doing changes to CMakeLists
 2016-01-03 01:21:46 +01: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
Michał Janiszewski
db95b3ada3 Enable strict aliasing and make sure it gets spotted 2015-12-31 09:15:16 +01:00
Ted John
47ca70b513 Merge Localisation/master into OpenRCT2/develop. 2015-12-31 04:00:17 +00:00
Ted John
aa8bb19cbd Merge pull request #2603 from mzmiric5/xcode_shared_schema 
make the main schema shared, allow for archive and export of Release …
 2015-12-31 01:19:44 +00:00
Miso Zmiric (Mike Squinter)
267750adfe disable versioned documents debugging 2015-12-31 02:15:26 +01:00
Miso Zmiric (Mike Squinter)
5522eedac2 make the main schema shared, allow for archive and export of Release app on build servers 2015-12-31 00:26:22 +01:00
Ted John
087b03c5bb Merge pull request #2600 from LRFLEW/develop 
Change SHA hashes for orctlibs-osx.zip
 2015-12-30 22:11:56 +00:00