Ted John
b563d26ffe
Fix #5588 : crash in object selection
...
Add more safety guards for -1 image IDs which can happen if images were unsuccessfully allocated during object load.
2017-06-11 11:14:58 +01:00
Ted John
71b63a3c8a
Merge pull request #5587 from IntelOrca/refactor/nosdl/lightfx
...
Remove SDL from drawing engine and lightfx
2017-06-10 23:53:55 +01:00
Ted John
5bb48f3539
Move SDL part of lightfx blend to drawing engine
2017-06-10 22:18:54 +01:00
Ted John
90aad2e2ec
Use rct_palette instead of SDL
2017-06-10 22:18:54 +01:00
Ted John
fc899d15ef
Remove SDL_Window from IDrawingEngine and UiContext
2017-06-10 22:18:54 +01:00
Ted John
b32f0b276d
Merge pull request #5574 from IntelOrca/fix/screenshot
...
Fix screenshot command and refactor drawing engine
2017-06-10 20:06:26 +01:00
Gymnasiast
46ef794c28
Fix Xcode project
2017-06-10 19:50:11 +02:00
Ted John
bd3132d305
Merge pull request #5582 from IntelOrca/refactor/nosdl/bits-and-pieces
...
Remove SDL, bits and pieces
2017-06-10 17:30:17 +01:00
Ted John
202cc269a7
Remove more SDL stuff from old platform code
2017-06-10 17:14:07 +01:00
Ted John
a52190ae44
Create C version of FULLSCREEN_MODE enum
2017-06-10 17:14:07 +01:00
Ted John
47e6f1d139
Rename our version of SDL_MIX_MAXVOLUME to MIXER_VOLUME_MAX
...
Keep an assert to make sure its the same as SDL in the mixer. If SDL changes it, we can either change ours or convert the number proportionally.
2017-06-10 17:14:07 +01:00
Ted John
abb857e51d
Remove platform_get_non_window_flags
2017-06-10 16:40:08 +01:00
Ted John
9bb055acc0
Remove unnecessary SDL.h include
2017-06-10 16:40:08 +01:00
Ted John
1f5373e927
Merge pull request #5581 from IntelOrca/refactor/nosdl/console-work
...
Remove SDL dependency in chat.c and console.c
2017-06-10 16:39:33 +01:00
Ted John
9cd8fd1498
Remove need of SDL in chat.c
2017-06-10 16:19:46 +01:00
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