Commit Graph

2855 Commits (d84be03a830131aeaefa50d30dbaa7974d89096f)

Author SHA1 Message Date
tomangelo2 d84be03a83 Removed non-existing font from code
Forgot to check build on clean data directory
2018-07-23 14:10:27 +02:00
tomangelo2 df46bcfe2d Fix another linter warning 2018-07-23 14:03:59 +02:00
tomangelo2 14b6f7cafa Fixed some linter warnings in font_config files 2018-07-23 12:46:47 +02:00
tomangelo2 f01e2b7e01 Moved fonts maps from header file to source file 2017-11-07 19:29:51 +01:00
tomangelo2 0179e4c786 Cleaned unused values from CFontConfig 2017-10-28 22:24:11 +02:00
tomangelo2 ff97df74c6 Added support for italic and bold variants of studio and satcom fonts
They aren't currently used anywhere
2017-10-28 22:22:22 +02:00
tomangelo2 3801ab87a2 Changed m_font map to const fontType map 2017-10-23 19:08:28 +02:00
tomangelo2 1539e94b09 Changed defaultFont to const map 2017-10-18 20:40:07 +02:00
tomangelo2 76a8335501 Reworked GetFont method 2017-10-18 12:01:34 +02:00
tomangelo2 94cacdae96 Removed singletone from FontConfig
Also renamed class so it now matches better with class file name
2017-10-15 23:46:15 +02:00
tomangelo2 1e614d64d0 Removed unnecessary variable 2017-10-15 23:35:09 +02:00
tomangelo2 52d9330114 Replaced multiple methods with one 2017-10-15 23:31:06 +02:00
tomangelo2 dd9439aed2 Renamed font_file to font_config 2017-10-15 22:47:32 +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
tomangelo2 0de347d430 Fixed goto() behaviour on 32-bit binaries
Closes issue #844
2017-07-26 14:54:04 +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
krzys-h d8b0bd4df8 Make TargetBots explode when they run into something 2017-05-23 22:02:00 +02:00
krzys-h 149d1f8156 Fix aliens not appearing on the minimap, closes #901 2017-05-23 20:51:37 +02:00