9448f6712f
Merge pull request #1004 from melex750/dev-cbot
...
Escape codes for strings in CBOT
2017-10-22 18:20:50 +02:00
0a83508547
Merge pull request #985 from melex750/dev
...
Bug fix for CStudio
2017-10-22 18:20:35 +02:00
1539e94b09
Changed defaultFont to const map
2017-10-18 20:40:07 +02:00
76a8335501
Reworked GetFont method
2017-10-18 12:01:34 +02:00
2a0c2c38f0
Make shortcut blink in red
2017-10-17 02:35:33 +02:00
bf69b86233
Fixed shortcut not changing to normal state
2017-10-17 02:33:05 +02:00
dab223e6ce
Clamp energy level to standard values for OrgaShooters
...
Fix issue #1009
2017-10-16 20:29:59 +02:00
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
1e614d64d0
Removed unnecessary variable
2017-10-15 23:35:09 +02:00
52d9330114
Replaced multiple methods with one
2017-10-15 23:31:06 +02:00
dd9439aed2
Renamed font_file to font_config
2017-10-15 22:47:32 +02:00
f40756bc46
Fix turn(1) doesn't draining energy
...
Fix using @Melex750 example, thanks!
Fix issue #136
2017-10-11 18:50:57 +02:00
054d1c3e54
Changed in-engine fonts names
2017-10-11 17:10:04 +02:00
cf46c2457a
Moved file font.ini to /fonts/ directory
...
Separated SatCom font from Colobot font
2017-10-11 17:02:09 +02:00
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
ee35d35db3
Correct Small Mistake
2017-07-27 02:02:46 +02:00
959854ec59
'Make Thumper Great Again'
2017-07-26 23:05:53 +02:00
0de347d430
Fixed goto() behaviour on 32-bit binaries
...
Closes issue #844
2017-07-26 14:54:04 +02:00
a4482f1a7c
Decrease radius of squashing items.
2017-07-24 23:20:21 +02:00
e3c44e956f
Add syntax highlighting for escape codes
2017-07-22 14:30:05 -04:00
c03dfc1284
Add escape codes for string literals
2017-07-22 14:29:05 -04:00
b5e0f9966f
Make Recycler Recycle small Building Ruins.
2017-07-21 20:37:18 +02:00
bef6e9eceb
Make Thumper Squash transportable/small objects.
2017-07-21 20:36:31 +02:00
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
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
a29a4f93ac
Damage Alert Implementation (2th Stage)
2017-06-20 23:35:33 +02:00
75d9f8573b
Display warning if no quicksave slot is found
2017-06-11 23:29:50 +02:00
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
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
25c79df65f
Update data submodule
2017-06-03 21:53:48 +02:00
bb35585194
Fix object.factory() code type detection, closes #938
2017-06-03 21:43:10 +02:00
ac27bdac4a
Update data submodule
2017-06-03 21:32:28 +02:00
5d0e58fcb3
Update data submodule
2017-06-03 21:19:34 +02:00
8d9b36333b
Update data submodule
2017-06-03 21:15:55 +02:00
4faabf2185
Apply shadow mapping performance counter patch from #923
2017-06-03 21:11:18 +02:00
a95f736cbe
Fix delete(this.id), closes #925
2017-06-03 20:05:54 +02:00
bf94bd7130
Merge pull request #965 from melex750/dev
...
Improved search() and searchall()
2017-06-03 18:56:29 +02:00
199210c2ad
Merge branch 'master' into dev
...
See 92a8140b77
2017-05-29 21:13:17 +02:00
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
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
daacd0036f
INSTALL-MacOSX.md: Add missed xmlstarlet dependency ( #967 )
2017-05-29 20:50:13 +02:00
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
15b8cf7f78
Update object variable when concatenating strings
2017-05-25 02:09:44 -04:00
30210d0de7
Add searchall() and improve search() function
2017-05-25 02:01:42 -04:00
621911eb64
Release 0.1.10-alpha: Bump version
2017-05-24 14:34:19 +02:00
36cd5eeea9
Post-release 0.1.10-alpha
2017-05-24 14:34:19 +02:00
1dcc70c097
Release 0.1.10-alpha: Merge branch 'dev'
2017-05-24 14:34:19 +02:00
krzys_h
immibis