93f3abee1a
Change mod version separator to dot
...
I don't know why I put comma in there and how I didn't notice this
earlier.
2020-07-24 12:57:45 +02:00
fbe2191800
Allow producing objects with no keyword in CBOT ( #1335 )
2020-07-24 02:20:06 +02:00
b685d0060c
Merge branch 'dev' into dev-mod-manager
2020-07-23 18:19:42 +02:00
253cca379b
List which level subdirectory a mod changes
2020-07-23 18:07:02 +02:00
51668c12d7
Add changes listing to mods
...
It's just listing directories of a mod for now, but should give some
idea what the mod changes.
Also moved some functionality from pathman to modman.
Mods added with the `-mod` parameter are now managed by modman.
2020-07-23 17:44:38 +02:00
16795e0d49
Use level parser instead of JSON for manifest
2020-07-22 21:40:13 +02:00
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
df415880d0
Fix linter issues
2020-07-22 17:26:46 +02:00
1be69a0a51
Fix compile errors
2020-07-22 17:24:07 +02:00
2b96eda86d
Fix minor issues
2020-07-22 17:13:52 +02:00
f57da76ae8
Add handling of mods manifests
...
Also add Polish translations for mod manager related strings.
2020-07-22 16:35:47 +02:00
a5c7187017
Fix crashes on SatCom in Moon missions ( #1334 )
2020-07-22 00:37:37 +02:00
5112bf86df
Fix linter issues
2020-07-21 21:11:08 +02:00
2d32e3a798
Merge pull request #1255 from timgott/smooth_shadows_gl21
...
Smooth shadows in gl21
2020-07-21 20:55:47 +02:00
fd2b72b296
Merge pull request #1263 from nextghost/dev
...
Fix OpenGL specular lighting
2020-07-21 20:55:21 +02:00
eac74c23ec
Fix linter issues
2020-07-21 20:39:00 +02:00
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
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
754dfefefd
Add Missions+ gamemode
2020-07-20 18:35:31 +02:00
7e6782a1be
Try to improve font reloading
2020-07-19 16:07:27 +02:00
56a8c5eb48
Fix build error on GCC
2020-07-19 15:16:39 +02:00
63bf6bed08
Add saving mods list in colobot.ini
2020-07-19 15:02:35 +02:00
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
69d2d39c36
Add ability to use arrays in colobot.ini
2020-07-18 18:06:14 +02:00
a0635ae400
Fix linter issues
2020-07-18 15:01:36 +02:00
dc64b95406
Fix build error
2020-07-18 14:47:18 +02:00
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
95cab790c1
Rename 'freemissions' back to 'free'
2020-07-17 19:33:53 +02:00
b72bedaf60
Add BrownMushroom and GreenMushroom categories in CBOT
2020-07-17 18:00:36 +02:00
5f76722ecb
Add error dialogs for open path/url buttons
2020-07-17 17:27:09 +02:00
4905abe30b
Merge branch 'dev-mod-manager' of https://github.com/DavivaD/colobot into dev-mod-manager
2020-07-17 11:49:51 +02:00
ac32e40003
Add Ruin, Bush, GraviPlant, and Crystal categories in CBOT
2020-07-17 03:37:13 +02:00
d29570c20a
Merge pull request #1331 from colobot/dev-heavyduty
...
Update Heavy bots, fix collisions
2020-07-14 22:52:08 +02:00
73429315a7
Add USE_STATIC_RUNTIME option
...
Mainly useful for MSVC.
2020-07-14 20:43:42 +02:00
167dd01bbe
Revert "Fix CBotUT.FunctionRecursionStackOverflow test"
...
This reverts commit 004c861ba9
2020-07-14 13:54:32 +02:00
df7cdd4b8e
Fix some minor issues after CR
2020-07-14 13:51:07 +02:00
2143f21828
Fix linter
2020-07-14 13:43:33 +02:00
17e38bf66c
Install PDB file if available
2020-07-13 23:39:11 +02:00
634efbcabd
Fix GLEW_STATIC redefinition warnings
2020-07-13 21:33:36 +02:00
f0ba8ec325
Revert "Fix warnings about redefining GLEW_STATIC"
...
This reverts commit 9cf30fd9bc
2020-07-13 21:27:31 +02:00
83a32b36b3
Fix collision persistence of exploding Heavy bots
2020-07-13 20:27:40 +02:00
c80a816808
Merge branch 'dev' into dev-heavyduty
2020-07-13 19:51:23 +02:00
a2c62a9da6
Make Heavy bots destroy bushes on contact
2020-07-13 19:44:50 +02:00
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
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
81ddda4515
Make tests work with targets
2020-07-11 12:16:20 +02:00
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
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
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
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
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
6a23e97533
Fix collisions of animated plants
2020-07-08 14:17:08 +02:00
4bd6e01b65
Fix filename style of the particles generator
2020-07-07 21:30:21 +02:00
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
37e4ed8029
Updated license headers ( #1317 )
...
* Updated headers
* Updated more headers
2020-07-07 10:19:36 +02:00
c50b36118e
Revert "Make Recycler Recycle small Building Ruins."
2020-07-07 09:40:47 +02:00
47687931d7
Fix compilation error
...
Apparently binary constants are a C++14 feature.
2020-07-06 18:29:30 +02:00
cb364a4f96
Fix typo
2020-07-06 18:29:30 +02:00
06921e711d
Fix 'uninitialized field' warnings
2020-07-06 18:29:30 +02:00
124467c6e1
Fix 'naked new' warning
2020-07-06 18:29:30 +02:00
faa4a6eefa
Fix "inconsistent declaration parameter name"
2020-07-06 18:29:30 +02:00
e96e8b46b2
Fix include style warnings
2020-07-06 18:29:30 +02:00
6a22b709d6
Fix license headers
2020-07-06 18:29:30 +02:00
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
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
c04b2738de
Clear screenshot if no save selected
2020-07-06 11:36:10 +02:00
86dff7396e
Disable Delete/Load buttons if no save selected
2020-07-06 11:36:10 +02:00
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
55c0c3221d
Add missing const keyword in CBotClass.cpp
2020-07-06 11:32:15 +02:00
1b93963413
Apply suggestions from code review
...
Co-authored-by: Silent <CookiePLMonster@users.noreply.github.com>
2020-07-06 11:32:15 +02:00
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
a5909ac4de
Add private and protected keywords for methods
...
fixes #854
fixes #882
2020-07-06 11:32:15 +02:00
4a62e9ed76
Separate searching for functions and methods
...
fixes #207
fixes #1016
2020-07-06 11:32:15 +02:00
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
04b1944939
Add option to mute sounds when game is not focused
...
Closes #823
2020-07-05 14:58:46 +02:00
e108715760
Document public member functions for CFileDialog
2020-07-05 14:33:59 +02:00
3566fb4826
Add 'select folder' mode for file dialog
2020-07-05 14:33:59 +02:00
a3dbeb9829
Play a sound when open/save fails
2020-07-05 14:33:59 +02:00
50b2afbda8
Renaming variables and other minor fixes
2020-07-05 14:33:59 +02:00
5cc565439c
Move open/save dialog from CStudio to CFileDialog
2020-07-05 14:33:59 +02:00
e2eb5b91e0
Throw an exception on invalid input in StringUtils::Utf8CharSizeAt()
2020-07-05 13:57:39 +02:00
86ef158c00
Detect invalid values in StringUtils::Utf8CharSizeAt()
2020-07-05 13:57:39 +02:00
ebcb124b0e
Fix failed assert when parameter not initialized
...
fixes #1296
2020-07-05 13:03:56 +02:00
dece19fbec
Style fix
2020-07-05 12:58:45 +02:00
a2df003b7e
Fix radar function parameter type detection, fixes #1298
2020-07-05 12:58:45 +02:00
fb9fa49ce8
Use PHYSFS for saving screenshots
2020-07-05 12:55:40 +02:00
f449d9c800
Fix for issue #842
2020-07-05 11:04:21 +02:00
55b46942cb
Remove unnecessary whitespaces
2020-06-16 21:02:52 +02:00
5c0cfba8ae
Merge branch 'dev' into dev-cbot-factory
2020-06-16 20:07:03 +02:00
373d8de7d0
Make burning and destroyed objects physical
2020-06-13 16:08:06 +02:00
7f9efea0a2
Remove unnecessary whitespaces
2020-05-15 20:29:48 +02:00
bbf9356628
Fix colobot-lint error
2020-05-15 19:26:03 +02:00
0b9673029d
Merge dev into dev-builders and resolve conflicts
2020-05-15 15:06:37 +02:00
9a14c8c7e9
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2020-05-15 01:08:06 +02:00
0f33dbe154
Add holder model for trainer Subber
2020-05-14 13:36:37 +02:00
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
00d72d8d7b
Merge pull request #1265 from DavivaD/dev-thumper-patch
...
Thumper Patch
2020-04-24 21:09:04 +02:00
d8e0465d6d
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2020-04-07 23:17:56 +02:00
17ba464d33
Fix so called ''compilation errors'' in linter
2020-04-07 20:16:23 +02:00
MrSimbax
immibis