32d3d1eb92
Change key for debug menu to F10 and for stats to F11
...
F12 is used by Visual Studio debugger to trigger a breakpoint and apparently it cannot be changed:
"The F12 key is reserved for use by the debugger at all times, so it should not be registered as a hot key. Even when you are not debugging an application, F12 is reserved in case a kernel-mode debugger or a just-in-time debugger is resident."
Source: https://msdn.microsoft.com/en-us/library/windows/desktop/ms646309.aspx?f=255&MSPPError=-2147217396
2018-07-25 21:38:47 +02:00
f93fd61c26
Rename OFFICIAL_BUILD to OFFICIAL_COLOBOT_BUILD
...
In order to avoid conflict with OFFICIAL_BUILD variable inside ntverp.h. It caused compilation error "invalid integer expression"
https://github.com/tpn/winsdk-10/blob/master/Include/10.0.10240.0/shared/ntverp.h#L134
2018-07-25 21:34:39 +02:00
5080cb46b1
Merge pull request #1031 from tomangelo2/dev
...
Added fonts configurability by a separate file
2018-07-25 19:51:55 +02:00
3383532752
Changed font_config to font_loader
...
Apparently linter doesn't like files with `config` in its name
2018-07-25 00:44:06 +02:00
d84be03a83
Removed non-existing font from code
...
Forgot to check build on clean data directory
2018-07-23 14:10:27 +02:00
df46bcfe2d
Fix another linter warning
2018-07-23 14:03:59 +02:00
14b6f7cafa
Fixed some linter warnings in font_config files
2018-07-23 12:46:47 +02:00
d90592f7b6
Merge pull request #1162 from AbigailBuccaneer/gl-cleanup
...
Clean up and improve CGLxxDevice code
2018-07-23 12:15:08 +02:00
5041aa377d
Merge pull request #1156 from AbigailBuccaneer/redundant-shadowmap-renderbuffer
...
Don't create a color renderbuffer for shadow map
2018-07-23 12:14:45 +02:00
fb00898035
Fix switch case documentation shortcut
...
Also some polishing of loops help texts
2018-07-21 00:09:37 +02:00
3f04654cd3
Make ruins destroyable
2018-07-13 13:16:30 +02:00
5b2b632de3
Add TargetBot research; make it fully operational
2018-07-13 00:03:20 +02:00
5b2f3111b6
Add trainer=1 SpaceShip
2018-07-12 20:54:58 +02:00
146581e44c
Add trainer=1 AutoLab
2018-07-12 20:35:50 +02:00
02eb4623b9
Add trainer=1 ResearchCenter
2018-07-12 20:17:09 +02:00
d0e29d4875
Add trainer=1 BotFactory
2018-07-12 19:55:31 +02:00
4bfada2ad6
Better handling of VSync errors
2018-07-05 21:18:14 +02:00
608d59f07b
Moved VSync setting from Experimental to Setup
2018-07-05 20:56:38 +02:00
359abf9a82
Add VSync switch to Device tab
2018-07-05 19:43:56 +02:00
abb7d54ef5
Add support for VS CMake/vcpkg compilation ( #1174 )
...
* Add support for VS CMake/vcpkg compilation
* Fix system_windows.cpp compilation
* Add optimization and hidden console to MSVC release builds
2018-06-04 09:17:51 +02:00
0c16d9a272
Translation to Brazilian Portuguese
2018-05-16 10:22:57 -03:00
073191d1ea
Small CPathManager refactoring
2018-05-16 13:28:06 +02:00
c218fcce98
Merge branch 'master' into dev
2018-05-16 11:55:15 +02:00
17447e813b
Fix building of colobot.rc on Windows
2018-05-16 11:55:06 +02:00
dbd1f601da
Translation to Brazilian Portuguese
2018-05-15 18:31:41 -03:00
be1066912f
Translation to Brazilian Portuguese
2018-05-15 16:50:42 -03:00
2b933264fc
Translation to Brazilian Portuguese
2018-05-15 16:07:03 -03:00
cdb8a4871a
Release 0.1.11.1-alpha: Bump version
2018-05-10 21:20:13 +02:00
12c969c71c
Post-release 0.1.11.1-alpha
2018-05-10 21:20:13 +02:00
af306c4790
Release 0.1.11.1-alpha: Merge branch 'dev'
2018-05-10 21:20:13 +02:00
7aaac449f5
Fix release script version override
...
This fixes a bug in 94a18e9648
2018-05-10 21:16:42 +02:00
acc3362172
Update data submodule
2018-05-10 21:06:10 +02:00
f538b4f477
What did I say about commiting in a hurry
2018-05-10 11:32:33 +02:00
12cf57409c
Support more buttonX.png files in other places than just buttons
2018-05-10 11:24:59 +02:00
05bc65a90b
Add support for more buttonsX.png textures (for modders)
2018-05-10 11:12:45 +02:00
8095dc14f7
Add support for custom button= for View cameras
2018-05-10 11:12:22 +02:00
ed397d2b0f
Make sure aliens hatched from eggs are not selectable by default, closes #1054
2018-05-09 23:25:52 +02:00
319d8e6854
Fix delete() not returning sometimes, closes #1067
2018-05-09 23:12:26 +02:00
e481905a25
Do less state setting in gl14 and gl21
2018-05-09 21:03:08 +01:00
c9a8a242a0
Remove CGL14Device's support for display lists
...
Closes #1153 .
2018-05-09 21:03:08 +01:00
f8ebc6ec21
Remove code for drawing dynamic vertex formats
...
It's unused, and it's a bad idea - it's important for authoring tools
and for performance that vertex formats are well-defined instead of
dynamically created.
2018-05-09 21:03:08 +01:00
94b30c00a0
Remove code duplication in CGLxxDevice
2018-05-09 21:03:08 +01:00
10fc47476b
Fix code style
2018-05-09 18:34:27 +02:00
85772376fa
Merge ScoreboardSortType with main Scoreboard command
2018-05-09 18:33:27 +02:00
1ed3f4b215
Add EndMissionTeams immediateWin=true; make the teams on win screen sorted
2018-05-09 18:28:25 +02:00
c027b54add
Don't create a color renderbuffer for shadow map
...
When rendering the shadow map offscreen using framebuffer objects, it's
not necessary to create a color renderbuffer. Currently
FramebufferParams only lets you choose between a renderbuffer and a
texture for both color and depth attachments. This changes that, and now
you can ask for a texture, a renderbuffer, or nothing.
This improves performance. On my computer, with an 8192x8192 shadow map,
this improves overall frame time by 8.0%.
2018-05-09 17:25:52 +01:00
abe489e294
Add EndMissionTimeout
2018-05-09 17:47:21 +02:00
94a18e9648
Add version override to release script
...
NOT TESTED!
2018-05-09 17:23:46 +02:00
761694fa05
Merge pull request #1161 from AbigailBuccaneer/fix/1160
...
Fix -Wsuggest-override compile errors in tests
2018-05-09 17:10:44 +02:00
807d6e40e3
Fix -Wsuggest-override compile errors in tests
...
Fixes #1160
2018-05-09 08:49:23 +01:00
MrSimbax