1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Commit Graph

5629 Commits

Author SHA1 Message Date
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
IntelOrca
f5db0a83e5 refactor mouse input queue 2016-01-05 21:20:59 +00:00
IntelOrca
e94b7d5338 fix unable to right click to remove scenery
regression introduced f0adf90660
2016-01-05 20:53:08 +00:00
IntelOrca
ee9c695902 fix #2651: remove ride when multiplayer client aborts ride construction
also fix ride construction window closing immediately after placing first track piece of a ride for clients
2016-01-05 20:37:21 +00:00
IntelOrca
e4c6c79552 fix #2650: validate game commands sent from clients in multiplayer 2016-01-05 18:30:39 +00:00
Ted John
f767f947d1 Merge pull request #2649 from Schlumpf/fix-gitignore
Add "*.directory" to .gitignore.
2016-01-05 17:16:59 +00:00
Martin Kröll
e3c6093145 Add to .gitignore. Important on Linux/KDE systems. 2016-01-05 17:33:33 +01:00
Ted John
f4a25bd55e Merge pull request #2641 from Broxzier/fix_saving
Prevent extension from showing when "saving as"
2016-01-05 10:14:20 +00:00
Ted John
db01fa6d60 Merge pull request #2645 from LRFLEW/typo
Fixed typo in viewport_interaction.c
2016-01-05 08:00:29 +00:00
LRFLEW
db76615af0 Fixed typo in viewport_interaction.c 2016-01-05 00:17:10 -07:00
Ted John
79b7913b78 Merge Localisation/master into OpenRCT2/develop. 2016-01-05 04:00:19 +00:00
IntelOrca
d842708f90 refactor drag widget in input.c 2016-01-05 00:10:28 +00:00
IntelOrca
88c391120a integrate tooltip variables 2016-01-05 00:02:23 +00:00
Ted John
e323397574 Merge pull request #2642 from OpenRCT2/remove-tutorial
Remove all tutorial code
2016-01-04 23:36:55 +00:00
Hielke Morsink
3641634aad Prevent extension from showing when saving a park for the first time. 2016-01-05 00:23:51 +01:00
IntelOrca
0c933234e0 remove all tutorial code 2016-01-04 23:21:23 +00:00
IntelOrca
f0adf90660 integrate variable: gInputFlags 2016-01-04 22:53:03 +00:00
IntelOrca
b5069d3809 integrate variable: gInputState 2016-01-04 22:45:51 +00:00
Ted John
6f4cf119e7 Merge pull request #2629 from janisozaur/harden-game-commands
Game commands hardening
2016-01-04 22:14:30 +00:00
Michał Janiszewski
9c4cf14069 Game commands hardening 2016-01-04 22:03:28 +01:00
Ted John
286f89b941 Merge pull request #2638 from LRFLEW/develop
Updated OS X shasum to new value
2016-01-04 18:39:23 +00:00
IntelOrca
3b4928c041 fix windows file enumerate pattern matching 2016-01-04 18:29:18 +00:00
LRFLEW
d371fa603e Updated OS X shasum to new value 2016-01-04 11:07:36 -07:00
Ted John
015c76084e Merge pull request #2616 from atmaxinger/autosave-timestamp
Append timestamp to autosave
2016-01-04 17:54:11 +00:00
IntelOrca
b29a3b0823 fix appveyor 2016-01-04 17:30:49 +00:00
Maximilian Irlinger
a0bb568889 Append timestamp to autosave 2016-01-04 16:22:15 +01:00
Ted John
e4052b332f Merge Localisation/master into OpenRCT2/develop. 2016-01-04 04:00:18 +00:00
Ted John
047c029748 Merge pull request #2628 from OpenRCT2/new-scenarioselect
RCT1 scenario select & sequence
2016-01-03 21:09:22 +00:00
IntelOrca
b94cd7499d add config for hide mega park and set locking as default 2016-01-03 21:06:10 +00:00
Michał Janiszewski
b45ca38d52 UTC epoch time for POSIX 2016-01-03 21:41:21 +01:00
IntelOrca
99e0d999b2 add timestamp to highscores.dat 2016-01-03 01:48:52 +00: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
IntelOrca
9d5e798b7a update changelog 2016-01-02 23:26:41 +00:00
LRFLEW
d2653e304d Added scenario_sources.c to Xcode 2016-01-02 23:14:50 +00:00
IntelOrca
9b833e5f93 shorten path for scenario select debug 2016-01-02 23:14:41 +00:00
IntelOrca
9eacd3532b use correct window variable for highlighted scenario 2016-01-02 21:13:24 +00:00