Commit Graph

2752 Commits (f33ffaf18b57f98e2bbc83ad0452e036b4929041)

Author SHA1 Message Date
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
krzys-h 261b26c8e9 Added Jenkinsfile 2016-05-27 18:30:56 +02:00
krzys-h 620620fa61 Reenabled working tests after fc7e621471 2016-05-27 11:45:02 +02:00
krzys_h fc7e621471 Merge pull request #781 from melex750/dev
Fix "this" bug - #256 & #436
2016-05-27 11:37:03 +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
krzys-h 7c551dc39d Added unit tests for #768 2016-04-19 21:09:41 +02:00
krzys_h 54a34a9b22 Merge pull request #768 from melex750/dev
Fix function and method overloading
2016-04-19 21:07:56 +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 e75ed79fb5 Updated data submodule 2016-04-09 18:47:26 +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 efc5431da2 Enabled ArraysInClasses test after 1941020993 2016-04-07 21:28:16 +02: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 09a586936b Updated data submodule 2016-04-03 22:23:12 +02:00
krzys-h 059a546689 Reenabled unit tests that started working after 14721001e5 2016-04-03 21:09:41 +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