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

11843 Commits

Author SHA1 Message Date
Ted John a9e5a58d28 Remove need of SDL in console.c 2017-06-10 16:13:07 +01:00
Ted John a5e4a0965f Ignore final warnings for X8DrawingEngine 2017-06-10 15:48:05 +01:00
Ted John 97d68957f0 Fix segfault in screenshot command 2017-06-10 15:48:05 +01:00
Ted John 0ad2c075e5 Separate hardware display drawing engine from software 2017-06-10 15:48:05 +01:00
Ted John df16e6a4f7 Inherit X8 engine from software engine 2017-06-10 15:48:04 +01:00
Ted John 39b3ff0251 Create new 8bpp drawing engine in openrct2 2017-06-10 15:48:04 +01:00
OpenRCT2 git bot 5c5389a2ff Merge Localisation/master into OpenRCT2/develop. 2017-06-10 04:00:28 +00:00
Ted John 7bea5d71bc Merge pull request #5243 from grimpunch/add_timestamp_chat_messages 
Timestamp messages for client in chat view
 2017-06-10 01:27:14 +01:00
Ted John ca68e2bb89 Use all leading format codes for timestamp 2017-06-10 01:05:47 +01:00
Michał Janiszewski 14bbe2c2c2 Verify scenario is not null before accessing it 2017-06-09 22:18:15 +02:00
Ted John f2a5d10c31 Move timestamp to chat.c and fix issues 
- Timestamp now coloured correctly.
- Timestamp now added on client side (client local time).
- Timestamp is no longer duplicated in log file.
 2017-06-09 19:16:29 +01:00
Christian Murphy eab0dc7cdb Add timestamps to chat messages 
Squashed commit from:
- a908a4c Added config parameter "timestamp_chat" to network config section to allow chat messages to be timestamped
- 820fcd7 make timestamps on by default
- e6ecad2 timestamp chat messages, removed config option
- 3b4439d Replace strftime temp buffer with directly using strftime into lineCh
- add20d3 Move time
 2017-06-09 19:16:29 +01:00
OpenRCT2 git bot 6eb14aa90d Merge Localisation/master into OpenRCT2/develop. 2017-06-09 04:00:20 +00:00
wolfreak99 12c84d8190 Rename gUnk9E2E28 to gMapLandRightsUpdateSuccess 2017-06-08 22:28:39 +02:00
Richard Jenkins 60a633e79b Fix #5571: Crash when deleting text at end of line (#5572) 2017-06-08 19:17:43 +01:00
Ted John 634118171f gitignore: Ignore .vscode/settings.json 
It kept adding file associations after goto definition on header files.
[ci skip]
 2017-06-08 19:15:49 +01:00
OpenRCT2 git bot 6e216141ca Merge Localisation/master into OpenRCT2/develop. 2017-06-08 04:00:22 +00:00
Ted John c1ccf2b7a6 Refactor load_palette to call gfx_invalidate_screen 
Nearly all calls to load_palette were succeeded with a call to gfx_invalidate_screen. So remove these and stick just one call inside load_palette.
 2017-06-07 23:24:18 +01:00
Ted John 945d960cb7 Hide guest money effects on title screen 2017-06-07 23:20:35 +01:00
Michał Janiszewski 91075fce41 Make PRs fail when submitted for master branch (#5567) 2017-06-08 00:09:55 +02:00
Michał Janiszewski ff9417f4a6 Validate access to peep_loading_positions (#4475) 2017-06-07 21:56:29 +01:00
Ted John dccc9f88c2 Merge pull request #5564 from IntelOrca/fix/download-park-temp-file 
Fix #4959: Compiler warning: tmpnam
 2017-06-07 21:55:05 +01:00
Ted John 37dac301e6 Merge pull request #5196 from jeremyherbert/develop 
Add cheat to disable ride value ageing.
 2017-06-07 21:54:38 +01:00
Ted John f8c32179b7 Increment network version 2017-06-07 21:52:51 +01:00
Ted John b8f4dd1fd5 Update changelog 2017-06-07 21:52:51 +01:00
Jeremy Herbert ac99683955 Add cheat to disable ride value ageing 2017-06-07 21:52:47 +01:00
Ted John d31870249a macOS: Unignore deprecation warning 2017-06-07 21:23:22 +01:00
Ted John 41989da732 Fix #4959: Compiler warning: tmpnam 
Load download parks directly from memory without writing to a temporary file.
 2017-06-07 21:22:01 +01:00
Ted John f04439e0ac Use stdout for verbose and info logging (#5563) 
Only errors and warnings should be piped to stderr.
 2017-06-07 07:39:18 +01:00
OpenRCT2 git bot d249855728 Merge Localisation/master into OpenRCT2/develop. 2017-06-07 04:00:25 +00:00
Ted John 2501df61a3 Fix crash when building rides 
Game was attempting to log server action in non-network games.
 2017-06-07 00:06:28 +01:00
Michał Janiszewski 61d38511bc Expand tabs to spaces 
This commit expands tabs to spaces (ts=4) in all the files under src/
and test/.

Until now we had two wildly different code styles with C using tabs and
new C++ using spaces. It is painful to maintain as none of the commonly
used tools support this kind of setup and in reality is needless, as we
can simply convert all the sources to spaces and have opened PRs do the
same, where needed.

Additionally, trailing whitespace has been removed.
 2017-06-06 23:46:14 +02:00
Michał Janiszewski d3fc1d9e1e Merge pull request #5557 from IntelOrca/feature/server-logging 
Add logging for user actions in multiplayer
 2017-06-06 23:34:02 +02:00
Michał Janiszewski 43114b105c Extend logging with signs and track modifications 2017-06-06 23:17:46 +02:00
Ted John 8bb15a70de Refactor chat / server stream logging 2017-06-06 23:08:01 +02:00
delebota f69e7ac89e Setup server action logging for server admins in multiplayer 
Squash commit containing:
- 398d978 Setup server action logging for server admins in multiplayer
- 13330ae Added server action logging for using cheats in multiplayer
- b619019 Added server action logging for demolishing rides in multiplayer
- 93de752 Added server action logging for editing ride properties in multiplayer
- 8a3d932 Added server action logging for editing park properties in multiplayer
- c78b6e7 Moved duplicate chat and server logging code into new network methods
- c8f66bf Changed logging variable types to avoid deprecated conversion errors in CI builds
- 454e527 Added improved server action logging for using cheats in multiplayer
- 1194305 Moved server action logging code in game.c into a separate method to reduce clutter
- d59cd42 Added server action logging for add/edit/remove scenery in multiplayer
- c41ae0e Added server action logging for clients in multiplayer
- c383341 Removed unused variable to fix CI build error
- 2d1d8e3 Added server action logging for ride creation in multiplayer
 2017-06-06 23:07:54 +02:00
wolfreak99 07d1ba4f8c Create "Own all land" cheat functionality (#5056) 
Implement "Own all land" cheat into cheat window

Restore only valid peep spawn points

Code improvements

Update to use PEEP_SPAWN / PARK_ENTRANCE defines
 2017-06-06 21:50:42 +01:00
Michał Janiszewski 37a3179639 Fix #5558: can't hire staff 
Caused by invalid flag check
 2017-06-06 21:17:57 +02:00
Ted John 1e9f9790ae Fix #5496: Attempting to log into servers results in crash 
Caused by the user not having the required 'official' objects. This was because the network was being closed during a network update. Disposed memory would then be accessed later in the update loop.

To fix this, a lock has been added to Close() so that it can be deferred to the end of Update(). This isn't particularly nice, but the whole of network will need redesigning to fix this properly for all potentical scenarios where Close() can be called.
 2017-06-06 20:05:47 +01:00
Ted John 430ab2db5c Fix double negative showing on money effects 2017-06-06 18:58:14 +01:00
Ted John 2f053800ba Add verbose logging of base paths 2017-06-06 17:02:45 +01:00
Michael Steenbeek f3b4c88783 Merge pull request #5532 from OpenRCT2/sub_hex_fix 
Name sub_<hex>() functions
 2017-06-06 16:14:54 +02:00
rwjuk aa81ee4601 Add another RCT2 address comment 
[ci skip]
 2017-06-06 13:55:23 +01:00
rwjuk f0dec49e6d Add RCT2 address comments 
[ci skip]
 2017-06-06 13:48:06 +01:00
Matthias Mailänder 889b81e070 Make title sequence download optional 2017-06-06 14:29:34 +02:00
Richard Jenkins bd20c92a77 Update Xcode project compatibility to Xcode-8.0 2017-06-06 11:29:07 +02:00
Michał Janiszewski c49f27dcab Peep pathfinding asserts (#3340) 2017-06-06 08:25:52 +01:00
Michał Janiszewski 3c7499f370 Validate access to _terrainEdgeSpriteIds (#4752) 2017-06-06 08:25:04 +01:00
Ted John c95dbf4b2f Merge pull request #5295 from janisozaur/fix-staff-hiring 
Fix staff hiring check
 2017-06-06 08:24:41 +01:00
rwjuk 325bb3e2da Name sub_88ABA4() 2017-06-06 01:16:44 +01:00