immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,207 Commits
19 Branches
15 Tags
59 MiB
Commit Graph

3207 Commits (3da26a38ed4711f99f536415b116ccde676df081)

Author SHA1 Message Date
tomangelo2 dd9439aed2 Renamed font_file to font_config 2017-10-15 22:47:32 +02:00
tomangelo2 f40756bc46 Fix turn(1) doesn't draining energy 
Fix using @Melex750 example, thanks!
Fix issue #136
 2017-10-11 18:50:57 +02:00
tomangelo2 054d1c3e54 Changed in-engine fonts names 2017-10-11 17:10:04 +02:00
tomangelo2 cf46c2457a Moved file font.ini to /fonts/ directory 
Separated SatCom font from Colobot font
 2017-10-11 17:02:09 +02:00
tomangelo2 250c934b9e Added fonts configurability by a separate file 2017-10-09 00:36:31 +02:00
immibis 8b0ccf6667 Fix horizontal scrolling of background images. 2017-08-05 20:08:00 +12:00
immibis 2e8798b33d Make planets stay in one place in the sky - at least in the X direction. 2017-08-05 20:08:00 +12:00
immibis 2751db3245 Add horizontal FoV to CEngine 2017-08-05 19:45:08 +12:00
DavivaD ee35d35db3 Correct Small Mistake 2017-07-27 02:02:46 +02:00
DavivaD 959854ec59 'Make Thumper Great Again' 2017-07-26 23:05:53 +02:00
tomangelo2 0de347d430 Fixed goto() behaviour on 32-bit binaries 
Closes issue #844
 2017-07-26 14:54:04 +02:00
DavivaD a4482f1a7c Decrease radius of squashing items. 2017-07-24 23:20:21 +02:00
melex750 e3c44e956f Add syntax highlighting for escape codes 2017-07-22 14:30:05 -04:00
melex750 c03dfc1284 Add escape codes for string literals 2017-07-22 14:29:05 -04:00
DavivaD b5e0f9966f Make Recycler Recycle small Building Ruins. 2017-07-21 20:37:18 +02:00
DavivaD bef6e9eceb Make Thumper Squash transportable/small objects. 2017-07-21 20:36:31 +02:00
melex750 86870167a6 Fix moving and resizing open/save dialog 
* Fixed buffer overflow when resizing
* Stop hard drive thrashing when moving/resizing
 2017-06-26 14:19:53 -04:00
melex750 2d2990ff91 Fix moving and resizing editor/debugger window 
* Stop hard drive thrashing when moving/resizing
* Also fixed #691.
 2017-06-26 14:11:47 -04:00
DavivaD a29a4f93ac Damage Alert Implementation (2th Stage) 2017-06-20 23:35:33 +02:00
tomangelo2 75d9f8573b Display warning if no quicksave slot is found 2017-06-11 23:29:50 +02:00
tomangelo2 d63ed865f4 Added QuickSave/QuickLoad feature #929 
Also rearranged a bit speed control buttons to make some space for it
F5 - QuickSave
F6 - lower speed (current/2)
F7 - reset speed
F8 - higher speed (current*2)
F9 - QuickLoad
 2017-06-11 17:50:21 +02:00
krzys-h d860a08d21 Merge long first frame rendering fix from #898 
Also did some changes to make sure the "F1 to open SatCom" appears immediately (not after 0.1s),
and that mission timer won't start ticking in the first simulation frame (mainly for code battle initial pause)
 2017-06-04 13:10:50 +02:00
krzys-h 25c79df65f Update data submodule 2017-06-03 21:53:48 +02:00
krzys-h bb35585194 Fix object.factory() code type detection, closes #938 2017-06-03 21:43:10 +02:00
krzys-h ac27bdac4a Update data submodule 2017-06-03 21:32:28 +02:00
krzys-h 5d0e58fcb3 Update data submodule 2017-06-03 21:19:34 +02:00
krzys-h 8d9b36333b Update data submodule 2017-06-03 21:15:55 +02:00
krzys-h 4faabf2185 Apply shadow mapping performance counter patch from #923 2017-06-03 21:11:18 +02:00
krzys-h a95f736cbe Fix delete(this.id), closes #925 2017-06-03 20:05:54 +02:00
krzys_h bf94bd7130 Merge pull request #965 from melex750/dev 
Improved search() and searchall()
 2017-06-03 18:56:29 +02:00
krzys-h 199210c2ad Merge branch 'master' into dev 
See 92a8140b77
 2017-05-29 21:13:17 +02:00
krzys-h 92a8140b77 Jenkinsfile: prevent PRs to master 
I just merged a PR to master by mistake. Whoops! Let's not let that happen again.
 2017-05-29 21:09:50 +02:00
krzys-h 8058a89cde Merge branch 'master' into dev 
I messed up and merged #967 into master by mistake, but since it's only a change to README I won't bother reverting it
 2017-05-29 20:53:46 +02:00
Andrey daacd0036f INSTALL-MacOSX.md: Add missed xmlstarlet dependency (#967) 2017-05-29 20:50:13 +02:00
Abigail f4614658cf Fix -Wundefined-var-template warning (#963) 
This avoids specializing CSingleton<T>::m_instance for each type, and
instead just defines it once in the header. This is allowed by the
standard, multiple definitions are merged in the same way that inline
functions are.
 2017-05-29 20:46:11 +02:00
melex750 15b8cf7f78 Update object variable when concatenating strings 2017-05-25 02:09:44 -04:00
melex750 30210d0de7 Add searchall() and improve search() function 2017-05-25 02:01:42 -04:00
krzys-h 621911eb64 Release 0.1.10-alpha: Bump version 2017-05-24 14:34:19 +02:00
krzys-h 36cd5eeea9 Post-release 0.1.10-alpha 2017-05-24 14:34:19 +02:00
krzys-h 1dcc70c097 Release 0.1.10-alpha: Merge branch 'dev' 2017-05-24 14:34:19 +02:00
krzys-h 8269f79173 Update data submodule 2017-05-24 14:33:34 +02:00
krzys-h 02aa281d30 Remove unnecessary m_instance declarations 
They don't do anything at all in gcc and clang, but cause compile errors in MSVC
see #955
 2017-05-24 14:00:34 +02:00
krzys-h 28081bfd3e Fix clang builds 
see #955
 2017-05-24 14:00:34 +02:00
RaptorParkowsky 6c8ec46725 Update data submodule 2017-05-24 13:43:51 +02:00
krzys-h 1f477bbc86 Fix error in edit.cpp in 08d87fa975 2017-05-24 12:46:30 +02:00
krzys-h 7216d8d12e Fix crash after exiting a code battle 2017-05-24 12:42:37 +02:00
krzys-h 08d87fa975 Make initial scoreboard values editable 2017-05-24 12:39:05 +02:00
krzys-h f60108f367 Prevent enforcement of ObligatoryToken for level controller scripts 2017-05-24 10:50:43 +02:00
krzys-h 935b789d02 Fix alien animations after 5d4dfd8cb5 2017-05-24 10:45:31 +02:00
krzys-h 5d4dfd8cb5 Fix scoreboard points sometimes being added multiple times 2017-05-23 22:25:40 +02:00