MrSimbax
62b770f7d3
Improve UI of mod manager a little
...
The arrow buttons are smaller and the up button is now above the down
button. What is more, the width of the back button is now the same as
in other places.
2020-07-22 17:50:19 +02:00
MrSimbax
df415880d0
Fix linter issues
2020-07-22 17:26:46 +02:00
MrSimbax
1be69a0a51
Fix compile errors
2020-07-22 17:24:07 +02:00
MrSimbax
2b96eda86d
Fix minor issues
2020-07-22 17:13:52 +02:00
MrSimbax
f57da76ae8
Add handling of mods manifests
...
Also add Polish translations for mod manager related strings.
2020-07-22 16:35:47 +02:00
Mateusz Przybył
a5c7187017
Fix crashes on SatCom in Moon missions ( #1334 )
2020-07-22 00:37:37 +02:00
MrSimbax
5112bf86df
Fix linter issues
2020-07-21 21:11:08 +02:00
Mateusz Przybył
2d32e3a798
Merge pull request #1255 from timgott/smooth_shadows_gl21
...
Smooth shadows in gl21
2020-07-21 20:55:47 +02:00
Mateusz Przybył
fd2b72b296
Merge pull request #1263 from nextghost/dev
...
Fix OpenGL specular lighting
2020-07-21 20:55:21 +02:00
MrSimbax
eac74c23ec
Fix linter issues
2020-07-21 20:39:00 +02:00
MrSimbax
242477e3ee
Major UI change to mod manager
...
Move the button to the sidebar.
Add reordering option.
General improvements and refactoring.
2020-07-21 20:27:24 +02:00
Droog71
c4385961c4
Fix for issue #1163 ( #1332 )
...
* Clamped power variable before assignment to params in object manager. Attempted to fix formatting issues.
* Fixed Clamp function not implemented correctly.
* Fixed formatting issue, space after commas.
* Created ClampPower method in object_manager.h and implemented in object_manager.cpp, Removed similar code from robotmain.cpp
* Removed redundant call to ClampPower in object_manager.cpp
* Added second call to ClampPower back to object_manager.cpp. Made ClampPower method private. Attempted to fix whitespace issues.
* Fixed missing assignment to params.power in CreateObject method of object_manager.cpp
* fixed white space at end of line 182 in object_manager.h
* Fixed doxygen compatibility issue.
2020-07-20 21:55:44 +02:00
Fiftytwo
754dfefefd
Add Missions+ gamemode
2020-07-20 18:35:31 +02:00
MrSimbax
7e6782a1be
Try to improve font reloading
2020-07-19 16:07:27 +02:00
MrSimbax
56a8c5eb48
Fix build error on GCC
2020-07-19 15:16:39 +02:00
MrSimbax
63bf6bed08
Add saving mods list in colobot.ini
2020-07-19 15:02:35 +02:00
Droog71
d64d78acfc
Fix for issue #1221 ( #1230 )
...
* Fix for issue #1221
* Removed object array and implemented GetObjectName method in it's place.
* Fixed indentation issue.
* Fixed white space at end of lines 1571, 1572.
2020-07-19 10:55:55 +02:00
MrSimbax
69d2d39c36
Add ability to use arrays in colobot.ini
2020-07-18 18:06:14 +02:00
MrSimbax
a0635ae400
Fix linter issues
2020-07-18 15:01:36 +02:00
MrSimbax
dc64b95406
Fix build error
2020-07-18 14:47:18 +02:00
MrSimbax
8390d85e46
Refactor the mod manager
...
Moved list of mods logic to a new CModManager class.
The list of enabled mods is now managed by a flag instead of directory
names of mods.
Mods are now disabled by default.
Also general cleanup, fixing issues from the code review in
https://github.com/colobot/colobot/pull/1191 and fixing linter issues.
Regression: the state of enabled/disabled mods is now not persistent.
The plan is to use some kind of config file for this.
2020-07-18 14:30:50 +02:00
Fiftytwo
95cab790c1
Rename 'freemissions' back to 'free'
2020-07-17 19:33:53 +02:00
Fiftytwo
b72bedaf60
Add BrownMushroom and GreenMushroom categories in CBOT
2020-07-17 18:00:36 +02:00
MrSimbax
5f76722ecb
Add error dialogs for open path/url buttons
2020-07-17 17:27:09 +02:00
MrSimbax
4905abe30b
Merge branch 'dev-mod-manager' of https://github.com/DavivaD/colobot into dev-mod-manager
2020-07-17 11:49:51 +02:00
Fiftytwo
ac32e40003
Add Ruin, Bush, GraviPlant, and Crystal categories in CBOT
2020-07-17 03:37:13 +02:00
Emxx52
d29570c20a
Merge pull request #1331 from colobot/dev-heavyduty
...
Update Heavy bots, fix collisions
2020-07-14 22:52:08 +02:00
MrSimbax
73429315a7
Add USE_STATIC_RUNTIME option
...
Mainly useful for MSVC.
2020-07-14 20:43:42 +02:00
MrSimbax
167dd01bbe
Revert "Fix CBotUT.FunctionRecursionStackOverflow test"
...
This reverts commit 004c861ba9
.
2020-07-14 13:54:32 +02:00
MrSimbax
df7cdd4b8e
Fix some minor issues after CR
2020-07-14 13:51:07 +02:00
MrSimbax
2143f21828
Fix linter
2020-07-14 13:43:33 +02:00
MrSimbax
17e38bf66c
Install PDB file if available
2020-07-13 23:39:11 +02:00
MrSimbax
634efbcabd
Fix GLEW_STATIC redefinition warnings
2020-07-13 21:33:36 +02:00
MrSimbax
f0ba8ec325
Revert "Fix warnings about redefining GLEW_STATIC"
...
This reverts commit 9cf30fd9bc
.
2020-07-13 21:27:31 +02:00
Fiftytwo
83a32b36b3
Fix collision persistence of exploding Heavy bots
2020-07-13 20:27:40 +02:00
Fiftytwo
c80a816808
Merge branch 'dev' into dev-heavyduty
2020-07-13 19:51:23 +02:00
Fiftytwo
a2c62a9da6
Make Heavy bots destroy bushes on contact
2020-07-13 19:44:50 +02:00
MrSimbax
c4037a885f
Make CI Windows build with MSVC instead of MXE
2020-07-12 23:17:42 +02:00
immibis
a2aeef0155
When game speed is 2 or higher, run multiple ticks.
2020-07-11 21:20:55 +02:00
MrSimbax
004c861ba9
Fix CBotUT.FunctionRecursionStackOverflow test
...
On MSVC it throws StackOverflow exception. I reduced the stack size to
make the test pass.
2020-07-11 12:17:20 +02:00
MrSimbax
81ddda4515
Make tests work with targets
2020-07-11 12:16:20 +02:00
Krzysztof Dermont
7d7a29117e
Save audio settings when option changes
...
Mute/unmute option when game windowis in background relies on settings
being updates. This happens when users leaves Options screen. This
commit adds saving audio settings on each change.
This is a fix for #1315
2020-07-10 20:15:18 +02:00
MrSimbax
9cf30fd9bc
Fix warnings about redefining GLEW_STATIC
...
I guess this flag is now set by CMake somehow so we no longer need
to define it ourselves.
2020-07-10 18:55:47 +02:00
MrSimbax
df65862c49
Start using CMake targets instead of variables
...
Moved most of the variables to targets in the main src.
Made libraries in repo export targets.
Refactor STATIC flags a little and add more.
This commit definitely breaks a lot of things like tests
but the main game builds at least with MSVC.
2020-07-10 18:49:54 +02:00
MrSimbax
4ae0360640
Remove source grouping temporarily
...
It's probably not how it should be done with modern CMake, so I'm
removing this for now to focus on other changes first.
2020-07-10 13:03:23 +02:00
MrSimbax
bf1982f4e4
Change `make update-pot` comment to cmake command
...
`make update-pot` only works if a generator producing Makefiles was
used with `cmake`. The `cmake` command to build a specific target
will work for any generator.
2020-07-10 11:01:47 +02:00
Fiftytwo
6a23e97533
Fix collisions of animated plants
2020-07-08 14:17:08 +02:00
MrSimbax
4bd6e01b65
Fix filename style of the particles generator
2020-07-07 21:30:21 +02:00
MrJohn10
35b22f7a7f
Refactor - Move UI mouse particles generation to a new class. ( #1308 )
...
* Move UI mouse particles generation to a new class.
* refactoring
* refactor - change variable name
* change backslashes to forward slashes in include directives
* remove & from variable
* Refactoring - fix linter issues
* Refactoring - fix linter issues
* refactoring - fix linter issues
2020-07-07 20:48:52 +02:00
tomangelo
37e4ed8029
Updated license headers ( #1317 )
...
* Updated headers
* Updated more headers
2020-07-07 10:19:36 +02:00
Fiftytwo
c50b36118e
Revert "Make Recycler Recycle small Building Ruins."
2020-07-07 09:40:47 +02:00
MrSimbax
47687931d7
Fix compilation error
...
Apparently binary constants are a C++14 feature.
2020-07-06 18:29:30 +02:00
MrSimbax
cb364a4f96
Fix typo
2020-07-06 18:29:30 +02:00
MrSimbax
06921e711d
Fix 'uninitialized field' warnings
2020-07-06 18:29:30 +02:00
MrSimbax
124467c6e1
Fix 'naked new' warning
2020-07-06 18:29:30 +02:00
MrSimbax
faa4a6eefa
Fix "inconsistent declaration parameter name"
2020-07-06 18:29:30 +02:00
MrSimbax
e96e8b46b2
Fix include style warnings
2020-07-06 18:29:30 +02:00
MrSimbax
6a22b709d6
Fix license headers
2020-07-06 18:29:30 +02:00
MrSimbax
7449111a00
Fix linter errors
...
"comparison of constant 240 with expression of type 'const char' is
always false"
also a whitespace issue
Changed the inequalities to bitwise comparisons, which hopefully don't
care about the sign.
I was considering just casting `c` to `unsigned char` but I doubt
it would be safe and multiplatform.
2020-07-06 18:29:30 +02:00
Krzysztof Dermont
a65776e0e7
Prevent game crash on bad savegame title
...
It was noted in issues #1207 and #1232 that game can crash when savegame
does not contain title. This might be a problem when saving game fails
and user is informed about it only in console. Proper fix should be a
visible error message informing that saving failed. This commit filters
invalid savegames from load windows and prevents game crash in narrow
cases.
2020-07-06 11:38:23 +02:00
Krzysztof Dermont
c04b2738de
Clear screenshot if no save selected
2020-07-06 11:36:10 +02:00
Krzysztof Dermont
86dff7396e
Disable Delete/Load buttons if no save selected
2020-07-06 11:36:10 +02:00
Krzysztof Dermont
1cffbb2bd3
Fix closing Load Save dialog without game selected
...
Pressing Load when no savegame is selected resumes game but Load Save window stays open.
2020-07-06 11:36:10 +02:00
melex750
55c0c3221d
Add missing const keyword in CBotClass.cpp
2020-07-06 11:32:15 +02:00
melex750
1b93963413
Apply suggestions from code review
...
Co-authored-by: Silent <CookiePLMonster@users.noreply.github.com>
2020-07-06 11:32:15 +02:00
melex750
a46fee4d4e
Don't reset timer in CBotStack::AllocateStack
...
The timer is already reset in CBotProgram::Run.
This prevents many cases where the game will hang or rendering is interrupted.
This fixes behavior of the script example in #874 .
The script example in #971 doesn't hang the game anymore.
2020-07-06 11:32:15 +02:00
melex750
a5909ac4de
Add private and protected keywords for methods
...
fixes #854
fixes #882
2020-07-06 11:32:15 +02:00
melex750
4a62e9ed76
Separate searching for functions and methods
...
fixes #207
fixes #1016
2020-07-06 11:32:15 +02:00
Emxx52
0102e45855
Merge pull request #1049 from colobot/dev-cbot-factory
...
Rework new functions so they follow established syntax rules
2020-07-05 17:26:04 +02:00
Krzysztof Dermont
04b1944939
Add option to mute sounds when game is not focused
...
Closes #823
2020-07-05 14:58:46 +02:00
melex750
e108715760
Document public member functions for CFileDialog
2020-07-05 14:33:59 +02:00
melex750
3566fb4826
Add 'select folder' mode for file dialog
2020-07-05 14:33:59 +02:00
melex750
a3dbeb9829
Play a sound when open/save fails
2020-07-05 14:33:59 +02:00
melex750
50b2afbda8
Renaming variables and other minor fixes
2020-07-05 14:33:59 +02:00
melex750
5cc565439c
Move open/save dialog from CStudio to CFileDialog
2020-07-05 14:33:59 +02:00
suve
e2eb5b91e0
Throw an exception on invalid input in StringUtils::Utf8CharSizeAt()
2020-07-05 13:57:39 +02:00
suve
86ef158c00
Detect invalid values in StringUtils::Utf8CharSizeAt()
2020-07-05 13:57:39 +02:00
melex750
ebcb124b0e
Fix failed assert when parameter not initialized
...
fixes #1296
2020-07-05 13:03:56 +02:00
tomangelo2
dece19fbec
Style fix
2020-07-05 12:58:45 +02:00
tomangelo2
a2df003b7e
Fix radar function parameter type detection, fixes #1298
2020-07-05 12:58:45 +02:00
melex750
fb9fa49ce8
Use PHYSFS for saving screenshots
2020-07-05 12:55:40 +02:00
Droog71
f449d9c800
Fix for issue #842
2020-07-05 11:04:21 +02:00
Fiftytwo
55b46942cb
Remove unnecessary whitespaces
2020-06-16 21:02:52 +02:00
Fiftytwo
5c0cfba8ae
Merge branch 'dev' into dev-cbot-factory
2020-06-16 20:07:03 +02:00
Fiftytwo
373d8de7d0
Make burning and destroyed objects physical
2020-06-13 16:08:06 +02:00
Fiftytwo
7f9efea0a2
Remove unnecessary whitespaces
2020-05-15 20:29:48 +02:00
Fiftytwo
bbf9356628
Fix colobot-lint error
2020-05-15 19:26:03 +02:00
Fiftytwo
0b9673029d
Merge dev into dev-builders and resolve conflicts
2020-05-15 15:06:37 +02:00
Fiftytwo
9a14c8c7e9
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2020-05-15 01:08:06 +02:00
Fiftytwo
0f33dbe154
Add holder model for trainer Subber
2020-05-14 13:36:37 +02:00
Michał Górny
f3ae4b4209
Fix missing <limits> include
...
Add missing <limits> include for std::numeric_limits. This fixes
build failure after boost stopped implicitly including it for us.
2020-05-14 11:26:15 +02:00
Emxx52
00d72d8d7b
Merge pull request #1265 from DavivaD/dev-thumper-patch
...
Thumper Patch
2020-04-24 21:09:04 +02:00
Fiftytwo
d8e0465d6d
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2020-04-07 23:17:56 +02:00
MrSimbax
17ba464d33
Fix so called ''compilation errors'' in linter
2020-04-07 20:16:23 +02:00
MrSimbax
ad33e0e624
Fix 'code block placement' linter issues
2020-04-07 20:05:32 +02:00
MrSimbax
f09768fb2d
Fix 'undefined function' linter issue
2020-04-07 19:13:30 +02:00
Fiftytwo
9db6bb63e4
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2020-04-07 19:10:32 +02:00
MrSimbax
87fec23f4b
Fix 'class naming' linter issues
2020-04-07 18:59:46 +02:00
Fiftytwo
e5d994b9e2
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2020-04-07 14:46:43 +02:00
Fiftytwo
ddab760624
Add rollert.png to OldModelManager
2020-04-07 14:35:59 +02:00
Fiftytwo
0c69dc8d30
Make Ants and Spiders able to destroy TargetBot
2020-04-05 16:05:57 +02:00
MrSimbax
621453a01c
Make all relative paths use base dir
2020-04-05 13:24:45 +02:00
MrSimbax
3fbfadb0d4
Merge branch 'dev' into dev-basedir
2020-04-03 21:12:48 +02:00
MrSimbax
8f122d6603
Fix MSVC compilation (again)
2020-04-03 20:18:14 +02:00
MrSimbax
d4b2f23c4a
Add handling of env variables
2020-04-03 20:15:24 +02:00
Fiftytwo
b5466261d4
Make buildings inherit trainer param from builder
2020-03-31 19:02:53 +02:00
Fiftytwo
0d6218bfa0
Fix trainer Builder segfault
2020-03-31 16:57:45 +02:00
suve
fc2bd68876
Fix missing std includes
2020-02-09 00:36:05 +01:00
Fiftytwo
853d8eee5d
Adjust HeavyTrainer rear light sprite position
2020-01-11 18:39:44 +01:00
Fiftytwo
5bf6f12ae5
Add HeavyTrainer texture recoloring
2020-01-11 17:04:40 +01:00
tomangelo
51cde3c868
Merge branch 'dev' into dev-savegame
2020-01-02 15:00:33 +01:00
tomangelo
b8c4232312
Merge pull request #1262 from B-CE/i18n-fr2
...
Update i18n fr
2020-01-02 14:42:15 +01:00
Martin Doucha
69aba7c352
Fix OpenGL 3.3 specular lighting
2019-12-29 14:46:39 +01:00
Martin Doucha
0d30624119
Fix OpenGL 2.1 specular lighting
2019-12-29 14:46:39 +01:00
tomangelo
8648de9581
Merge pull request #1278 from pkubaj/patch-1
...
Fix build on ARM and PPC
2019-12-28 22:33:04 +01:00
tomangelo
587e189e97
Merge pull request #1250 from colobot/dev-compilation-fix
...
Fixes compilation problem
2019-12-28 20:52:36 +01:00
pkubaj
1a771b0e72
Fix build on ARM and PPC
...
ARM and PPC use unsigned char by default.
2019-10-18 14:00:37 +02:00
MrSimbax
61a7aa2592
Fix minor memory leak
2019-08-07 09:51:27 +02:00
MrSimbax
2d3d03cc38
Use SDL_GetBasePath() instead of physfs because it's buggy in old version
2019-08-07 09:51:27 +02:00
MrSimbax
41379ded7e
Use workdir paths on dev builds
2019-08-07 09:51:27 +02:00
MrSimbax
5cefa57dd5
Use base dir instead of working dir for data files
2019-08-07 09:51:27 +02:00
DavivaD
50c3c45ef8
Show only local mods on the list
2019-07-27 17:58:12 +02:00
DavivaD
7d30a82747
Move platform-dependent code to system_*.cpp
2019-07-27 16:59:51 +02:00
DavivaD
cd140f1384
Move mod loading/unloading stuff to a new class + fix some derps
2019-07-27 03:36:03 +02:00
DavivaD
190e04fdd7
Move PT_FRAGV to the end of the pyro_type.h list + Undo reordering
2019-07-26 17:33:04 +02:00
DavivaD
9c2ea5f488
Undo some changes + space fixes
2019-07-22 17:04:15 +02:00
DavivaD
b8b2d32bc1
Thumper Patch
2019-07-22 01:15:11 +02:00
Fiftytwo
62620a93cd
Make Wrecks destroyable; make TargetBot more fragile
2019-07-17 02:57:47 +02:00
Fiftytwo
ed8dc04d94
Make TargetBot explode in water
2019-07-05 16:03:29 +02:00
B-CE
17d85eb434
Translate french comments + correct typo
2019-06-19 08:50:47 +02:00
melex750
17d0d2abb1
Fix compiling literal numbers
2019-05-12 08:33:53 -04:00
Tim Göttlicher
e9a153df14
Smoother shadows on OpenGL 2.1
2019-04-28 01:27:12 +02:00
melex750
5f089f4a9b
Fix and improve switch...case ( #1008 )
2019-04-11 05:34:00 -04:00
melex750
1058a326ad
Add binary and character literals in CBOT
2019-04-11 05:14:11 -04:00
melex750
bc572aa52f
Add sizeof() operator for numeric data types
2019-04-11 04:21:22 -04:00
melex750
c0cdd84e85
Add missing primitive data types in CBOT
2019-04-11 04:19:29 -04:00
melex750
250ea57e8b
Fix arithmetic operations with integers ( #993 )
...
Also fixed unsigned right shift operator ">>>"
2019-04-11 04:15:27 -04:00
melex750
a66b3d0672
Refactor SaveState and RestoreState to use streams
2019-04-11 04:13:13 -04:00
fernape
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
Tomasz Kapuściński
16a1dc7b9d
Removed unnecessary dependency on libwebp which causes compilation problems with static builds.
2019-03-04 21:40:59 +01:00
MrSimbax
0eb31a1f45
Fix PORTABLE_SAVES flag not working
2019-02-23 13:12:37 +01:00
tomangelo2
a46750ede2
Fix crash when destroying unpowered PowerPlant with Titanium
...
Appendix to pull #1206
2019-02-18 14:43:56 +01:00
tomangelo2
0f6e1d7d4a
Style fix
2019-02-18 14:43:56 +01:00
tomangelo
bc3fbd21d0
Merge pull request #1231 from colobot/dev-issue-1128
...
Potential fix for issue #1128
2019-02-07 01:12:10 +01:00
tomangelo
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
suve
086e07168d
Use sizeof() instead of magic number for strncpy in ModelOutput::WriteOldModel
2019-02-02 18:53:36 +01:00
tomangelo
02fd258697
Merge pull request #1206 from iceslab/dev
...
Fixes for #1203 and #1194
2019-01-29 20:31:57 +01:00
tomangelo
04b8bf6c42
Merge pull request #1235 from vkuzkokov/master
...
Put pitch and roll in [-180,180) range.
2019-01-29 20:31:37 +01:00
Vladislav Kuzkokov
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
tomangelo2
be97167994
Potential fix for issue #1128
2019-01-02 01:18:45 +01:00