b8c4232312
Merge pull request #1262 from B-CE/i18n-fr2
...
Update i18n fr
2020-01-02 14:42:15 +01:00
8648de9581
Merge pull request #1278 from pkubaj/patch-1
...
Fix build on ARM and PPC
2019-12-28 22:33:04 +01:00
587e189e97
Merge pull request #1250 from colobot/dev-compilation-fix
...
Fixes compilation problem
2019-12-28 20:52:36 +01:00
1a771b0e72
Fix build on ARM and PPC
...
ARM and PPC use unsigned char by default.
2019-10-18 14:00:37 +02:00
61a7aa2592
Fix minor memory leak
2019-08-07 09:51:27 +02:00
2d3d03cc38
Use SDL_GetBasePath() instead of physfs because it's buggy in old version
2019-08-07 09:51:27 +02:00
41379ded7e
Use workdir paths on dev builds
2019-08-07 09:51:27 +02:00
5cefa57dd5
Use base dir instead of working dir for data files
2019-08-07 09:51:27 +02:00
190e04fdd7
Move PT_FRAGV to the end of the pyro_type.h list + Undo reordering
2019-07-26 17:33:04 +02:00
9c2ea5f488
Undo some changes + space fixes
2019-07-22 17:04:15 +02:00
b8b2d32bc1
Thumper Patch
2019-07-22 01:15:11 +02:00
62620a93cd
Make Wrecks destroyable; make TargetBot more fragile
2019-07-17 02:57:47 +02:00
ed8dc04d94
Make TargetBot explode in water
2019-07-05 16:03:29 +02:00
17d85eb434
Translate french comments + correct typo
2019-06-19 08:50:47 +02:00
17d0d2abb1
Fix compiling literal numbers
2019-05-12 08:33:53 -04:00
5f089f4a9b
Fix and improve switch...case ( #1008 )
2019-04-11 05:34:00 -04:00
1058a326ad
Add binary and character literals in CBOT
2019-04-11 05:14:11 -04:00
bc572aa52f
Add sizeof() operator for numeric data types
2019-04-11 04:21:22 -04:00
c0cdd84e85
Add missing primitive data types in CBOT
2019-04-11 04:19:29 -04:00
250ea57e8b
Fix arithmetic operations with integers ( #993 )
...
Also fixed unsigned right shift operator ">>>"
2019-04-11 04:15:27 -04:00
a66b3d0672
Refactor SaveState and RestoreState to use streams
2019-04-11 04:13:13 -04:00
44083053ce
Add FreeBSD support.
...
Add a new PLATFORM_FREEBSD variable. We can compile like MacOS with just an
extra linker flag.
2019-03-09 19:04:00 +01:00
16a1dc7b9d
Removed unnecessary dependency on libwebp which causes compilation problems with static builds.
2019-03-04 21:40:59 +01:00
0eb31a1f45
Fix PORTABLE_SAVES flag not working
2019-02-23 13:12:37 +01:00
a46750ede2
Fix crash when destroying unpowered PowerPlant with Titanium
...
Appendix to pull #1206
2019-02-18 14:43:56 +01:00
0f6e1d7d4a
Style fix
2019-02-18 14:43:56 +01:00
bc3fbd21d0
Merge pull request #1231 from colobot/dev-issue-1128
...
Potential fix for issue #1128
2019-02-07 01:12:10 +01:00
b50a71bde4
Merge pull request #1239 from suve/use-sizeof-in-ModelOutput-WriteOldModel
...
Tweak strncpy() usage in ModelOutput::WriteOldModel
2019-02-07 01:11:55 +01:00
086e07168d
Use sizeof() instead of magic number for strncpy in ModelOutput::WriteOldModel
2019-02-02 18:53:36 +01:00
02fd258697
Merge pull request #1206 from iceslab/dev
...
Fixes for #1203 and #1194
2019-01-29 20:31:57 +01:00
04b8bf6c42
Merge pull request #1235 from vkuzkokov/master
...
Put pitch and roll in [-180,180) range.
2019-01-29 20:31:37 +01:00
e3f53dc203
Put pitch and roll in [-180,180) range.
...
Reasonable values lie close to either side of 0.
2019-01-06 07:09:57 +01:00
be97167994
Potential fix for issue #1128
2019-01-02 01:18:45 +01:00
92d2de5325
Fixed VSync options list
...
Now VSync list is aligned for same height as resolution list from the bottom, as it's very hard to align them from top on different screen resolutions.
2019-01-02 00:34:34 +01:00
9cf89db8af
Merge pull request #1213 from ananace/fix-xdg
...
Fix Linux savegame path issue, closes #1212
2018-12-23 16:43:59 +01:00
723c552783
Add Heavy and Amphibious trainer bots
2018-12-23 07:04:06 +01:00
d57c45cbb2
Merge pull request #1211 from suve/limit-game-speeds
...
Add a minimum & maximum game speed limit
2018-12-22 15:49:53 +01:00
3db153f964
Merge pull request #1202 from colobot/dev-restext
...
Add a note mentioned in issue #1197
2018-12-22 15:17:28 +01:00
508e7529d2
Use Math::Clamp() when limiting game speed
2018-11-27 19:25:56 +01:00
d11404a6e9
Fix Linux savegame path issue, closes #1212
2018-11-25 14:49:01 +01:00
4305f8de03
Add a minimum & maximum game speed limit
2018-11-18 21:09:11 +01:00
7c88a6e667
Fix for #1194
2018-10-13 10:12:41 +02:00
abf1a60a86
Fix for #1203
2018-10-10 19:14:23 +02:00
3f6e84b418
Merge pull request #1167 from badernageral/dev
...
Translation to Brazilian Portuguese
2018-09-08 22:03:28 +02:00
9aa3773752
Merge pull request #1199 from CHmSID/fix-more-warnings
...
Fix another GCC 8.2.0 warning
2018-09-08 22:01:01 +02:00
a76bbe49ed
Merge pull request #1189 from colobot/dev-msvc
...
Add some Visual Studio specific fixes
2018-09-08 22:00:47 +02:00
aed74321cb
Merge pull request #1115 from B-CE/dev-tabMgt
...
fix #274 : pasting tabs
2018-09-08 22:00:18 +02:00
ee0b46a278
Add a note mentioned in issue #1197
2018-08-21 21:28:45 +02:00
31b309fa24
Merge pull request #1186 from colobot/dev-switch-case
...
Fix switch case documentation shortcut
2018-08-21 12:16:41 +02:00
7d46ee762a
Merge pull request #1181 from colobot/dev-vsync
...
Add VSync switch to Device tab
2018-08-21 12:16:03 +02:00
6f0a294048
Give space for a null character in texture name
2018-08-18 09:11:46 +01:00
f3b30625ee
Fix GCC 8 warning about sprintf overflow ( #1192 )
2018-08-12 07:49:45 +02:00
7e19622b85
Allow both F11 and F12 for stats
2018-07-25 23:45:15 +02:00
cb701cacb8
Add a workaround for failed assertion in VS debugger
...
Assertion failed: ploc->_Mbcurmax == 1 || ploc->_Mbcurmax == 2
Apparently MS C/C++ library doesn't support UTF-8 locales, which causes the assertion to fail. My solution is to ignore the system locale and try to set the classic one.
LibreOffice seems to have this problem fixed in less simple way: https://gerrit.libreoffice.org/#/c/54110/
2018-07-25 21:44:31 +02:00
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
dbd1f601da
Translation to Brazilian Portuguese
2018-05-15 18:31:41 -03:00
2b933264fc
Translation to Brazilian Portuguese
2018-05-15 16:07:03 -03: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
a3def6d683
Disallow firendly fire in ScoreboardKillRule
2018-05-08 23:57:13 +02:00
0baf9f8077
Don't commit code in a hurry like that...
2018-05-08 23:47:50 +02:00
f03c3dbc10
Implement ScoreboardObjectRule
2018-05-08 23:44:23 +02:00
dd40c4d4ee
Make magnifyDamage=0 for fragile objects actually work
...
This fixes a bug in 36d2cf14b8
2018-05-08 19:54:25 +02:00
db72a36315
Fix code style
2018-05-08 19:44:24 +02:00
caf58c8ab8
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2018-05-07 21:48:48 +02:00
5283865a5c
Merge pull request #1136 from colobot/dev-cbot-optimizations
...
Some CBot code optimizations
2018-05-07 20:53:52 +02:00
tomangelo