Commit Graph

2303 Commits (681d5203e5c407c02e8a0bb1595396e865018a5f)

Author SHA1 Message Date
krzys-h 6f412df232 Fixed lockups when calling StartSuspend multiple times 2016-07-04 17:02:39 +02:00
krzys-h fb3245977c Added logging to CPauseManager 2016-07-04 17:01:48 +02:00
krzys-h 58815059ea Added warnings about planned changes to EndMisisonTake (#759) 2016-07-04 16:30:22 +02:00
melex750 d0d0c4f197 Fix class not unlocked when program is stopped
#626
2016-06-24 17:29:32 -04:00
melex750 64157090e6 Fix crash when calling method on a null object 2016-06-24 17:18:11 -04:00
melex750 51665e8396 Fix "new" keyword syntax checking 2016-06-24 17:03:50 -04:00
melex750 66984a4bb3 Fix using compound-assignment with an array
...that was initialized in the definition
2016-06-24 17:00:41 -04:00
melex750 0d74b4f36b Fix initializing an array using variables
Resolves a conflict between CBotListArray and CBotExprVar
2016-06-24 16:56:17 -04:00
krzys-h 3b9b9b322a Changed mouse scaling (again) 2016-06-21 13:07:40 +02:00
krzys-h 0fbd2d107c Allow using the CBot debugger during code battles 2016-06-21 13:06:55 +02:00
krzys-h c304ecd0ca Changed arrays to use {} when converted to string; added tests 2016-06-21 12:58:43 +02:00
krzys-h 5f7a8dbd5d Fixed string values with spaces (closes #791) 2016-06-21 12:57:45 +02:00
krzys-h 8ad53ce327 Fixed pause blur in main menu 2016-06-19 22:18:03 +02:00
krzys-h bd4362e26c Fixed dynamic textures not being reloaded properly 2016-06-19 19:57:55 +02:00
Tomasz Kapuściński a0b3f7a769 Fixed problem with pause blur after changing some graphic settings 2016-06-19 16:52:01 +02:00
krzys-h 125d1a32c7 Fixed pause blur blinking for one frame
issue #656
2016-06-19 12:23:57 +02:00
krzys-h 9d9131c3fb Fixed pause blur with MSAA
issue #656
2016-06-19 11:45:59 +02:00
krzys-h bf2e3cdfae Merge pull request #783 from melex750/dev
[INFO] Conversion to string
2016-06-17 22:41:53 +02:00
krzys-h 7ce23fdf52 Do not rotate after changing autosave settings
See https://github.com/colobot/colobot/pull/789#discussion_r67570610
2016-06-17 22:39:45 +02:00
krzys-h 439a416a66 Merge pull request #789 from Erihel/dev-boost-filesystem-removal
Dev boost filesystem removal
2016-06-17 22:38:41 +02:00
krzys-h 9017e5a25b Fixed links in CBot listings in SatCom 2016-06-17 21:13:16 +02:00
Krzysztof Dermont 32629a2f2a Refactor autosave rotation.
In order to remove boost:filesystem from CResourceManager Move()
function has to be removed or rewrited. Since Move is only used in
autosave rotation it's simpler to change autosave rotation and remove
Move().

Now oldest autosaves (with lowest timestamp) will be removed in rotation.
2016-06-09 19:30:08 +02:00
Krzysztof Dermont 2168b57cac Remove part of boost::filesystem usage. 2016-06-09 19:30:08 +02:00
melex750 37ab015c8d Fix conversion to string with = operator 2016-05-29 06:55:28 -04:00
melex750 6db2832577 Fix conversion to string with + operator 2016-05-29 06:45:08 -04:00
melex750 0165e8f348 Fix and document TypeCompatible 2016-05-29 06:40:42 -04:00
krzys-h b56cd11c98 Added C++ operator overloads to CBotVar 2016-05-29 00:06:34 +02:00
krzys-h df111dbf98 Refactored CBotVar to templates 2016-05-28 23:28:12 +02:00
krzys-h 0e101debe0 Removed CAM_TYPE_INFO 2016-05-28 18:52:30 +02:00
krzys-h 646e5104f6 Some CCamera cleanup and docs 2016-05-28 18:44:38 +02:00
krzys-h bef27c3b36 Removed unused parameter from CEngine::SetViewParams 2016-05-28 16:48:36 +02:00
krzys-h d80fa387b9 Fixed some particle crashes after 99a831a03b 2016-05-28 16:16:48 +02:00
krzys-h 89b495c667 Cleaned up whitespace in translation strings 2016-05-28 16:03:02 +02:00
krzys-h 2dd7ba7e9b Added camera keybindings (#653) 2016-05-28 15:41:01 +02:00
krzys-h ebc2e6e26c Added camera joystick bindings (#653) 2016-05-28 13:50:41 +02:00
krzys-h 942f746a21 Removed CAM_TYPE_DIALOG 2016-05-28 12:50:32 +02:00
krzys-h aa159bc9b0 Don't scale mouse cursor with resolution 2016-05-28 00:43:14 +02:00
krzys-h 99a831a03b Fixed CParticle::CheckChannel "errors"
Not really errors, but I fixed them anyway
2016-05-28 00:26:56 +02:00
krzys-h 5ab99429d4 Fixed FIX camera up/down movement 2016-05-28 00:00:08 +02:00
krzys-h 250047579f Allow using custom paths for win/lost scenes 2016-05-27 23:37:36 +02:00
krzys-h bd72086704 Unified all camera inputs
Until now each camera type had separate code for handling camera input, and some new features were missing in some of them.

The camera controls are as follows:
* RMB+mouse and numpad keys - horizontal/vertical rotation
* mouse wheel and +/- keys - zoom (in free camera - move eye up/down)
* CTRL or MMB + horizontal controls - pan left/right
* CTRL or MMB + zoom controls - move lookat up/down (free camera only)
2016-05-27 22:38:44 +02:00
melex750 6491ce0aa5 Fix passing "this" as an argument to a method 2016-05-24 10:30:20 -04:00
melex750 c19f97bc24 Fix RestoreState to assign IDs to instance vars 2016-05-24 10:09:44 -04:00
krzys-h cdd719cc47 Made clipping distance settings apply immediately 2016-05-21 19:05:18 +02:00
krzys-h 59c106f7a7 Fixed pause blur image not updating correctly on resolution change 2016-05-21 19:03:53 +02:00
Tomasz Kapuściński 213fd6b203 Added blur effect when the game is paused (issue #656)
Might be unstable, needs more testing. To enable, add PauseBlur=1 to [Experimental] section in colobot.ini
2016-05-21 14:27:35 +02:00
Tomasz Kapuściński 8922bb5e84 Renamed CGLDevice to CGL14Device 2016-05-11 14:50:18 +02:00
Tomasz Kapuściński ebca89d920 Removed texture coordinate generation
This feature was only needed by GL14 device to implement shadow mapping and is not supported by shader-based devices. Shadow mapping has been rewritten, so this feature is no longer needed.
2016-05-11 13:47:08 +02:00
Mateusz Przybył 734e6e97c0 Group source files for IDE projects in CMake
Merge pull request #773 from MrSimbax/msvc-project-org-cmake
2016-05-02 12:14:18 +02:00
tomangelo2 9870cfe8a8 Clamp FogStart value to 0 if negative
Should fix issue #766
2016-05-02 01:27:07 +02:00
krzys-h c00a7fd132 Do not zoom while scrolling lists, closes #769 2016-04-22 19:20:31 +02:00
melex750 e7942962d3 Fix checking parameters in CBotFunction 2016-04-19 10:36:06 -04:00
krzys-h 952a5423fd Fixed non-power-of-2 images in SatCom (closes #634); fixed not unloading textures on SatCom close 2016-04-10 13:53:34 +02:00
krzys-h dd8a324f9b Fixed crash when loading level with incorrect object type 2016-04-10 13:27:56 +02:00
krzys-h d3f808f66d Merge branch 'dev-savegame' into dev 2016-04-10 13:16:10 +02:00
krzys-h 4de9d25f04 Man, those compile errors... 2016-04-09 18:58:34 +02:00
krzys-h 32af7f45df Fixed missing #includes 2016-04-09 18:52:15 +02:00
krzys-h 04d7c343ef Removed misc.cpp / misc.h 2016-04-09 18:46:12 +02:00
krzys-h 139592bc00 Proper l10n for date/time 2016-04-09 18:23:57 +02:00
krzys-h 14e2910f83 Proper plural form translations for ObligatoryToken 2016-04-09 16:28:11 +02:00
krzys-h bd9184bd92 Refactored part of CScript to std::string 2016-04-08 22:27:42 +02:00
krzys-h 7f38aca766 Improvements to ObligatoryToken/ProhibitedToken
Now you can specify exactly how many times given instruction can occur
2016-04-08 22:15:58 +02:00
krzys-h 3e4fbe93a6 This time really fixed compile errors 2016-04-08 21:22:00 +02:00
krzys-h ed58e7e012 Fix compile warning 2016-04-08 21:16:03 +02:00
krzys-h 4c8da2c503 LevelController improvements; minor EndMissionTake cleanup
* using LevelController script in the level doesn't forcefully disable EndMissionTake and AudioChange anymore
* cleaned up some code related to processing EndMissionTake commands
2016-04-08 20:56:09 +02:00
krzys-h ae4e875729 Do not store exact object part positions
This seems to be unnecessary, as the animation update code should set those on its own. Needs some more testing though.
2016-04-08 18:28:35 +02:00
Piotr Dziwinski c6c01c332f Fix displaying of text highlights (#738) 2016-04-08 21:24:14 +12:00
krzys_h 1941020993 Merge pull request #762 from melex750/dev
Fix initializing arrays in class definition
2016-04-07 21:27:19 +02:00
krzys-h ac950978a9 Fixed AlienWorm collisions (#740) 2016-04-07 20:30:25 +02:00
krzys-h 0d12dedd90 Fixed failed assertion when non-damageable objects get fall damage (closes #764) 2016-04-07 20:21:35 +02:00
Piotr Dziwinski 71a77c77f6 Hack to finally fix #738
Text rendering is now done in window coordinates corresponding to window
pixels to avoid floating-point rounding errors that show up as rendering
artifacts
2016-04-06 23:08:50 +12:00
melex750 748f0034bd Fix array in a class not working with sizeof()...
...when no assignment is made in the definition.

It should pass this unit test now:
TEST_F(CBotUT, DISABLED_ArraysInClasses)
2016-04-05 15:02:41 -04:00
melex750 61440392d2 Fix initializing static array in class definition
issue #32
2016-04-05 14:00:15 -04:00
krzys-h c94ebb45e7 Moved pathman from common/ to app/ 2016-04-04 22:28:08 +02:00
krzys-h 14721001e5 Merged PR #737: Fix for various issues with initializing variables in CBOT 2016-04-03 21:08:52 +02:00
krzys-h 15702ec856 Fixed indentation 2016-04-03 20:29:55 +02:00
krzys-h 6216daedb3 Merge part of PR #756 2016-04-03 20:17:23 +02:00
KarolTrzeszczkowski 1960b373f1 Solves #700
It turns out, that tower is not over powered in code battle mode. It never hits flying enemy robot.
2016-04-03 13:31:08 +02:00
krzys-h c0780f938e One more code style fix 2016-04-03 13:19:51 +02:00
krzys-h 98dd9f90c8 Fixed code style warnings 2016-04-03 13:06:55 +02:00
Piotr Dziwinski 72f966b118 Fix for #738
Add one-pixel boundary and fix texture coordinates for font characters
This should finally fix the issue of pixelated text
2016-04-03 21:40:33 +12:00
krzys-h 02633e32c3 Merge branch 'master' into dev 2016-04-02 23:55:32 +02:00
krzys-h 37d72351be Fixed log file creation crash (#755) 2016-04-02 23:53:07 +02:00
Smok94 6afdb7b6c8 First person camera unlocked for Me and Tech
*unlocked camaera button for Me and Tech
*unlocked first ferson view for Me and Tech
*Me and Tech have no "camera view" effect like robots in first person
mode

#156
2016-04-02 15:56:27 +02:00
Smok94 831276f378 Appearance customization face butons fix
*face buttons 2 and 4 swaped.
*default hair colors now fit to buttons look
*changing face changes hair color do default

Fixes two first issues mentioned in the #724
2016-04-02 13:13:42 +02:00
krzys-h 39b364fa77 Fixed compilation with disabled sound support, closes #748 2016-03-30 22:22:22 +02:00
Didier Raboud a06035ecb8 Fix occured/occurred spelling error 2016-03-30 13:40:26 +02:00
Krzysztof Dermont 8ccad5b954 Deactive pause before jumping to next visit
When pause was active setting new pause resulted in strange behavior.

This should fix issue #736.
2016-03-29 22:32:44 +02:00
Krzysztof Dermont 2ea453f484 Change SatCom button size in main menu
Change button size as proposed in issue #722
2016-03-29 21:36:33 +02:00
krzys-h 64fef98bd7 Merge branch 'dev-0.1.8' into dev 2016-03-29 16:16:20 +02:00
Tomasz Kapuściński df4e5fa309 Fix for error spam in console when running on GL14 device 2016-03-29 15:05:32 +02:00
Tomasz Kapuściński 32d1994c98 Added VSync setting and corrected default framebuffer MSAA setting 2016-03-29 13:38:53 +02:00
krzys-h 427bbfa630 Changed CParticle::CheckChannel log message 2016-03-28 23:04:24 +02:00
krzys-h e24d77bde8 goto() bitmap debugger 2016-03-28 21:42:25 +02:00
krzys-h d38ddcbc41 goto() path debugger 2016-03-28 20:25:07 +02:00
krzys-h e4f9360e63 Resources debug mode 2016-03-28 17:58:31 +02:00
krzys-h 4af02c86f8 Debug menu 2016-03-28 17:58:31 +02:00
krzys-h 45c93f58ec Fixed Houston lights when object is rotated 2016-03-27 18:54:56 +02:00
krzys-h 7fe65067ee Fixed exit after single mission mode 2016-03-27 13:46:48 +02:00
krzys-h d2ac1afcf0 Changed reference colors using when recoloring textures to constants 2016-03-27 13:34:26 +02:00
krzys-h adf20f58d4 Removed unused members of CNullDevice 2016-03-26 19:50:53 +01:00
krzys-h 5de577400b Refactor CRobotMain::ExecuteCmd() to std::string 2016-03-26 19:06:07 +01:00
krzys-h 6585ee9ae8 Refactor some references to CRobotMain from CEngine 2016-03-26 18:55:39 +01:00
krzys-h 640c0297ef Replaced CConfigFile::GetInstancePointer() with GetConfigFile() 2016-03-26 18:34:26 +01:00
krzys-h 16c1f34a07 Removed unnecessary LoadAllTextures call 2016-03-25 17:14:20 +01:00
krzys-h 17bcbddef1 Destroy white texture in GL14 device on exit 2016-03-25 17:10:21 +01:00
krzys-h d812db19f8 Fixed ground spots not working after changing texture params; use UpdateTexture instead of destroy and recreate 2016-03-25 17:06:01 +01:00
krzys-h bfdce26721 Fixed issues with CBotDebug::DumpCompiledProgram on certain compilers
See https://colobot.info/forum/showthread.php?tid=721
2016-03-25 16:05:13 +01:00
krzys-h c831cd8637 Updated Polish translations 2016-03-25 11:31:04 +01:00
Piotr Dziwinski 4e331f1f54 Possible workaround for #738
Align text rendering to character, not tile size
2016-03-25 15:50:13 +13:00
krzys-h b84e24d662 Fixed VBOs never being used even if available 2016-03-24 18:45:51 +01:00
Tomasz Kapuściński a84b5c28b7 Optimizations of primitive rendering in OpenGL 3.3 device 2016-03-22 15:16:08 +01:00
Tomasz Kapuściński d3ef04428b Added DeviceCapabilities 2016-03-22 14:27:00 +01:00
Piotr Dziwinski 926f7cf115 Possible fix for #738
Explicitly set byte alignment in pixel transfer operations
2016-03-22 23:31:08 +13:00
krzys-h 08f3a03547 Fixed choppy part rotation animations, closes #742
While most visible on the astronaut model, this fix actually applies to all objects
2016-03-21 20:52:21 +01:00
melex750 02133d0bd4 Fix method overloading 2016-03-21 07:56:52 -04:00
melex750 8b7410f803 Fix class.arrays using size of one before comma 2016-03-21 06:11:55 -04:00
melex750 6be1f56288 Add error code no expression, remove some bad code 2016-03-20 20:55:22 -04:00
Tomasz Kapuściński b31353cf75 Optimized crash sphere rendering 2016-03-20 19:17:15 +01:00
melex750 5b3da83715 Fix inline declaration of an array of string 2016-03-20 13:27:02 -04:00
melex750 707ef97626 Fix syntax+type checking, base types+CBotDefArray 2016-03-20 07:54:41 -04:00
melex750 accfc93573 Add syntax and type checking for class member vars 2016-03-20 07:50:42 -04:00
melex750 4a29e8406d Fix syntax and type checking for CBotListArray 2016-03-20 07:48:20 -04:00
Piotr Dziwinski 720705bd6b Some colobot-lint fixes 2016-03-19 12:33:54 +13:00
Piotr Dziwinski 8baccb08a7 Optimize use of textures in text rendering, closes #215 2016-03-19 12:00:56 +13:00
Piotr Dziwinski 4b770adf46 API for updating texture data 2016-03-19 12:00:50 +13:00
Piotr Dziwinski 15c9cbd228 Debug mode for displaying crash spheres, closes #400 2016-03-19 11:54:58 +13:00
krzys-h effd349449 Fixed cutscene camera animation, closes #731 2016-03-15 21:09:21 +01:00
krzys-h 6e89d097e8 Cleaned up (now unnecessary) .c_str() converstions to CList::SetItemName 2016-03-15 20:47:06 +01:00
krzys-h bce99308c6 Fixed compilation error 2016-03-15 20:42:06 +01:00
krzys-h fef8a8e355 Fixes to variable list in CBot debugger
* fixed stack overflow with circular references (closes #434)
* fixed displaying boolean variables
* fixed buffer overflows with entries longer than 100 characters
* removed hard-limit to 100 entries with at most 100 characters in CList (this also allows you to have more than 100 programs in a robot, up to 999)
2016-03-15 20:39:31 +01:00
krzys-h 4479a196f9 Fix colobot-lint warnings 2016-03-15 17:39:00 +01:00
Tomasz Kapuściński 4c6f8239fa Renamed and moved GL33 shader files to separate directory 2016-03-14 21:44:25 +01:00
Tomasz Kapuściński cec942b4fd Renamed and moved GL21 shader files to separate directory 2016-03-14 21:24:27 +01:00
Tomasz Kapuściński 3eadb0c6f7 Added experimental MSAA for default framebuffer
To enable, add MSAA=4 to [Experimental] in colobot.ini and disable standard MSAA
2016-03-14 20:14:16 +01:00
Tomasz Kapuściński 2774fcd8a2 Small changes in the GL21 shader 2016-03-14 20:02:31 +01:00
Tomasz Kapuściński 169aa63822 Potential fix for #726 2016-03-14 19:23:21 +01:00
krzys-h 967aa22330 Allow assigning to array in initialization from function (#624, #728) 2016-03-13 20:27:10 +01:00
krzys-h 4d99a62d37 Fixed crash with array initialization syntax going out of range (#698) 2016-03-13 19:26:11 +01:00
krzys-h cbdda57288 Merge branch 'dev-right-click-camera' into dev 2016-03-13 14:52:17 +01:00
krzys-h 438bc477d1 Removed low CPU mode 2016-03-13 14:52:07 +01:00
Tomasz Kapuściński 8deeddffe0 Corrected OpenGL 2.1 engine's error spam and added experimental terrain shadowing 2016-03-10 10:50:54 +01:00
krzys-h 9ceaa0055d Updated quality shadows option 2016-03-07 18:49:24 +01:00
Tomasz Kapuściński e6a2fc9671 Rewritten shadow mapping implementation 2016-03-07 18:33:19 +01:00
MrSimbax 9679546988 Fix crash on pasting from clipboard
I don't know why it didn't happen for anyone else, but according to https://wiki.libsdl.org/SDL_GetClipboardText : "Use this function to get UTF-8 text from the clipboard, which must be freed with SDL_free().". MSVC detected some heap corruption because of free(text);
2016-03-06 23:21:04 +01:00
Tomasz Kapuściński 9effa308ce Small change in enabling/disabling shadow mapping 2016-03-06 20:25:50 +01:00
Tomasz Kapuściński d3ccdebd9f Added names to graphics devices 2016-03-06 19:32:37 +01:00
krzys-h f67d76fed4 Merge branch 'dev' into dev-right-click-camera 2016-03-05 21:09:00 +01:00
krzys-h 4e50f36214 Merge branch 'dev' into dev-right-click-camera 2016-03-02 20:00:57 +01:00
Tomasz Kapuściński 5fa3ed63b1 Compilation fix 2016-02-29 16:51:18 +01:00