krzys-h
9e7cc0bab5
Renamed original shadows to simple shadows
2015-07-20 18:51:01 +02:00
krzys-h
f03734d17f
Added shadow mapping to settings screen
2015-07-20 18:42:09 +02:00
krzys-h
fce1539888
Made settings unavailable during in simulation setup visible but not editable
2015-07-20 17:19:49 +02:00
krzys-h
572b8ea566
Fixed a crash on exiting from win scene to level list
2015-07-20 17:06:28 +02:00
krzys-h
e2ebcb769e
Added MSAA to settings screen
2015-07-20 16:29:09 +02:00
krzys-h
90756f8b34
Added FilterMode, MipmapLevel and Anisotropy to settings screen
2015-07-20 13:56:45 +02:00
krzys-h
a879e496f5
Removed unused texture quality setting
2015-07-20 12:21:16 +02:00
krzys-h
283676fea1
Fixed CEditValue crash
...
It happened after pressing slider buttons
2015-07-20 12:12:01 +02:00
krzys-h
1c947f9a80
Renamed some phases to more meaningful names
2015-07-19 23:11:41 +02:00
krzys-h
a2f1aa195b
Combined all level list phases into one, removed PHASE_TERM
2015-07-19 23:07:57 +02:00
krzys-h
347654db15
Refactored CBot class "file" to PHYSFS
2015-07-19 22:34:41 +02:00
krzys-h
0554a77813
Refactor reading "object" class in CBot
2015-07-19 21:53:08 +02:00
krzys-h
8c87eedd28
Fixed huge lag on closing settings
...
Introduced in 02c24fbf27
, this was supposed to make it more resistant to crashes but turned out to generate huge lag on closing settings
Instead, I added manual .Save() after every value change
2015-07-19 21:35:55 +02:00
krzys-h
d3c3f47b19
Fixed particle rendering ( #518 )
...
Introduced in 5a1c6d19ff
- I'm so dumb D:
I kinda recently noticed some of the SpaceShip particles were missing...
2015-07-19 21:17:58 +02:00
krzys-h
8ce3a783bb
Fixed EndMissionTake processing order with immediat=1
...
immediat=1 is supposed to work only if this condition AND all conditions above are true
2015-07-19 19:20:55 +02:00
Piotr Dziwinski
73536290b2
Fix for incorrect compile flags in colobot-lint
2015-07-19 18:11:12 +02:00
Piotr Dziwinski
963fa15a1c
Fix for #516
2015-07-19 16:43:03 +02:00
krzys-h
264f5dc278
Removed obsolete save directory configuration
...
This was used in one of the CeeBots probably for setting up networked installations in schools. This is now obsolete since now those are only paths relative to main PHYSFS save directory.
2015-07-19 16:05:09 +02:00
krzys-h
ffb387f8af
Changed scene loading to use CPlayerProfile for paths
2015-07-19 16:05:09 +02:00
krzys-h
7dc3e90e41
CPlayerProgress -> CPlayerProfile
2015-07-19 16:05:09 +02:00
krzys-h
02c24fbf27
CProfile -> CConfigFile
2015-07-19 16:05:09 +02:00
Tomasz Kapuściński
644f5b4d7f
Corrected some problems with dynamic shadows
2015-07-19 00:07:59 +02:00
krzys-h
e2691d943c
Fixed #346
...
Thanks @erihel
2015-07-18 23:16:14 +02:00
krzys-h
3e1fc06d6c
CPlayerProgress
...
Extracted most operations on user profile from CRobotMain and CMainDialog to a dedicated class
2015-07-18 23:14:20 +02:00
krzys-h
86f473ac16
Finished support for up to 999 chapters and levels
2015-07-18 19:48:25 +02:00
krzys-h
ea9361fbb4
LevelCategory enum
2015-07-18 19:45:40 +02:00
Tomasz Kapuściński
59a68892c6
Game displays an error message and uses default graphics device when unknown device is selected with -graphics switch
2015-07-18 12:03:33 +02:00
Tomasz Kapuściński
1d69021e94
Potential fix to #511
2015-07-18 02:02:38 +02:00
Piotr Dziwinski
25eaf8f72f
Add MakeUniqueArray for array types
2015-07-17 20:57:12 +02:00
Piotr Dziwinski
b3b6435039
Use MakeUnique with level parser classes
2015-07-17 20:38:21 +02:00
krzys-h
35043e04de
Addressed commit comments on a872ea128b
2015-07-17 20:29:53 +02:00
Piotr Dziwinski
a872ea128b
Add MakeUnique template to avoid use of naked new
2015-07-17 20:06:59 +02:00
krzys-h
2c0baeec35
Fixed potential error in locale logging
...
setlocale() result is valid only until next call to setlocale()
2015-07-17 19:55:02 +02:00
krzys-h
dffeff929e
Removed manual memory management in CBrain in program list
2015-07-17 19:53:17 +02:00
krzys-h
5e44092144
Fixed brain.cpp compilation under MSVC
2015-07-17 17:01:31 +02:00
krzys-h
2ef68cf12d
Fixed Polish translations for Scribbler
2015-07-17 11:59:44 +02:00
krzys-h
14f784646b
Refactored Scribbler recorder to std::string
2015-07-17 11:52:11 +02:00
krzys-h
82247e75fc
Fixed a crash
...
This replaced more than I throught
2015-07-16 22:27:25 +02:00
krzys-h
9e19d8433c
Removed old CBot-related files
2015-07-16 22:17:54 +02:00
krzys-h
aa0946f4ba
Fixed line endings in pathman.cpp
2015-07-16 22:15:22 +02:00
krzys-h
999c35e46b
Fixed Alt+Enter starting not runnable programs, fixes #510
2015-07-16 22:12:44 +02:00
krzys-h
c8f6e8124e
Replaced CLogger::GetInstancePointer() calls with GetLogger()
2015-07-16 22:12:44 +02:00
krzys-h
c115d72d71
More TraceColor refactoring
2015-07-16 22:09:50 +02:00
krzys-h
2b9811d225
Movie lock refactoring
2015-07-16 22:09:50 +02:00
Piotr Dziwinski
6dcf4dffa6
Refactor CSNDFile -> CSNDFileWrapper
...
This seems more consistent
2015-07-16 21:47:48 +02:00
Piotr Dziwinski
8ca77f27a1
Extracted CSDLFileHandler from CResourceManager
...
This also possibly fixes some rare error cases (e.g. #439 )
2015-07-16 21:13:38 +02:00
krzys-h
8a72f0a849
Addressed commit comments on a0e0ee3631
2015-07-16 20:09:06 +02:00
krzys-h
a0e0ee3631
Separate shortcut bars for teams
2015-07-16 13:46:40 +02:00
Piotr Dziwinski
f581d87474
Fix double increment bug in OpenAL channel allocation
2015-07-16 07:16:55 +02:00
Piotr Dziwinski
c8498548cc
Remove manual memory management in oalsound
...
Plugging a few more memory leaks detected by valgrind
2015-07-15 22:43:30 +02:00
Piotr Dziwinski
83f3cfa6e0
Fix some memory problems reported by valgrind
...
Also remove some manual memory management
2015-07-15 20:23:21 +02:00
Piotr Dziwinski
31bc740f4b
Fix focusing issues with controls and cheat console
2015-07-15 19:11:48 +02:00
krzys-h
61ea372e51
Fixed enemy ruins not becoming neutral on destruction
2015-07-15 18:49:15 +02:00
krzys-h
80963f1a2b
Added global magnifyDamage setting
2015-07-15 18:15:26 +02:00
Piotr Dziwinski
94ea1ff106
DeselList refactoring
...
Make CRobotMain hold selected object history instead of
every object holding some part of it
2015-07-15 18:09:23 +02:00
Piotr Dziwinski
9af1422589
Fix setting wrong explosion type
2015-07-14 22:14:14 +02:00
krzys-h
730319ba20
Fixed Robby (OBJECT_TOTO) animations
2015-07-14 21:40:07 +02:00
Piotr Dziwinski
d5da68d59a
Refactor old Get/SetAngle/Zoom -> Get/SetPartRotation/Scale
2015-07-14 21:35:43 +02:00
krzys-h
e1223ff881
Fixed shortcuts behavior
...
It was kinda broken after implementing code battles
Also, fixed overlap of shortcuts bar with cheat console
2015-07-14 21:32:08 +02:00
krzys-h
a1a96c62ab
Fixed system mouse setting
2015-07-14 21:03:40 +02:00
Piotr Dziwinski
1183ed1980
Refactor old Get/SetPosition -> Get/SetPartPosition
2015-07-14 19:40:39 +02:00
Piotr Dziwinski
7c229b4e83
Fix reading new model format with CRLF line endings
2015-07-14 19:40:07 +02:00
Piotr Dziwinski
3f41555a61
Better exception handling in CRobotMain
2015-07-14 18:46:22 +02:00
Piotr Dziwinski
0d1b97510d
Add exception handling when creating new objects on level loading
2015-07-14 18:28:42 +02:00
krzys-h
62fddd6d4f
Made pendown() trace opaque
2015-07-14 17:38:29 +02:00
krzys-h
5a1c6d19ff
Removed unused particle types
2015-07-14 14:16:19 +02:00
krzys-h
4506a4b8bd
TraceColor enum
2015-07-14 13:53:50 +02:00
Piotr Dziwinski
fdc0081bb8
Fix checking boolean like int
2015-07-13 23:04:11 +02:00
Piotr Dziwinski
62fdfc9f92
Refactor ResetCap -> AnimateOnReset
2015-07-13 22:47:11 +02:00
Piotr Dziwinski
20dbb8320b
Remove unused reset code
2015-07-13 22:46:51 +02:00
krzys-h
4d7de592b4
Merged destructor parsing from tr00per/dev
...
Merge branch 'dev' of https://github.com/tr00per/colobot into dev
2015-07-13 19:24:43 +02:00
krzys-h
78f4749134
Disallow controlling enemy objects from CBot
2015-07-13 18:53:56 +02:00
krzys-h
0e66104829
Hacked CBot engine to get pointers to CObject* in calls to class members
2015-07-13 18:40:13 +02:00
krzys-h
79c131394d
Separate DoneResearch for teams
2015-07-13 18:13:28 +02:00
krzys-h
3479c51bb9
Refactored EnableBuild, EnableResearch and DoneResearch
...
* Moved from global variables to CRobotMain members
* Added functions for accessing the values
* Cleaned up some code related to building objects, BotFactory, ResearchCenter and AutoLab
2015-07-13 17:38:19 +02:00
krzys-h
38a0849e10
Added system mouse option
...
This reverts commit e21853d632
.
2015-07-13 12:11:11 +02:00
krzys-h
6e404f5aa2
Better mouse scaling on widescreen resolutions
2015-07-13 11:58:52 +02:00
Piotr Dziwinski
9023aac960
Fix for #504
2015-07-12 20:49:00 +02:00
Piotr Dziwinski
6c7a79de5a
Fix for #503
2015-07-12 20:44:46 +02:00
Piotr Dziwinski
e72936c240
Clean up more functions from COldObjectInterface
2015-07-12 20:05:12 +02:00
Piotr Dziwinski
394f911d7b
Remove unnecessary #include "object/object.h"
2015-07-12 14:23:18 +02:00
Piotr Dziwinski
3ed8980c46
Make CTask classes use COldObject
2015-07-12 14:22:12 +02:00
Piotr Dziwinski
45302a3f4e
Make CPhysics and CBrain use COldObject
2015-07-12 14:19:09 +02:00
Piotr Dziwinski
2c474d7c06
Make CMotion classes use COldObject
2015-07-12 14:01:14 +02:00
Piotr Dziwinski
16883fcdc4
Make CAuto classes use COldObject
2015-07-12 14:01:07 +02:00
Piotr Dziwinski
fdb594b9f7
Fix crash when replacing power cell
2015-07-12 13:19:41 +02:00
Piotr Dziwinski
a1e5812740
Make object deletion safe while iterating through their list
...
Perhaps a bit of a hack but there is no other way to implement this now
2015-07-12 13:16:07 +02:00
Piotr Dziwinski
4dc40a8853
Fix missing curly braces
2015-07-12 12:38:25 +02:00
Piotr Dziwinski
37b0d5796d
Fix PNGSaveSurface not closing file sometimes
2015-07-12 12:33:30 +02:00
Piotr Dziwinski
9a7c1961a4
GetPostion(), GetRotation() and GetScale() in CObject interface
...
Also replace old calls like GetPosition(0) to GetPosition()
2015-07-12 11:05:50 +02:00
Piotr Dziwinski
57e3e16517
Added check to avoid possible object deletion bug
...
Objects must not be deleted while iterating through their list
2015-07-12 10:34:00 +02:00
Piotr Dziwinski
fcbbbcb83c
Fix some more CObject interface issues
...
* fix mission 1.3
* fix saving/loading missions
* fix compile warnings
2015-07-12 00:03:57 +02:00
krzys-h
03717e11d4
Added aspect ratio in resolution list ( #501 )
2015-07-11 23:53:25 +02:00
Piotr Dziwinski
e8582d214c
CStaticObject subclass using new model framework
...
* added reading/writing working version of new model format V3
* added CStaticObject with minial interface intended for
non-interactive static objects like trees
* converted first model, tree0, to new format
2015-07-11 19:52:38 +02:00
krzys-h
639de56e6c
Fixed file.readln() help file
2015-07-11 18:36:36 +02:00
Piotr Dziwinski
6dcef71802
GlobalSphere -> CameraCollisionSphere refactoring
2015-07-11 13:52:04 +02:00
Piotr Dziwinski
f4b2f3468d
CPoweredObject interface
2015-07-11 13:38:27 +02:00
krzys-h
36d08e852c
Better splashscreen scaling on widescreen resolutions
2015-07-11 12:57:18 +02:00
Piotr Dziwinski
0a85fae9b5
Fix crash in appearance menu
2015-07-10 23:58:53 +02:00
krzys-h
9537048964
Cleaned up GetHelpFilename
2015-07-10 23:30:11 +02:00
Piotr Dziwinski
4c10730f87
CCarrierObject interface
2015-07-10 23:16:55 +02:00
Piotr Dziwinski
8d5ddd848d
CJostleableObject interface
2015-07-10 23:04:30 +02:00
Piotr Dziwinski
5d30de0d09
CProgrammableObject interface
2015-07-10 20:46:33 +02:00
Tomasz Kapuściński
17ae31e639
Added 'speed ###' cheat for changing simulation speed to arbitrary value
2015-07-10 20:45:50 +02:00
krzys-h
24db675d3f
Added x6 speed option
2015-07-10 20:17:00 +02:00
Piotr Dziwinski
0dfbb00491
Remove unused variable
2015-07-10 19:55:18 +02:00
Piotr Dziwinski
93479af188
CTransportableObject interface
2015-07-10 19:51:49 +02:00
krzys-h
52f809b8bb
Removed cmdline limit
2015-07-10 13:40:29 +02:00
Piotr Dziwinski
b84130e067
Fix not updating track texture mapping
2015-07-10 12:22:00 +02:00
krzys-h
ad08d50bea
Renamed some CAuto and CMotion classes
2015-07-10 12:18:21 +02:00
krzys-h
26619e3f88
Removed old level parser functions (cmdtoken.cpp)
2015-07-10 11:51:59 +02:00
krzys-h
e6c6b77be2
Removed old Teen objects
...
The models for them were removed a looong time ago, but the code was left for no reason
2015-07-10 11:37:32 +02:00
krzys-h
c63efeca46
Fixed EndMissionTake conditions (again)
2015-07-10 10:45:30 +02:00
krzys-h
d3c3a51ede
Don't open joystick if it's not enabled in ChangeJoystick
2015-07-10 10:28:04 +02:00
krzys-h
20a367783b
Added joystick settings in colobot.ini
2015-07-10 10:25:31 +02:00
krzys-h
7e41e9fe23
Refactored keybindings storage
2015-07-10 10:11:40 +02:00
krzys-h
3d5bc5c563
Fixed unused variable warnings
2015-07-10 10:11:40 +02:00
Piotr Dziwinski
b0ac2f8326
Refactor CObject interface related to crash spheres
2015-07-10 09:38:53 +02:00
krzys-h
5a68558f4c
Implemented basic joystick selection
...
You can select joystick in the config file, there is still no GUI. By default, the first available joystick is used.
issue #171
2015-07-10 00:05:43 +02:00
krzys-h
bd4a661a06
Made autosave timer independent from simulation speed, closes #485
2015-07-09 23:23:38 +02:00
krzys-h
b7c3a8a30b
Don't hardcode script4Runnable=in exercises, closes #493
2015-07-09 23:09:08 +02:00
krzys-h
978fc8f1fb
Remove program limit in scene files, closes #494
2015-07-09 23:01:18 +02:00
Piotr Dziwinski
c585922a45
Use boost::lexical_cast instead of std::to_string
2015-07-09 22:53:58 +02:00
Piotr Dziwinski
93e950584a
Refactor model-related code
...
* refactored model loading code based on code from dev-models
* support new model format V2 (without LOD levels)
* removed LOD levels support in CEngine and from model files
* preparations for new model format V3:
- support for multiple meshes in one model file
- support for saving crash spheres and shadow spots
- removed all direct dependencies on CEngine enum values
- quantized model rendering states to new flags and enums
2015-07-09 21:37:04 +02:00
Piotr Dziwinski
9b232ee3f5
Sound enum refactoring
...
* rename Sound -> SoundType
* add parsing string to SoundType
2015-07-09 21:32:25 +02:00
krzys-h
c84ce92a86
Fixed F12 debug screen background
2015-07-09 18:50:11 +02:00
krzys-h
dae7cdf229
Fixed build() particles
2015-07-09 18:45:52 +02:00
krzys-h
7c20bb4bf6
Fixed counting of nautral objects in EndMissionTake
2015-07-09 18:28:09 +02:00
krzys-h
ce760aa9a3
Added All back to ObjectType parser
...
I throught this was unused, but it's actually used in NewScript
2015-07-08 20:21:30 +02:00
krzys-h
1361473358
Renamed Mission -> Level, MissionController -> LevelController
...
As suggested by @CoLoRaptor
2015-07-08 20:20:46 +02:00
krzys-h
c18b5daf57
Don't use binary literals in radar filters
...
@tomaszkax86 noticed that this syntax is valid only in C++14 and Visual Studio 2013 doesn't support that
2015-07-08 19:05:11 +02:00
krzys-h
b75ab7d8f6
Fixed radar() detecting neutral objects as enemies
2015-07-07 22:27:44 +02:00
Piotr Dziwinski
b0b313f707
Fix for issue #492
2015-07-07 21:36:37 +02:00
krzys-h
a6ccd7f270
Added TeamName
2015-07-07 21:25:44 +02:00
krzys-h
5da4adad41
Added Any constant in CBot
2015-07-07 19:01:18 +02:00
krzys-h
79c5fabfe6
Support for team filters in radar()
2015-07-07 18:54:36 +02:00
krzys-h
9a873c9bea
Added object.team in CBot
2015-07-07 18:11:28 +02:00
krzys-h
f94519b240
Don't finish mission if there are no win conditions
...
This replaces the old EndMissionNever hack
2015-07-07 18:04:17 +02:00
krzys-h
a3726799c4
Added support for teams in EndMissionTake
...
Also fixed a bug in previous commit that caused lost= conditions to be skipped if previous min= max= condition was not met
2015-07-07 17:48:49 +02:00
krzys-h
a32efc09a2
Refactored EndMissionTake and AudioChange
2015-07-07 16:17:19 +02:00
dreamer.dead
958ef43c1e
Address review remarks, fix names and errors in code.
2015-07-06 22:00:33 +03:00
dreamer.dead
b3c2d2c450
Set CBotVar::m_binit type to specific enum instead of plain int.
2015-07-05 23:39:55 +03:00
Piotr Dziwinski
f1684f85be
Introduce new CObject base class and mixin class framework
2015-07-02 23:50:50 +02:00
Piotr Dziwinski
80d93c0fea
Fix comment changed by mistake
2015-06-30 18:47:35 +02:00
Piotr Dziwinski
f6bc8f94bf
Rename fret/truck to cargo/transporter
2015-06-29 23:11:02 +02:00
Piotr Dziwinski
b00d62b9bb
Further cleaning of CObject interface
...
* remove unused functions/members
* delegate some functions to other objects
* change some names to be more meaningful
2015-06-29 22:46:13 +02:00
Tomasz Kapuściński
c7ccb29d6a
Removed spoiler from tooltip in options menu ( fixes #489 )
2015-06-28 23:07:42 +02:00
Tomasz Kapuściński
ac291f5bea
Fix for issue #488
2015-06-28 21:05:12 +02:00
Piotr Dziwinski
f871ba4729
Create CExchangePost subclass
2015-06-27 23:22:55 +02:00
Tomasz Kapuściński
1ccb807091
Fix for issues #486 and #487
2015-06-27 18:06:49 +02:00
krzys-h
78e09c757d
Basic support for teams and code battle missions
2015-06-26 22:07:55 +02:00
krzys-h
2a672482a5
Vault now locks only objects created during level loading ( fixed #164 )
2015-06-26 20:19:16 +02:00
Tomasz Kapuściński
195667ab2c
Potential fix for rendering problems in OpenGL 2.1 engine under Linux
2015-06-26 19:55:46 +02:00
krzys-h
4fc8364136
Fixed Destroyer object destruction ( fixes #308 )
2015-06-26 19:20:16 +02:00
krzys-h
2509f99776
Fixed program arguments not being parsed on restart ( #483 )
2015-06-26 18:51:39 +02:00
Tomasz Kapuściński
efd0b2b28f
Corrected energy cell's angle when created with robot
2015-06-26 18:07:54 +02:00
Tomasz Kapuściński
ba3c049077
Corrected problem with loading level background images
2015-06-26 14:32:44 +02:00
Piotr Dziwinski
88ec9aaae3
Drop GCC 4.6 support
2015-06-26 00:24:32 +02:00
Piotr Dziwinski
7e21d3bd79
Get rid of some more manual memory management
2015-06-26 00:24:05 +02:00
Piotr Dziwinski
67be6fca2a
CObject interface cleanup
...
* remove unused functions and members
* make protected functions used only locally or in factory
* rename some functions to be more meaningful
* refactor some enums to enum classes
2015-06-25 20:43:50 +02:00
Piotr Dziwinski
7814c0c7bd
Remove unused field "material" from CObject class in CBot
2015-06-25 18:07:48 +02:00
Tomasz Kapuściński
37e2f24fbc
Corrected small rendering problem
2015-06-25 11:47:42 +02:00
Tomasz Kapuściński
3cc2857372
Small corrections in MSAA implementation
2015-06-22 23:42:01 +02:00
Tomasz Kapuściński
90bf51ba54
Possible fix for #458
2015-06-22 22:53:55 +02:00
Piotr Dziwinski
8806d1708d
Proper CAuto, CBrain, CMotion, CPhysics, CPyro lifetime management
...
* change manual memory manament to std::unique_ptr
* create CPyroManager
* finally get rid of CInstanceManager
2015-06-22 21:58:58 +02:00
Piotr Dziwinski
7ae308cc75
Fix saving addresses instead of data in user profile
2015-06-22 21:25:00 +02:00
Tomasz Kapuściński
f2318803e5
Added Multisample anti-aliasing (MSAA)
2015-06-22 00:56:47 +02:00
Piotr Dziwinski
02ffdcfe23
Refactor level parser code
...
* replace manual memory management with std::unique_ptr
* remove unnecessary dynamic allocations
* make coding style consistent
2015-06-21 20:59:23 +02:00
Piotr Dziwinski
5f1d3c21d4
Fix some more warnings reported by Clang
2015-06-21 19:46:01 +02:00
Piotr Dziwinski
2d623b4427
Fix introduced compilation warnings
2015-06-21 19:38:07 +02:00
Tomasz Kapuściński
dabfdf1ea0
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2015-06-21 18:51:24 +02:00
Tomasz Kapuściński
7d57ec634e
Refactored framebuffer implementations
2015-06-21 18:48:31 +02:00
Piotr Dziwinski
2513052260
Fix setting position of power cells
2015-06-21 16:29:46 +02:00
Piotr Dziwinski
304542afe2
Some syntax sugar for iterating through all objects
2015-06-21 16:22:09 +02:00
Piotr Dziwinski
0c9a9bce98
Proper CObject lifetime management
...
CObjectManager is now the only class responsible for storing CObjects
2015-06-21 15:13:55 +02:00
Piotr Dziwinski
fed67e6640
Rename objman.h/cpp -> object_manger.h/cpp
2015-06-20 20:02:40 +02:00
Tomasz Kapuściński
94851c2694
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2015-06-20 20:02:11 +02:00
Tomasz Kapuściński
ec3069eea7
Defaulted shadow color value to 0.5
2015-06-20 20:02:06 +02:00
Piotr Dziwinski
f9b09d08f0
Create CObjectFactory
...
* move functions creating objects to new class CObjectFactory
* replace calls to CObject::Create*() with CObjectManager::Create()
* move creation/deletion of some objects to better places
* make CModelManager non-singleton
* clean up some code in changed functions
2015-06-20 19:37:25 +02:00
Tomasz Kapuściński
74a31c9fb4
Corrected compilation errors on Linux builds
2015-06-16 19:30:35 +02:00
Tomasz Kapuściński
ff44637d49
Removed VBO override switch and some unnecessary code
2015-06-16 18:00:42 +02:00
Tomasz Kapuściński
26ec927b37
Corrected compilation errors and warning
2015-06-15 20:27:44 +02:00
Tomasz Kapuściński
012eb10e19
Added automatic graphics detection (-graphics auto)
2015-06-15 20:20:03 +02:00
Tomasz Kapuściński
a880210b3d
Added ShadowRange option
2015-06-15 18:41:31 +02:00
Tomasz Kapuściński
6434ff55dd
Ending splashscreen enhancement ( fixes #472 )
2015-06-05 20:20:06 +02:00
Tomasz Kapuściński
ae29ebead3
Defaulted shadow color to 0.5 in OpenGL 2.1 engine
2015-06-05 19:48:28 +02:00
Tomasz Kapuściński
66d865942c
Added OpenGL 2.1 shaders for per-pixel lighting
2015-06-02 16:55:03 +02:00
Tomasz Kapuściński
d477caed3e
Second attempt at correcting compilation error
2015-06-01 18:41:14 +02:00
Tomasz Kapuściński
7acca9feb8
Corrected compilation error and unsigned comparison warnings
2015-06-01 17:45:51 +02:00
Tomasz Kapuściński
d112971c3e
Corrected shadow mapping and added experimental self-shadowing
2015-06-01 17:22:49 +02:00
Tomasz Kapuściński
a0c56f54cb
Shader and buffer optimizations
2015-06-01 17:21:10 +02:00
Tomasz Kapuściński
d33ddae15a
Added warnings and information what shader files are not available
2015-05-29 12:39:14 +02:00
Tomasz Kapuściński
f69dfe3421
shield() rejects incorrect robots that try to invoke it (should fix #475 )
2015-05-28 14:03:05 +02:00
Tomasz Kapuściński
e1a0f5b1c7
Added OpenGL 2.1 engine
2015-05-27 22:12:02 +02:00
Tomasz Kapuściński
08bf066f78
Added shadow color setting
2015-05-27 21:58:32 +02:00
Tomasz Kapuściński
55b4e73a7a
Corrected a problem with strmid()
2015-05-22 20:34:35 +02:00
Tomasz Kapuściński
fa67e815b8
Implemented per-vertex lighting and set it as default in OpenGL 3.3 engine
2015-05-22 18:53:51 +02:00
Tomasz Kapuściński
8abdd4b740
Improved shadow mapping
2015-05-21 18:18:46 +02:00
Tomasz Kapuściński
f67c01e5e7
Added proper render to texture support
2015-05-21 18:03:17 +02:00
Tomasz Kapuściński
a045bf3830
Added shadow ambient support
2015-05-21 16:47:24 +02:00
Piotr Dziwinski
b1e8341475
Move OpenGL 3.3 shaders to main repository
2015-05-20 23:30:46 +02:00
Piotr Dziwinski
619ac3cf8d
Fixed glew linking problem on MXE
2015-05-19 23:03:32 +02:00
Piotr Dziwinski
35ce6c228a
Fix gcc warning
2015-05-19 23:03:32 +02:00
Tomasz Kapuściński
361a8c4ddd
Another fix to warning
2015-05-19 17:24:07 +02:00
Tomasz Kapuściński
3a1dffd8df
Fixing some warnings
2015-05-19 17:15:08 +02:00
Tomasz Kapuściński
df8223700b
Corrected compilation error
2015-05-19 16:26:41 +02:00
Tomasz Kapuściński
933609967a
Added OpenGL 3.3 graphics implementation
2015-05-19 14:29:31 +02:00
Tomasz Kapuściński
d210dcf70e
Implemented graceful degradation of shadow quality when not enough texture units are available
2015-05-15 10:12:35 +02:00
Tomasz Kapuściński
e747443312
Increased quality of dynamic shadows
2015-05-14 15:31:57 +02:00
Piotr Dziwinski
0ddfdebab3
Remove unused system utils functions
2015-05-13 20:52:19 +02:00
Piotr Dziwinski
ccaac2c544
Rewrite unit tests to use HippoMocks
2015-05-13 00:52:18 +02:00
Tomasz Kapuściński
03244ecdfd
Corrected assertion error when changing offscreen rendering
2015-05-12 20:20:57 +02:00
Tomasz Kapuściński
2665847c41
Added support for offscreen rendering and high resolution shadow maps
2015-05-12 13:09:31 +02:00
Tomasz Kapuściński
b033e35385
Transparent textures no longer cast shadows in transparent parts
2015-05-11 18:00:02 +02:00
Tomasz Kapuściński
0b2f00530b
Added experimental support for dynamic shadows (shadow mapping)
2015-05-11 15:21:17 +02:00
Tomasz Kapuściński
1e3c2cc2df
Increased the height of text area for displaying authors.txt (should fix #465 )
2015-05-09 20:36:32 +02:00
Tomasz Kapuściński
c945afafc8
Added bounds checking to CBotString type methods (should fix issue #429 )
2015-05-07 13:53:53 +02:00
Tomasz Kapuściński
619b3f2e45
Fixes recent mistake (- instead of +)
2015-05-07 13:05:20 +02:00
Tomasz Kapuściński
3164e7256e
Changed terrain UV mapping ( fixes #306 for OpenGL engine, will cause similar problem on Direct3D)
2015-05-07 12:58:05 +02:00
Tomasz Kapuściński
c28e1f6150
Added CBot functions for rounding: floor(), ceil(), round(), and trunc()
2015-05-06 23:29:55 +02:00
Tomasz Kapuściński
1c655aeda0
Corrected the problem with pendown() hanging the game ( fixes #203 )
2015-05-06 21:59:29 +02:00
Tomasz Kapuściński
1db9d8bdca
Changed CBot file handling, potentially solved problems with 64-bit executables
2015-05-06 20:39:09 +02:00
Tomasz Kapuściński
d3b052f19b
Implemented trilinear filtering, mipmap level setting and anisotropic filtering
2015-05-06 17:55:10 +02:00
Tomasz Kapuściński
05bf5be6f4
Added atan2() function to CBot
2015-05-06 13:02:44 +02:00
Piotr Dziwinski
6c87144ae8
Merge branch 'ManuelBlanc-dev-osx' into dev
2015-04-28 15:18:37 -07:00
Piotr Dziwinski
4c8127c6ec
Fix two bugs uncovered by MSVC
2015-04-27 20:04:01 +02:00
Piotr Dziwinski
bca9a019ae
Suppress some MSVC warnings
2015-04-27 20:02:22 +02:00
Piotr Dziwinski
d003247120
Provide usleep() in CSystemUtils interface
2015-04-27 20:02:22 +02:00
Piotr Dziwinski
dec12fb977
Use wingetopt library on MSVC
2015-04-27 18:17:03 +02:00
Piotr Dziwinski
544e513148
Minor MSVC compilation fixes
2015-04-27 18:17:03 +02:00
Piotr Dziwinski
fcd904faf7
Fix non-integer expressions in #if
2015-04-27 18:17:03 +02:00
Piotr Dziwinski
3dce58c0fa
Replace override and noexcept with macros
2015-04-27 18:07:42 +02:00
krzys-h
d23170aaf1
Fixed monospace CBot editor font ( closes #464 )
2015-04-23 21:01:04 +02:00
krzys-h
87ccb759e6
Allow Tech to use build(), closes #461
2015-04-18 11:40:42 +02:00
krzys-h
c481906242
Added nullptr checks in CPyro, should fix #462
2015-04-18 11:33:39 +02:00
krzys-h
df4cb110b5
Made example programs not directly runnable ( #450 )
2015-04-17 22:39:57 +02:00
krzys-h
45edb29de4
Fixed event management in settings, again
2015-04-17 22:02:10 +02:00
krzys-h
e21853d632
Removed old, unused mouse shadow option
2015-04-17 21:54:03 +02:00
krzys-h
c32e552368
Fixed event management in settings phases, fixes #452
2015-04-17 21:47:03 +02:00
krzys-h
be74b61ad3
Fixed Vault not unlocking vehicle ( #459 )
2015-04-17 21:28:30 +02:00
krzys-h
6d88dd5957
Allow autosave only in missions, free game and userlevels ( fixes #457 )
2015-04-17 21:11:07 +02:00
tomangelo2
802aaad1a4
Should fix issue #456
2015-04-17 21:02:26 +02:00
krzys-h
9bc7c47d77
Fixed saving readonly attribute ( #454 )
2015-04-07 13:27:11 +02:00
krzys-h
a4bf622053
Fixed starting programs from saved games ( #455 )
2015-04-07 13:18:34 +02:00
krzys-h
ed0850ddb6
Fixed buttons "eating" other characters in SatCom
2015-04-07 12:27:31 +02:00
krzys-h
efe04be1c2
Implemented button rendering in SatCom ( #232 )
...
Finally!
2015-04-07 12:06:43 +02:00
krzys-h
73a12ea7db
Changed default autosave interval from 15 to 5 minutes ( #451 )
2015-04-06 22:04:23 +02:00
krzys-h
fa13d2bb72
Fixed compilation on old versions of GCC
...
It's the first time I saw gcc complain about something being not implemented IN THE COMPILER ITSELF o.O
In file included from /home/travis/build/colobot/colobot/src/object/auto/autoegg.cpp:25:0:
/home/travis/build/colobot/colobot/src/object/brain.h:81:28: sorry, unimplemented: non-static data member initializers
/home/travis/build/colobot/colobot/src/object/brain.h:81:28: error: ISO C++ forbids in-class initialization of non-const static member ‘readOnly’
2015-04-06 19:22:26 +02:00
krzys-h
2f5d4e3b2f
Fixed cheat console in main menu
2015-04-06 17:23:18 +02:00
krzys-h
1dd3a4d57e
Fixed loading challenge solutions and made them read-only
2015-04-06 17:00:22 +02:00
krzys-h
66ea5fd92b
Fixed NewScript
2015-04-06 16:41:05 +02:00
krzys-h
1a8bb9c0fb
Marked programs from SatCom with a star
2015-04-06 16:21:19 +02:00
krzys-h
58016c6c69
Made programs from SatCom read-only; added program cloning
2015-04-06 16:07:49 +02:00
krzys-h
0ce72bdce0
ovf's OCD
...
> ovf: krzys_h: i'm sorry, your last commit triggered a random ocd fit. http://vpaste.net/S6u62
> ovf: (you don't need to apply this, i already feel better now)
2015-03-29 20:30:29 +02:00
krzys-h
6844b2170f
Fixed occasional crash in CRobotMain::DeleteAllObjects
2015-03-29 15:50:47 +02:00
krzys-h
1b18b145cc
Changed default of countTransported to true
...
This causes failure conditions to trigger in some exercises
#412
2015-03-29 15:38:50 +02:00
krzys-h
30f7075f4e
Fixed program selection shortcuts
2015-03-29 14:31:43 +02:00
krzys-h
a3ae7802a2
New scripts interface, removed script limit
...
This is a big change in game structure and requires more testing!
2015-03-29 14:21:02 +02:00
krzys-h
72196b252c
Made powermin and powermax work with cells that are not in bot's power slot
2015-03-28 12:21:56 +01:00
krzys-h
14068ce54b
Don't count transported items by default ( #412 )
2015-03-28 12:19:40 +01:00
krzys-h
fd17e104ed
Removed mission file versioning
...
We've decided there is no need to keep combatibility with original Colobot.
Closes #206
2015-03-28 11:23:32 +01:00
krzys-h
498a5ca4cd
Reapplied temporary fix for #94
2015-03-22 17:40:08 +01:00
krzys-h
a0097a0e53
Copying info about selected object to clipboard ( #391 )
2015-03-22 16:32:21 +01:00
krzys-h
78795c4b44
Alt+tab minimize to taskbar ( #391 , fixes #329 )
2015-03-22 16:10:32 +01:00
krzys-h
56d66b3417
Added bots/buildings switch shortcut ( #391 )
2015-03-22 16:02:05 +01:00
krzys-h
23c734c3c1
Implemented shortcuts for starting programs ( #391 )
2015-03-22 15:49:33 +01:00
krzys-h
7e3e1c00d2
Made sniffer flatground button available only with EnableBuild
2015-03-22 14:56:35 +01:00
krzys-h
7578f3c118
Made bf55691e44
work with new CObjectManager
2015-03-22 14:50:54 +01:00
Piotr Walkusz
bf55691e44
Issue #399 : Sniffer can delete mark and probe ground
2015-03-22 14:40:19 +01:00
krzys-h
8cc74002cf
Added CLevelParser in one more place
...
Not sure how I missed that earlier
2015-03-22 14:29:03 +01:00
krzys-h
33fcdbbef5
Removed unused CRobotMain::BuildScenePath
2015-03-22 14:12:41 +01:00
krzys-h
f9bdd32812
Fixed USERPROFILE encoding, final fix to #414
2015-03-22 14:07:38 +01:00
krzys-h
d2d0886b76
Implemented %cat%
...
and renamed BuildSceneName to BuildScenePath
2015-03-22 13:51:14 +01:00
krzys-h
47ed73247b
Use std::wstring in boost::filesystem calls on Windows, fixes #414
2015-03-22 13:36:23 +01:00
krzys-h
83599238d1
Added workaround for argv encoding on Windows
...
First part of fixing #414
2015-03-22 13:11:00 +01:00
krzys-h
bb16c6d97c
Fixed updating C locale after exception in C++ locale, should finish fixing #445
2015-03-21 20:14:41 +01:00
krzys-h
9c20f275a0
Fixed MXE builds after 87cf056158
...
On MXE, setlocale is a macro...
2015-03-21 17:34:18 +01:00
krzys-h
2b21f5f40c
Fixed another Travis problem ( #393 )
2015-03-21 17:29:17 +01:00
krzys-h
c3b9c3ce4d
Changed std::vector default value, should fix compilation errors on GCC 4.6
...
Fixes #393
2015-03-21 17:21:26 +01:00
krzys-h
87cf056158
Modified locale setting code
...
I'm doing my best to fix #445 . At least shouldn't crash anymore.
Needs more testing.
2015-03-21 17:12:05 +01:00
krzys-h
a60a4590b2
Better error logging in CResourceManager for further debugging #414
2015-03-19 19:55:22 +01:00
krzys-h
f43acaa943
Store resolution as value instead of id on the list, closes #417
...
Also fixed a bug where after starting the game for the first time the "Apply changes" button would behave like you selected highest resolution possible (while the game is running at 800x600)
2015-03-19 19:46:37 +01:00
krzys-h
bb9e490316
Removed unused Copy function
...
It's not used by the game and causes incombatibility with some version of Boost.
Should fix Travis build, see issue #393
2015-03-18 21:45:28 +01:00
krzys-h
f0d32125e9
Don't crash when there are too many images in SatCom
...
This limit will be removed during UI refactoring in the future.
Also, I've increased the limit to 100 lines.
issue #411
2015-03-18 21:39:35 +01:00
krzys-h
e179847358
Fixed remapping virtual keys, closes #415
2015-03-18 21:29:33 +01:00
krzys-h
8f78dc81e7
Whoops, the file didn't save
2015-03-18 21:12:49 +01:00
krzys-h
92ea770121
Better fix for numerical enter (issue #427 )
...
Should now work everywhere, not only in the editor.
2015-03-18 21:10:47 +01:00
krzys-h
f582b58c2e
Fixed "files" directory creation
...
Related to #444
2015-03-08 16:21:09 +01:00
krzys-h
3c2b0a8206
Probably fixed null CObject* instances in object list, should fix #440 , #441 , #442 and #443
2015-03-08 16:14:45 +01:00
krzys-h
6d85db5314
Fixed weird Converter behaviour, closes #431
2015-03-08 16:05:14 +01:00
krzys-h
f54b46b61d
CPathManager
...
* Moved path management from CApplication to CPathManager
* Moved %lvl% replacements from CParserParam to CPathManager
* Added %lvl% support in produce(), closes #426
2015-03-08 15:22:21 +01:00
Tomasz Kapuściński
03bb000e82
Revert "Potential fix to Travis build fails"
...
This reverts commit ed0e5dfef5
.
2015-01-31 11:55:37 +01:00
Tomasz Kapuściński
ed0e5dfef5
Potential fix to Travis build fails
2015-01-30 22:13:07 +01:00
Tomasz Kapuściński
cb95f9947c
Corrected the problem where every key acted as Enter
2015-01-27 18:18:27 +01:00
tomangelo2
dfda70af07
Numerical Enter key should now act the same as normal Enter ( #427 )
2015-01-18 12:47:37 +01:00
krzys-h
0ee86c3d15
Fixed loading scripts in produce() ( #418 )
2015-01-08 19:21:02 +01:00
krzys-h
0231c2359a
Fixed #425
2015-01-08 19:01:56 +01:00
krzys-h
61b186343f
Fixed #424 , #423 and probably #421
2015-01-08 18:56:26 +01:00
krzys-h
986cf98aaf
CController - entry point into CRobotMain and CMainDialog
2014-12-22 10:36:36 +01:00
krzys-h
4fef3af9ef
Moved all CObject management from CInstanceManager to CObjectManager
2014-12-21 19:04:31 +01:00
krzys-h
e8a0dc8ddb
CObjectManager::Radar
2014-12-20 20:36:09 +01:00
krzys-h
c5b6faea05
Refactored CObjectManager to std::map
2014-12-20 19:09:53 +01:00
krzys-h
58bc01c82c
Removed unused script/dd.cpp
2014-12-20 18:48:44 +01:00
krzys-h
07c651bd0a
Moved all CBot functions into a separate class
2014-12-20 18:45:46 +01:00
krzys-h
af9960d41e
Fixed saving files from CBot
2014-12-20 18:20:59 +01:00
krzys-h
ce27a80caa
Moved "file" CBot class (CRobotMain -> CScript)
2014-12-20 18:03:49 +01:00
krzys-h
fb07691790
New speed keybindings
2014-12-14 17:05:28 +01:00
krzys-h
be0f4c2ffe
Refactored keybindings UI and added some keybindings
2014-12-14 16:54:32 +01:00
MBlanc
56393f4278
Modified CMake to search the path for libintl headers
...
Conflicts:
src/CMakeLists.txt
2014-12-12 01:17:10 +01:00
MBlanc
7356f67b78
Shortcuts now use the meta key on OSX
2014-12-12 01:17:05 +01:00
MBlanc
7bb12511d9
Implemented the OSX clipboard using the AppKit API
...
The X11 dependency is no longer needed on OSX, and has been removed
2014-12-11 23:31:41 +01:00
krzys-h
5948a9e9d8
Show game version in logs, closes #413
2014-12-11 19:59:24 +01:00
krzys-h
601a58ea31
Nicer formatting of key names
2014-12-11 19:48:06 +01:00
krzys-h
eec6041104
Refactoring of input and input bindings, CInput class
2014-12-11 19:14:33 +01:00
krzys-h
e3e551de22
Fixed loading sound 0
2014-12-11 19:00:02 +01:00
krzys_h
40428bb89b
Merge pull request #409 from piotrwalkusz1/dev
...
Issue #396
2014-12-10 20:35:23 +01:00
Piotr Dziwinski
f30592bf56
Better fix for #94
2014-11-22 13:30:50 +01:00
Artur Czajka
7c8a31c074
#257 Destructor is parsed and (by some magic) already used
2014-11-19 10:02:27 +01:00
Piotr Walkusz
f8fe681dc5
Issue #396
2014-11-18 20:07:00 +01:00
Piotr Walkusz
0ce8f7ad90
Fix #395 issue and fix read function
2014-11-15 13:45:05 +01:00
Piotr Walkusz
ec8b2cfd81
Fix issue #394
2014-11-14 20:23:52 +01:00
Piotr Walkusz
d3df4a157a
Undo
2014-11-12 23:32:26 +01:00
Piotr Walkusz
3201bcd8f4
Delete unnecessary info in documentation
2014-11-12 23:21:47 +01:00
krzys-h
54098bcd55
Fixed updating "Apply" button after changing fullscreen, closes #392
2014-11-12 17:06:29 +01:00
krzys-h
e0448825a8
Fixed reading cmdline=, closes #388
2014-11-12 17:01:31 +01:00
krzys-h
fd28dfd9bb
Fixed Apperance textures
...
Issue #94
I beleive there is a better fix, I just can't find it because I don't fully understand the graphics engine.
I'll leave this issue open for @piotrdz to take a look at when he comes back
2014-11-12 16:47:40 +01:00
krzys-h
675ec3a222
Fixed bug in saving list of finished missions, closes #390
2014-11-12 15:11:42 +01:00
krzys-h
c509bc1709
Fixed PowerCell/Tracked animations ( closes #389 )
2014-11-12 15:05:02 +01:00
tomangelo2
7b03479a85
Fixed #386
2014-11-12 10:07:25 +01:00
krzys-h
80c9b35ce2
Close CBot editor by CTRL+Action key (default ENTER), closes #383
2014-11-11 17:42:19 +01:00
krzys-h
490e6fe2d6
Always show CBot documentation in SatCom, fixes #382
2014-11-11 17:22:21 +01:00
krzys-h
a50da4f5de
Loading texturesfrom objects/ subdirectory
...
Closes #381
2014-11-11 15:52:08 +01:00
krzys-h
fa4c70d1fe
Resetting fields in scene to defaults
...
Fixes #218
2014-11-11 15:38:11 +01:00
krzys-h
dbdaecd1e8
Fixed texture recoloring reset
...
Partially fixes #218
2014-11-11 15:32:38 +01:00
krzys-h
48ca5b5663
Removed info about CD in background music tooltip; removed unused 3D sound translation
2014-11-11 14:59:56 +01:00
krzys-h
fa2bd7901a
Translations for autosave
2014-11-11 14:56:19 +01:00
krzys-h
a1fe9c8d7f
Implemented autosave ( #292 )
2014-11-11 14:50:44 +01:00
krzys-h
b8103963c3
Sorting saved games list ( #380 )
2014-11-11 12:08:19 +01:00
krzys-h
afa0061364
Reset save filename if exception is thrown while loading
2014-11-10 22:50:00 +01:00
krzys-h
5cd45fbe17
Fixed saving aParamString in CAutoEgg
2014-11-10 22:45:06 +01:00
krzys-h
abcbaa1902
Fixed running programs with long names ( #379 )
2014-11-10 22:42:05 +01:00
krzys-h
462f0ce9d7
Removed unused PHYSFS conversions
2014-11-10 22:19:52 +01:00
krzys-h
76ca4fc6ae
Fixed isnan() on MXE
2014-11-10 22:17:41 +01:00
krzys-h
97e76e6303
Better handling of filenames longer than maximum allowed
...
#354
2014-11-10 22:07:51 +01:00
krzys-h
b698c40abf
Fixed saving Shielder's shield ( #365 )
2014-11-10 21:26:02 +01:00
krzys-h
ef35a3a2ef
Custom path to SecondTexture, closes #370
2014-11-10 20:46:39 +01:00
krzys-h
643d1ec46a
Fixed scenetest mode
2014-11-10 20:23:18 +01:00
krzys-h
fca746fdb4
Merge branch 'dev-physfs-save' into dev
2014-11-10 19:39:56 +01:00
krzys-h
a952e0ec54
Fixed DefenseTower empty cell detection ( #378 )
2014-11-10 19:38:49 +01:00
krzys-h
759b9871bb
Removed CMainDialog::GetPHYSFSSavegameDir()
...
CMainDialog is also finished.
This is last commit for saving with PHYSFS, closes issue #334
2014-11-10 19:26:36 +01:00
krzys-h
aeaea87d0d
Saving/loading list of finished missions via PHYSFS
2014-11-10 19:23:51 +01:00
krzys-h
fc5fcc7e61
Loading/saving apperance via PHYSFS
2014-11-10 19:02:43 +01:00
krzys-h
4994965201
Removed CRobotMain::GetPHYSFSSavegameDir()
...
Everything in CRobotMain uses PHYSFS now
2014-11-10 19:02:07 +01:00
krzys-h
025419324b
Research saving (for free game) in PHYSFS
2014-11-10 18:49:00 +01:00
krzys-h
169e860240
Removed PHYSFS hacks from Load/SaveFileScript as they are no longer necessary
2014-11-10 18:36:16 +01:00
krzys-h
ebf92e98c9
Removed CBOT_STACK switch
...
It was just making it harder to look for cause of #119
2014-11-10 18:22:48 +01:00
krzys-h
c330bcac6d
PHYSFS in CStudio
2014-11-10 18:17:13 +01:00
krzys-h
c861e67cc0
Fixed proxyDistance saving
2014-11-10 17:50:50 +01:00
krzys-h
5bb740696f
Fixed screenshot saving
2014-11-10 17:50:36 +01:00
krzys-h
fc16c36a45
Use PHYSFS in listing save files
...
Revert "Don't use physfs in saving code for now"
This reverts commit 3b1cfdbfb4
.
Conflicts:
src/ui/maindialog.cpp
2014-11-10 17:37:34 +01:00
krzys-h
8c84f012c6
Level state loading via CLevelParser
2014-11-10 17:15:34 +01:00
krzys-h
3dade17f89
Level saving through CLevelParser
2014-11-10 14:27:42 +01:00
krzys-h
1477e72ab4
Saving code for CLevelParser
2014-11-10 12:05:57 +01:00
krzys-h
1ae66d39f3
Don't require user to launch the SpaceShip before ending the mission, if it has selectable=0
...
Closes #376
2014-11-09 19:26:36 +01:00
krzys-h
bfdc577547
Removed m_checkEndTime
...
It was disabled some time ago
2014-11-09 19:19:14 +01:00
krzys-h
894d4173f6
Activate console by "~", closes #366
2014-11-09 18:58:13 +01:00
CoLoRaptor
81a02220ee
Depth of field to Render distance in EN & PL translations, close issue #369
2014-11-05 23:01:33 +01:00
Didier Raboud
c1043837a5
Allow PHYSFS to follow symlinks, fixes the launch on Debian systems which fonts' are symlinks to the system fonts
2014-11-02 17:18:53 +01:00
krzys-h
6d152d5aee
Fixed console spam when music files are not installed
...
Closes #359
2014-11-02 13:35:00 +01:00
MrSimbax
3ffc08a7f9
Fixed amount of fireball damage done to allies, close issue #356
...
In the original game the whole series did damage 0.02 (0.10 * 0.2) to human. In Gold, one particle do such damage, so 51 particles do 51 * 0.02 = 1.02 damage to human! I changed the multiplier for allies from 0.2 to 0.004 (approx. 0.2 / 51), but this problem probably occured somewhere else during rewriting the engine from DirectX to OpenGL and SDL.
2014-11-02 13:34:59 +01:00
krzys-h
ccdbce8cd7
Fixed icon on Windows; updated properties in .rc file
2014-11-01 19:57:23 +01:00
krzys-h
750f0f0810
COLOBOT: Gold Edition -> Colobot: Gold Edition
2014-11-01 19:46:06 +01:00
krzys-h
11a8742079
#335 , #348 , #352
...
I don't know what I'm doing anymore :/
I should set up dev envrioment on Windows so I don't have to commit every time I want somebody on Windows to test if my changes work
2014-11-01 14:02:39 +01:00
krzys-h
25d5d105fd
Fallback to English files if translated ones are not available
2014-10-31 21:23:10 +01:00
krzys-h
d0a2d66270
Removed duplicate license header
2014-10-31 21:10:55 +01:00
krzys-h
501cd7026b
Fixed m_exitAfterMission
2014-10-31 20:49:40 +01:00
krzys-h
71577b7b0a
Fixed #335 and #348
2014-10-31 20:40:19 +01:00
krzys-h
f8841f96f2
Added -headless
...
For automated stuff on devices without GPU
2014-10-31 20:40:13 +01:00
krzys-h
487e43ff4e
Changing resolution from commandline
...
Conflicts:
src/app/app.cpp
2014-10-31 20:40:09 +01:00
krzys-h
d0383ae09b
-runscene for userlevels
...
You need to know which ID is assigned to te userlevel category (by order in "User" menu)
-runscene custom101 = first userlevel from first chapter
2014-10-31 15:32:24 +01:00
krzys-h
601ea0ec87
Increased mission end accuracy
...
It whould now detect mission end immediately. We need somebody with an older computer than mine to make sure it doesn't cause FPS drop.
2014-10-30 22:26:14 +01:00
krzys-h
c1f931c8ee
Added some debug stuff, possible fix for #348 and #335
2014-10-30 22:18:33 +01:00
krzys-h
066344dde3
Fixed screenshoot loading again
...
issue #335
2014-10-29 21:15:45 +01:00
krzys-h
d6d08797ca
I forgot to remove some debug stuff
2014-10-29 21:13:12 +01:00
krzys-h
f68e7df8d6
Fixed program saving ( #352 )
2014-10-29 21:06:59 +01:00
krzys-h
6d2fd18b41
Implemented mission timer
2014-10-29 17:53:46 +01:00
krzys-h
61e06149c6
Fixed position updating
2014-10-29 16:08:55 +01:00
krzys-h
d91569e165
Showing coordinates in stats menu (F12/showstat); removed "showpos" cheat
...
Issue #277
Conflicts:
src/object/cheat.cpp
src/object/robotmain.cpp
src/object/robotmain.h
2014-10-29 16:08:55 +01:00
CoLoRaptor
ca3a1cb02b
Changed splashscreens filenames in maindialog.cpp
2014-10-28 10:37:05 +01:00
krzys-h
f679b5c84c
Sorry, I didn't mean to remove that
2014-10-27 22:09:57 +01:00
krzys-h
d75efcc5b2
Fixed problems with loading save screenshots (issue #335 )
2014-10-27 22:08:49 +01:00
krzys-h
11854dc89e
Fixed script saving (issue #348 )
2014-10-27 21:49:03 +01:00
krzys-h
d6e88a07b0
Support for %lvl% in TerrainInitTextures + cleanup
...
cleanup:
* Removed CProfile::SetUserPath (unused)
* Removed CProfile::GetUserBasedPath (unused)
* Removed CProfile::CopyFileToTemp (i have no idea why it even existed)
* Removed CopyFileListToTemp (it did the same as CopyFileToTemp but for multiple files, wasn't even fully implemented)
2014-10-27 21:15:14 +01:00
Tomasz Kapuściński
990ecf7290
Corrected clamping mode in textures
2014-10-26 22:24:12 +01:00
krzys-h
569dd8ed25
Fixed regex in CResourceManager::CleanPath
2014-10-26 20:43:51 +01:00
krzys-h
ca4f1e85d2
Support for %lvl% in all commands
...
Except for TerrainInitTextures (I'm not sure what it does but it does something weird)
2014-10-26 18:35:13 +01:00
krzys-h
475f222276
Fixed "Device" tab opening if it was opened in main menu earlier
2014-10-25 19:11:24 +02:00
krzys-h
0d873ad43a
Added warning about restarting game in order to apply changes
...
issue #339
2014-10-25 18:43:02 +02:00
krzys-h
26376c652d
Nothing else works, so restart the game on resolution change
...
Fixes #339 for now, but we'll need alternative solution later
2014-10-25 18:34:29 +02:00
krzys-h
c9eb3ce5c5
Another possible (and more likely correct) fix for #339
2014-10-25 18:17:03 +02:00
krzys-h
9d68868f8e
Possible fix for #339 (?)
2014-10-25 18:00:39 +02:00
krzys-h
fdbc4080c7
But do 182d5206a8
only on Windows, since it works correctly on Linux
2014-10-25 17:28:30 +02:00
krzys-h
182d5206a8
Disable resolution settings in simulation
2014-10-25 17:23:09 +02:00
krzys-h
c12ebb1c7b
Fixed NewScript ( #341 )
2014-10-25 17:17:59 +02:00
krzys-h
ef1edba307
Fixed #340 again
2014-10-25 17:09:14 +02:00
krzys-h
81062e5e87
Fixed linking convert_model ( #332 )
2014-10-25 12:44:52 +02:00
krzys-h
78d7cc9eef
Change userlevels button text via text file
2014-10-25 12:21:13 +02:00
krzys-h
db7ab65354
Fixed #344
2014-10-25 12:10:29 +02:00
krzys-h
7d28b9a6da
Fixed #340
2014-10-25 12:01:21 +02:00
krzys-h
4c865322f0
Fixed #341
2014-10-25 11:30:38 +02:00
Tomasz Kapuściński
1aebe8af03
Added support for VBO in OpenGL older than 1.5 if ARB extension is present
2014-10-24 00:29:26 +02:00
krzys-h
2d043d46bb
Merge branch 'vieux-blood_mode' into dev
...
Conflicts:
src/common/restext.cpp
src/ui/maindialog.cpp
2014-10-22 17:52:17 +02:00
Victor Vieux
d019a4990f
add option to disable blood
2014-10-21 21:44:17 -07:00
Tomasz Kapuściński
d3a722a0c5
Improved VBO support detection
2014-10-22 00:53:35 +02:00
CoLoRaptor
1ab5746ca7
Disabled active window resizing that crashes in some software/hardware configurations
2014-10-21 22:22:32 +02:00
krzys-h
97b7c0cab1
Fixed map turning gray after resizing window
2014-10-20 21:54:52 +02:00
krzys-h
c0ac60e4fa
Fixed save directories in things not yet refactored to use PHYSFS
2014-10-20 21:15:39 +02:00
krzys-h
cf7be276dc
Possibly fixed goto() by changing safety margin
...
TODO: More testing
Closes #326
2014-10-20 20:48:03 +02:00
krzys-h
0245fdc6c3
Merge branch 'dev-physfs' into dev
...
Conflicts:
src/app/app.cpp
2014-10-19 16:18:36 +02:00
krzys-h
d7ef0a1a5f
Implemented "Apply changes" button (issue #141 )
2014-10-19 15:45:59 +02:00
krzys-h
c001c46cb5
Small fix to 72b4228abe
2014-10-19 15:27:00 +02:00
krzys-h
9ea0b37408
Possible fix for #331
2014-10-19 14:21:55 +02:00
krzys-h
0fb1cb11d4
Changed max and default font size
...
Min font size is 9, max is now 24 (previously 21)
Default size is now 19 (previously 9)
Closes #330
2014-10-19 13:33:19 +02:00
krzys-h
83abb8ca8e
Fixed program saving
2014-10-19 13:18:31 +02:00
krzys-h
7af92cc4ce
Added portable build flag
2014-10-18 20:00:30 +02:00
krzys-h
b85a41b42a
Also fixed the same thing in file writing code
2014-10-15 21:31:43 +02:00
krzys-h
63b6aa56b0
Fixed crash when colobot.ini doesn't exist
2014-10-15 21:28:40 +02:00
krzys-h
47ea8a1175
Updated some more license headers
2014-10-15 21:16:06 +02:00
krzys-h
f65b00089a
Merge branch 'dev' into dev-physfs
...
Conflicts:
data
2014-10-14 15:42:19 +02:00
krzys-h
9fd6cf5449
Changed all occurences of PPC in the code to TerranovaTeam
2014-10-14 15:26:18 +02:00
Piotr Dziwinski
343504168f
Clean up translations
...
* translate only marked strings from restext.cpp
* update and clean pot and po files
* remove redundant POT-Creation-Data
2014-10-09 00:32:58 +02:00
Piotr Dziwinski
342210b062
GCC 4.6 compilation fixes
2014-10-07 23:25:37 +02:00
krzys-h
72b4228abe
Fixed CBot debugger ( #325 )
2014-10-07 22:28:32 +02:00
Piotr Dziwinski
12feb49098
Fixes in unit tests
2014-10-07 22:22:59 +02:00
Piotr Dziwinski
5274acd624
Merge with dev
2014-10-07 22:15:40 +02:00
krzys-h
2770ee8927
Fixed issue #324
2014-10-07 21:40:51 +02:00
krzys-h
3ef2f976df
Added %chap% for current chapter directory
2014-09-29 21:53:21 +02:00
krzys-h
c2b8787453
On development builds store savegame data in current directory
2014-09-29 21:39:21 +02:00
krzys-h
f2c6b322dd
Replaced std::to_string with boost::lexical_cast<std::string>
...
MXE has problems with std::to_string
2014-09-28 19:25:28 +02:00
krzys-h
ad79babbc1
Made proxyDistance optional
2014-09-27 18:34:08 +02:00
krzys-h
b3fa72c007
Moved effect??.png textures and made pos= in GroundSpot optional
2014-09-27 18:26:29 +02:00
krzys-h
32504be8a9
Fixed TerrainLevel bug
2014-09-27 17:46:52 +02:00
krzys-h
8fab044bcd
Removed more unused variables
2014-09-27 17:16:58 +02:00
krzys-h
c29ef4ec41
Fixed some warnings
...
Removed unused variables and fixed signed/unsigned comparation warnings
2014-09-27 16:49:00 +02:00
krzys-h
d3eaf2e1ce
Merge branch 'dev-physfs' into dev-physfs-levels
2014-09-26 21:05:55 +02:00
krzys-h
71f84d1e16
Fixed human.png texture
2014-09-26 21:02:54 +02:00
krzys-h
de375548ad
Userlevel listing
2014-09-26 20:53:11 +02:00
krzys-h
3b1cfdbfb4
Don't use physfs in saving code for now
...
This requires too much refactoring and we want to release 0.1.5 soon.
We'll need to rewrite saving/loading code to fully implement new level parser anyway.
2014-09-26 19:50:27 +02:00
krzys-h
740036e430
New level parser
...
Known issues:
* TerrainLevel for some reason doesn't work
* %lvl% is not yet implemented everywhere because of hardcoded directories in functions
2014-09-24 22:56:19 +02:00
Piotr Dziwinski
9f2d544b27
Fix zenity version checking problems
2014-09-21 21:28:59 +02:00
Piotr Dziwinski
2b86e6e9d9
Rewrite CMainDialog to use physfs
2014-09-21 12:29:06 +02:00
Piotr Dziwinski
6a1ceba8c0
Some cleaning up
2014-09-21 12:29:06 +02:00
krzys-h
f0b38721e0
Loading all mods found in "mods" directory
2014-09-21 12:29:01 +02:00
Piotr Dziwinski
e4d52d9afb
CProfile refactoring
2014-08-12 21:24:33 +02:00
Piotr Dziwinski
74312b0405
Better CMake organization and unit test cleanups
...
* created a static library containing most source modules
to avoid compiling source modules twice in code and unit tests
* moved profile_test to main unit tests executable
* removed image_test and edit_test as not really useful
2014-08-12 20:58:55 +02:00
Piotr Dziwinski
4bdfa0aa4e
Remove unused accessors from CDevice
2014-08-12 18:18:30 +02:00
Piotr Dziwinski
360b72ac5a
Fix task stopping checks in CBrain
...
This possibly fixes some issues resulting from improperly
stopping tasks (CTask::Abort() not called before deleting the task).
Found while looking for instances of #318 .
2014-08-10 18:00:40 +02:00
Piotr Dziwinski
9de086390b
Remove some more delete checks ( #318 )
2014-08-10 17:51:47 +02:00
Piotr Dziwinski
ac019c263d
Remove unnecessary delete checks ( #318 )
2014-08-09 22:45:07 +02:00
krzys-h
ea0615ee05
Fixed #315
2014-08-08 14:03:43 +02:00
krzys-h
4a202a086f
Fixed #314
2014-08-06 17:18:52 +02:00
krzys-h
a56e69883f
Removed some unused code
2014-08-06 16:58:36 +02:00
krzys-h
0b2f25a6e3
Restored -datadir and -langdir arguments, added -savedir
...
Also, fixed some crashes when unable to open file
2014-08-06 12:27:17 +02:00
krzys-h
9a3cd67c3b
Saving colobot.ini through physfs
2014-07-24 23:38:13 +02:00
krzys-h
17041e718b
Added -mod commandline argument to add additional locations to physfs
2014-07-24 22:46:47 +02:00
krzys-h
7131abd385
Fixed SatCom image loading
...
Now LoadTexture/SetTexture functions require full path with "textures/" directory
2014-07-24 22:17:49 +02:00
Mohamed Waheed
117a5289ea
fixed issue #223 about disabling shadows/ground textures
2014-07-12 19:37:34 +00:00
krzys-h
02ba358a89
Help file loading
2014-07-11 16:40:07 +02:00
krzys-h
96d49d84aa
Merge branch 'dev' into dev-physfs
...
Conflicts:
data
src/app/gamedata.cpp
src/ui/control.cpp
src/ui/edit.cpp
src/ui/maindialog.cpp
2014-07-11 15:24:44 +02:00
krzys-h
9a6c06665c
Removed some old stuff related to Ceebot-Teen
2014-07-10 17:39:45 +02:00
krzys-h
c22e55b99a
Removed some unused code related to Quit button
...
The button itself has been removed a long time ago
2014-07-10 16:52:29 +02:00
krzys-h
5223ef1fb1
Fixed mission description loading
2014-07-10 16:36:00 +02:00
krzys-h
106ec014b8
Fixed texture and script loading
2014-07-10 16:25:40 +02:00
krzys-h
7b04f67358
Fixed music loading
2014-07-10 15:38:37 +02:00
krzys-h
1ee0c0e8fe
Fixed level list
2014-07-10 15:27:43 +02:00
Krzysztof Dermont
aa190bb59b
Last changes
2014-06-30 17:40:40 +02:00
krzys-h
1835d2ae58
Removed old code based on #ifs (issue #55 )
2014-06-27 19:52:09 +02:00
Piotr Dziwinski
0fbc05b96c
Fix test compilation
2014-06-26 22:36:57 +02:00
krzys-h
092e7cc68d
Fixed tests
2014-06-26 22:14:30 +02:00
krzys-h
fd8ea13cbb
Fixed not destroying CGameData
...
This also fixed failing assertion in tests
2014-06-26 21:38:02 +02:00
krzys-h
bc3b7ef283
Fixed negative parameter in fire() (issue #305 )
...
Also fixed checking parameter count and type for ants, spiders and shooters
2014-06-26 21:06:53 +02:00
Mohamed Waheed
f5ba2a27d4
fixed savefile screenshot loading bug
2014-06-24 20:31:17 +03:00
Mohamed Waheed
b7125a5b24
formatting and enhancements for savefile screenshot feature
2014-06-24 20:27:31 +03:00
Mohamed Waheed
613e1d74c4
implemented savefile screenshot feature
2014-06-24 01:35:05 +03:00
Krzysztof Dermont
68d41d3b21
More work on streams
2014-06-23 23:19:55 +02:00
Krzysztof Dermont
3aca1de731
More work on levels
2014-06-22 21:30:23 +02:00
Krzysztof Dermont
0556b5dfbc
Added Exist() to resource manager, updated model
2014-06-22 16:29:26 +02:00
Krzysztof Dermont
754154341d
More work on PhysFS support
...
* added output stream
* fixed music loading
2014-06-22 15:01:06 +02:00
Krzysztof Dermont
1630cf0ed2
Implemented libsndfile loader in PhysFS
2014-06-21 02:59:26 +02:00
Krzysztof Dermont
2260f6bf4f
Big part of PhysFS support
...
* removed -mod argument
* removed -datadir argument
* removed -lang argument
* removed some dead ui code
* added resource manager and file loaders (stream and SDL)
* changed interface textures location to match new directory structure
* removed CGameData for mod support
* added PhysFS support
2014-06-20 23:51:28 +02:00
Piotr Dziwinski
ba62e6f8be
Remove dead code
2014-06-01 13:02:08 +02:00
krzys-h
f0d97bfdb9
Better datadir mod support
2014-05-18 12:12:47 +02:00
krzys-h
f71658e38d
Random relief generator
2014-04-10 21:50:26 +02:00
Oleg Kosmakov
a181ba9bbf
Fixes #271
2014-03-25 22:56:40 +02:00
Oleg Kosmakov
a2a4eb75cb
Whitespace
2014-03-21 13:22:02 +02:00
Oleg Kosmakov
119fce546a
Issue #295 - continue
...
Renamed the method, fixed typo in comments
2014-03-21 13:18:28 +02:00
Oleg Kosmakov
4491f51839
Whitespace
2014-03-21 13:15:15 +02:00
Oleg Kosmakov
7485ed790c
Fixes #295
...
When cannon cannot turn at specified angle, it will still reach the edge angle, but return the error code
2014-03-21 13:08:36 +02:00
Oleg Kosmakov
2cf84ad214
Added spaces to align values
2014-03-21 09:34:52 +02:00
MrSimbax
e569fd6c39
Fix for #294
2014-03-16 15:25:49 +01:00
MrSimbax
244ca93cf7
Fixed bug with fall damage
...
If you change the height after overheat, you get damage like you didn't change it at all. For example: overheat when you are 10 meters above the ground, and you fall to place 20 meters deeper, but you get the damage like you fell from 10 meters instead of 30. This commit fix this.
2014-03-12 19:43:20 +01:00
MrSimbax
2ee0702d69
Made some improvements to fall damage from a61da740
...
Fall damage on:
- no energy
- overheat
Fall damage off:
- underwater
2014-03-09 14:36:39 +01:00
MrSimbax
3dd400810f
Fixed bug from a61da7404b
...
Moved ExploObject to CPhysics::EventFrame, it shouldn't crash anymore.
2014-03-08 23:20:39 +01:00
MrSimbax
a61da7404b
Added fall damage
...
+ changed window title
2014-03-08 22:36:35 +01:00
krzys-h
fbe2bf8bc7
Added special mode in scene for bots to build more buildings than they usualy can
...
Will be used in "Leaving Earth" missions for making decorative bots building base
2014-03-03 21:55:28 +01:00
krzys-h
a806d4257c
Check if pause music is defined in scene before trying to play it
2014-03-02 16:10:02 +01:00
andreymal
1a0dcedf83
fixed m_oldMusic.push_back(nullptr) and segfault
2014-03-02 18:00:02 +04:00
andreymal
e9960f5373
GetStringWidth fix
2014-03-02 04:15:59 +04:00
krzys-h
14709427c4
Fixed compile warning
2014-02-21 14:33:56 +01:00
krzys-h
bb2a9bcfd3
Added option to set pause audio in Scene
2014-02-21 14:19:58 +01:00
erihel
2433cb595a
Added a check when trying to play a music file
2014-02-21 10:13:48 +01:00
erihel
f21ab91184
Changed max channels to fix compilation error
2014-02-02 02:01:42 +01:00
erihel
93582536de
Merge branch 'dev' of github:colobot/colobot into dev
2014-02-02 01:51:14 +01:00
erihel
d84d38280b
Changed max number of sound channels
2014-02-02 01:50:34 +01:00
Piotr Dziwinski
70b18cc4c0
Move engine frame update after game state update
...
This should finally fix #225
2014-01-18 21:35:32 +01:00
Piotr Dziwinski
181a404930
Fixed warnings about unknown commands in scene files
2014-01-18 19:24:08 +01:00
erihel
c5ae2610b5
Minor changes to sound support.
...
* changed channel limit from 64 to 2048 that will decrease if error is found while trying to play sound
* added id to each channel to avoid collisions when more than 1 object tries to modify a sound
* minor formatting changes
2014-01-18 03:42:07 +01:00
krzys-h
652dc6081d
Removed some unused objects
2014-01-11 23:43:10 +01:00
krzys-h
d855586674
Fixed a bug from 59935b4706
...
Cmd() now checks if length of token we're looking for is equal to token we've found
2014-01-11 18:22:37 +01:00
krzys-h
082989a413
Changed main menu title to "COLOBOT: Gold Edition"
2014-01-01 19:49:29 +01:00
krzys-h
59935b4706
Changed comments in ObjectType to be object categories; removed unused SEAWEED
2014-01-01 17:33:19 +01:00
krzys-h
130c4fd941
Fixed log level in 8d30791595
2014-01-01 16:46:28 +01:00
krzys-h
90437d1765
Fixed two bugs in dc81cda4b1
...
* win/end scene animations
* produce() was producing empty cells
2014-01-01 16:45:08 +01:00
krzys-h
3d7017525b
Added camerafocus() for changing camera
2013-12-31 19:09:54 +01:00
krzys-h
8d30791595
Ability to set language via ini file
...
If language autodetection doesn't work, someone might want to manually force the game to use correct language without using -language parameter every time
2013-12-31 17:20:03 +01:00
krzys-h
999490e88b
Code for changing music in pause mode
...
As requested by @Emxx52. Only code for now, we don't have the music yet. Temporairly in developements builds music will change to Prototype (in CBot editor) and Constructive Destruction (in SatCom)
2013-12-31 16:58:21 +01:00
krzys-h
4a237f5925
CPauseManager
2013-12-31 13:24:09 +01:00
krzys-h
3536f1c7cc
Added CObjectManager::Flush()
...
Possible fix for #275
2013-12-30 10:51:29 +01:00
krzys-h
12e17224b3
Added nullptr shecks to object.factory()
...
Trying to fix #275
2013-12-29 16:31:32 +01:00
krzys-h
a36450a6da
Added tool= i drive=
2013-12-29 15:03:21 +01:00
krzys-h
dc81cda4b1
Cleaned up creating objects
2013-12-29 12:08:59 +01:00
krzys-h
9631f26270
Don't stop music when SatCom or pause menu is opened
2013-12-28 16:45:11 +01:00
krzys-h
e9addb5a5e
Added smooth transition in music - issue #205
2013-12-28 12:30:46 +01:00
krzys-h
0ff7e55b33
Fix for #177 - save list sorting
2013-12-27 22:28:25 +01:00
krzys-h
1b73893678
Temporary fix for #232 - don't try to show the buttons
...
This makes SatCom usable for now
2013-12-27 21:46:16 +01:00
krzys-h
246b7e107e
Removed prototypes support
2013-12-27 20:36:11 +01:00
krzys-h
9a741a66a4
Changed version display in bottom-right corner to be actually version number instead of date
2013-12-27 11:15:36 +01:00
krzys-h
8b5b2eeaa1
Added error message when CEdit is unable to read a file
2013-12-27 10:50:52 +01:00
krzys-h
555c486fc6
Disable immediat SatCom when scene test is enabled
2013-12-26 22:33:17 +01:00
krzys-h
01cbc4177e
Whoops
2013-12-26 22:14:53 +01:00
krzys-h
0f57809f51
Added scene test mode
...
... and fixed a "small" bug in previous commit ;)
2013-12-26 22:13:04 +01:00
krzys-h
3a78d587bd
Exit the game after finishing the mission while using -runscene
2013-12-26 21:54:05 +01:00
krzys-h
32c55297c4
Fix for building physics.cpp on some systems
...
Why is it working on my local machine but it's crashing on MXE on my server?
2013-12-26 21:14:36 +01:00
krzys-h
16842b5e83
Changed default loglevel on dev builds to Debug
2013-12-26 21:09:19 +01:00
krzys-h
fcda183b96
Hide userlevels menu in release version
...
Userlevels aren't working right now (issue #219 )
2013-12-26 21:05:58 +01:00
krzys-h
07901341a6
Fix for #71 - infinite energy
2013-12-26 20:37:39 +01:00
krzys-h
3eec21895e
Renamed "New player" to "Change player" ( #220 )
2013-12-26 19:48:44 +01:00
krzys-h
8b121910c1
Indentation fixes
2013-12-26 19:39:32 +01:00
krzys-h
46a7aa98b0
Added error message when unable to load script from file specified in CreateObject
2013-12-26 19:36:17 +01:00
krzys-h
0d31f59b12
.takeoff() for SpaceShip ( #265 )
2013-12-26 18:50:05 +01:00
krzys-h
a79bd6c5c7
Fixed build of stringutils.cpp
...
/var/www/colobot_compiled/colobot/dev/colobot/src/common/stringutils.cpp:33:51: error: 'vsnprintf' was not declared in this scope
2013-12-25 23:41:50 +01:00
krzys-h
c8ec3f2020
Added "E" as a secondary action button
...
As requested by @Emxx52 on IRC
2013-12-25 19:43:11 +01:00
krzys-h
5661f5a413
Fixed "default controls" button ( #263 )
2013-12-25 19:41:15 +01:00
krzys-h
55fd03ade3
Added WSAD as secondary controls ( #231 )
2013-12-25 19:34:34 +01:00
krzys-h
f1e267b18e
Fixed bug #240 - CAuto in produce()
2013-12-25 19:13:15 +01:00
krzys-h
d0285d6886
Fixed AudioChange
2013-12-25 18:53:32 +01:00
Piotr Dziwinski
3966e3fce0
Merge branch 'dev-string-in-restext' into dev
...
Merging branches after code review
This should fix buffer overflow problems with translation strings
2013-12-20 20:22:51 +01:00
Piotr Dziwinski
95661918ce
Some further refactoring and test corrections
2013-12-20 20:18:30 +01:00
erihel
fe3f9ea38c
Sound support changes
...
* removed 2d sound
* fixed listener orientation (propably issue #235 )
* removed unused code and minor refactoring
2013-12-19 22:46:29 +01:00
Didier 'OdyX' Raboud
114cbec8a9
Never cache Data, Sound and Music paths
...
Let them always be either auto-detected, defined on the command-line
or written in the configuration file
2013-12-09 17:39:39 +01:00
Piotr Dziwinski
8deb130572
Changed char[] to std::string in restext
...
Experimental changes
2013-12-04 00:15:39 +01:00
Didier Raboud
343fa8f0cb
Add a PLATFORM_GNU global variable matching all GNU systems such as Debian's Linux, kFreeBSD and Hurd
2013-11-27 18:53:28 +01:00
Piotr Dziwinski
fdd7c22591
Updated README and INSTALL files
2013-11-26 00:38:32 +01:00
Piotr Dziwinski
aab79c6b5d
Changed ASM_TRAP() to assert(0)
2013-11-25 20:03:06 +01:00
Piotr Dziwiński
8ed542a881
Merge pull request #250 from OdyX/dev-platform-enhancements-and-installers
...
MacOSX and Windows platform enhancements and installers
2013-11-22 15:16:12 -08:00
Didier 'OdyX' Raboud
89e2855f95
Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txt
2013-11-20 10:39:06 +01:00
Didier Raboud
3bcf80a82a
Tweak tooltip margin and correct french jargon comment
2013-11-19 17:22:25 +01:00
Didier Raboud
f4355b8b8e
Fix tooltip to display as white and not transparent
2013-11-19 17:12:16 +01:00
Piotr Dziwinski
81b940cc25
Fix for crash when loading PNG in indexed mode
...
For example, some icons in SatCom
2013-11-15 10:22:49 +01:00
Piotr Dziwinski
418f57f8be
Buffer overflow fix
2013-11-13 18:51:52 +01:00
Didier 'OdyX' Raboud
d7af8204ce
On MacOSX, assume we do have CFLocaleCopyCurrent to detect the actual locale by hard-coding the fact in config.h.cmake
...
This circumvents the fact that we are using localename.c directly instead of relying on the autotools-generated config.h
2013-11-13 17:41:41 +01:00
Didier 'OdyX' Raboud
bea84f0af4
Don't set rpath if libCBot is compiled statically
2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud
aeefdbd1be
On MacOSX, define the LangPath as being i18n in the Resources path of the bundle
2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud
b32f87bac7
Abstract the definition of LangPath to CSystemUtils
2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud
93727a3fdf
On MacOSX, don't cache the Data, Sound and Music paths
...
As users can potentially move the bundle around, it doesn't make sense to cache these
(It would probably make sense to drop this caching on all architectures, but it's only on MacOSX where it hurts most)
2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud
e78d2cce18
On MacOSX, define the DataPath as being the Resources path in the bundle
2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud
17ad3e5a90
Abstract the definition of DataPath to CSystemUtils
2013-11-13 09:35:31 +01:00
Didier 'OdyX' Raboud
8f7f56f1ea
On Mac OS X, write colobot.ini and savegames to Application Support directories
2013-11-13 09:35:31 +01:00
Didier 'OdyX' Raboud
8b65e9b56f
Add russian language support
2013-11-07 14:44:12 +01:00
Didier Raboud
2acc338c3a
Drop now-useless display of licenses.txt in PHASE_GENERIC
...
The content of licenses.txt in data has gotten useless as the
restrictions got waived, displaying it is useless.
2013-10-30 21:51:05 +01:00
Piotr Dziwiński
816f4e91b9
Merge pull request #245 from OdyX/dev-platform-fixes
...
Platform fixes (Windows Icon and Mac OSX SDL_Main fix)
2013-10-29 14:12:07 -07:00
Piotr Dziwinski
cd97feabb0
Revert back "Merge pull request #243 from OdyX/dev-fix-textures-loading"
...
False alarm, was caused probably by faulty build bot.
This definately should work on all platforms.
2013-10-29 22:04:12 +01:00
Didier 'OdyX' Raboud
9e9a9937ba
Revert "Include SDL.h in main.cpp to make sure the main loop is SDL's main loop"
...
This was the wrong fix for the problem.
This reverts commit f31a570d96
.
2013-10-29 14:43:29 +01:00
Didier 'OdyX' Raboud
ee90f02bc4
Add an icon and executable information to the colobot.exe when build in MXE
2013-10-29 14:40:58 +01:00
Piotr Dziwinski
70af33e45d
Revert "Merge pull request #243 from OdyX/dev-fix-textures-loading"
...
Looks like it doesn't work on all platforms
2013-10-28 19:36:43 +01:00
Didier Raboud
c2a717d5c9
Let mouse.png's format be detected
...
Fixes the mouse cursor on Mac OS X
2013-10-28 15:25:14 +01:00
Didier 'OdyX' Raboud
9e439d88bf
Fix the detection of alpha-channel in textures as created by IMG_Load
...
This fixes the textures loading under Mac OS X
2013-10-28 15:23:56 +01:00
Didier 'OdyX' Raboud
f31a570d96
Include SDL.h in main.cpp to make sure the main loop is SDL's main loop
...
This allows the MacOSX program to start.
2013-10-26 13:19:13 +02:00
Didier 'OdyX' Raboud
97baf7242e
Fix system_other implementation by adding an Init() and fixing the wrong const
2013-10-24 21:12:52 +02:00
Didier 'OdyX' Raboud
591ba30a00
Include the OpenAL headers using the "al.h" form, as recommended by its CMake finder script
2013-10-24 21:12:52 +02:00
Didier 'OdyX' Raboud
b3b6a40d9e
MacOSX: Add initial support in CMake build infra
2013-10-24 21:12:52 +02:00
Piotr Dziwinski
9017dbbbdb
Fixed CTerrain-related memory leaks
2013-10-13 14:44:12 +02:00
Piotr Dziwinski
ccb63bd29e
Fixed memory leaks in CText
2013-10-12 21:14:33 +02:00
Piotr Dziwinski
5d0d9b5aa5
Fixed some CBot-related memory leaks
...
* fixed leaks in CScript::CheckToken()
* fixed leaks in CInterface
* commented out unused function in robotmain.cpp
2013-10-12 18:50:30 +02:00
krzys-h
d70d31acc1
Fix for #232 - Images in SatCom
...
Only images, icons still don't work
2013-09-28 11:13:45 +02:00
krzys-h
39866db502
Fixed @Emxx52 's fail :P
...
Merge branch 'master' into dev
Conflicts:
src/app/app.cpp
2013-09-08 17:55:48 +02:00
Emxx52
2891c2ea4c
Added '-game' launch option
2013-09-08 17:05:11 +02:00
erihel
b5e87aa91f
Datadir in command line didn't work with config.
...
Values from config file overwrote datadir
2013-07-16 16:00:06 +02:00
Piotr Dziwinski
f8a6c6750a
Fix for #228
...
* "empty" objects were wrongly handled in CPyro
2013-06-26 20:44:17 +02:00
erihel
41fa8458c2
Some Ui refactoring
2013-06-24 22:09:39 +02:00
Piotr Dziwinski
81a6de41a5
Some further changes in CMakeLists
...
* removed DEV_BUILD autodetection (could be confusing)
* ignore desktop subdirectory on Windows
* some refactoring
2013-06-24 14:17:28 +02:00
Piotr Dziwinski
3e989c96df
Fixed auto-detecting locale on Windows
...
* localename library is now used to determine the actual locale used
* added patched version of FindGettext.cmake to fix
installation path of translation files
2013-06-24 14:16:39 +02:00
Piotr Dziwinski
9f819088a6
gitignore update
...
* git should now ignore all generated files when building without
separate build directory
2013-06-22 22:44:03 +02:00
Piotr Dziwinski
bfcce26f89
Changes in build organization
...
* targets are now created in top-level build directory
* more things are now configured through CMake options
* changed debug build detection from NDEBUG to DEV_BUILD
* moved po and desktop directories
* moved last unit test out of src directory
2013-06-22 01:17:19 +02:00
Piotr Dziwinski
1377e48910
Reverted enum values to fix UT regression
2013-06-22 01:17:19 +02:00
Piotr Dziwinski
28b4e9a634
Fixed terrain light priorities (fix for #139 )
...
* lights illuminating the terrain specified in scene file are now
always moved to front of light ordering
2013-06-20 23:14:37 +02:00
Piotr Dziwinski
4c33172e17
Fixed string formats in light debug prints
2013-06-17 20:52:56 +02:00
Piotr Dziwinski
366d3a551e
Added debug aids for lighting
...
* displaying positions of current lights (F11)
* dumping info to console (F10)
* added assert() in suspicious place in CPyro
2013-06-17 18:17:21 +02:00
krzys-h
868b592706
Added -proto to options[]
2013-06-17 16:26:25 +02:00
Piotr Dziwinski
b4700e3bed
Fix for #133
...
* objects are now copied and textures are updated correctly
* also added function to debug objects
2013-06-17 11:48:57 +02:00
Piotr Dziwinski
7874aca10c
Enhanced logging, option to auto-start mission
...
* added logging of application events
* changed debug mode flag to independent debug modes
* added option to auto-start mission (load a mission immediately
after startup)
* removed "enum value out of range" prints
* some refactoring
2013-06-16 21:54:36 +02:00
Piotr Dziwinski
7cf8811888
Fix for #195
...
* loading time now is not counted in elapsed time
2013-06-13 17:25:58 +02:00
krzys-h
e8e220085a
Fixed bug with showing wrong filename in Level Checker errors after using CacheAudio
2013-06-10 15:44:25 +02:00
krzys-h
18b27d258e
Fixed bug with white map
...
I'm not sure when it was introduced, probably in 8f6fd2a131
.
It was showing errors like "Couldn't load texture 'map.png'" and "Invalid texture data"
2013-06-10 15:38:55 +02:00
Piotr Dziwinski
b22d852b4c
Fixed variable shadowing warnings
...
* fixed -Wshadow warnings
* refactored some constructors
2013-05-27 22:29:42 +02:00
Piotr Dziwinski
12313fecf5
Fixed some memory issues
...
* invalid pointer, uninitialized buffer
2013-05-27 20:59:50 +02:00
Piotr Dziwinski
950a3474d5
Refactored sound code
...
* fixed formatting and naming to be uniform with rest of code
* moved default implementation of CSound to cpp module
2013-05-27 10:19:16 +02:00
Piotr Dziwinski
8765d58b02
Fixed code formatting
...
* moved braces to new lines
* fixed some function/variable names
* fixed whitespace issues
2013-05-27 10:19:16 +02:00
Piotr Dziwinski
538745a731
Fixed some compilation warnings
...
* fixed warnings about hiding virtual functions and several others
2013-05-27 10:19:04 +02:00
adiblol
cc2e192f0d
Reorganize string parsing in CBotToken::NextToken to fix #212
2013-05-26 18:40:25 +02:00
Piotr Dziwinski
8f6fd2a131
Changes in texture code & refactoring
...
* refactored and altered slightly the texture pack code
* added flushing of texture cache
* some refactoring and const-correctness in CApplication methods
2013-05-26 14:50:23 +02:00
Piotr Dziwinski
b41957f2f9
Corrected some valgrind issues
...
* fixed several uninitialized variable issues
* fixed possible memory corruption in CEngine
2013-05-26 11:34:53 +02:00
Piotr Dziwinski
ff101c6973
Fix for #213
...
Was caused by invalid options for getopt
2013-05-26 10:24:35 +02:00
adiblol
1cd0bc3152
Resizing is fully functional so it can be enabled by default.
2013-05-25 23:18:27 +02:00
krzys-h
f90a4b48f5
Added object.research(type)
2013-05-19 21:48:29 +02:00
krzys-h
6798641a71
Translated <erreur> and <sans nom>
2013-05-19 17:03:55 +02:00
krzys-h
6b25608e69
Added progfunc( funcname );
...
For simple creating of programs executing public functions :)
Example:
public void object::SecondBot()
{
message("It works!");
}
extern void object::FirstBot()
{
object item = radar(BotFactory);
item.factory(WheeledGrabber, progfunc("SecondBot"));
}
2013-05-19 16:56:08 +02:00
krzys-h
b9d0ee034e
Running program in robots created using object.factory()
2013-05-19 16:27:33 +02:00
krzys-h
7662f312b3
Changed "Inappropariate bot"->"Inappropariate object" in newly added functions
2013-05-18 18:29:07 +02:00
krzys-h
b65196c17f
Change in goto() for Destroyer
2013-05-18 18:22:18 +02:00
krzys-h
58cc0603cc
Fix for build() not being able to build Detroyer
2013-05-18 18:04:48 +02:00
krzys-h
796cb92ffc
Added object.destroy()
2013-05-18 18:04:48 +02:00
krzys-h
d0de6a88ba
Renamed destroy() -> delete()
2013-05-18 18:04:48 +02:00
krzys-h
8004e68948
Added object.busy()
2013-05-18 18:04:48 +02:00
krzys-h
47d7b80507
Added object.factory(cat)
2013-05-18 18:04:48 +02:00
Piotr Dziwinski
07839a561f
Unicode symbols for special characters
...
* added support for special characters from original text bitmaps
2013-05-12 18:38:01 +02:00
krzys-h
61841b3f40
Backwards combatibility for retobject() ( #209 )
2013-05-12 15:54:35 +02:00
krzys-h
1f77efb9cb
Fixed bug with std::bad_alloc when using produce()
...
I'm not sure why it wasn't happening before, but it's fixed :)
2013-05-12 15:38:09 +02:00
krzys-h
c25b6ab472
Fix for #192
2013-05-12 15:23:26 +02:00
krzys-h
04f747b00b
Added simple texturepack support ( #208 )
2013-05-12 14:55:41 +02:00
krzys-h
06cf93f466
Better print fix
2013-05-12 13:05:32 +02:00
Piotr Dziwinski
cec406ea31
Non-power-of-2 padding for background images
...
* added padding options
* removed old hardcoded image sizes
2013-05-11 23:12:13 +02:00
Piotr Dziwinski
dcf4c8941f
Corrected print
2013-05-11 23:11:58 +02:00
Piotr Dziwinski
f7f6e10c70
Added check and warning about non-power-of-2 textures
2013-05-11 21:40:09 +02:00
Piotr Dziwinski
cc8ed2979b
Fixed deleting of CObjectManager
...
* fix in CApplication destructor
* re-enabled unit tests
2013-05-11 21:22:03 +02:00
krzys-h
40954038ab
Added error message for undefined command
2013-05-05 20:51:08 +02:00
krzys-h
4dcee0a4d1
Added continue at end of every Cmd() check
...
As mentioned in issue #173
2013-05-05 20:38:20 +02:00
krzys-h
dbcc2c61f9
Added Build and Research constants
2013-05-05 20:10:36 +02:00
krzys-h
fcb052cc8d
Added [set/get][build/research[done/enable]] ( ); function fo CBot
...
* setbuild ( );
* setresearchdone ( );
* setresearchenable ( );
* getbuild ( );
* getresearchdone ( );
* getresearchenable ( );
2013-05-05 14:44:51 +02:00
krzys-h
78e32cf894
Changed MissionController version requirement 3->2
...
Also, adding it before BeginObject isn't wrong, and now recommended because it disables Audio and EndMissionTake commands
2013-05-05 13:43:05 +02:00
krzys-h
9549359b46
Fix for saving wrong Fullscreen value
2013-05-04 20:13:27 +02:00
krzys-h
6333d2d38e
Removed most of "No such node" messages
2013-05-04 11:56:03 +02:00
krzys-h
c3e95d40a2
Added relative install paths for MXE build
2013-05-03 22:23:36 +02:00
krzys-h
26c92d074d
Fixed "ptree is too deep"
2013-05-03 21:39:02 +02:00
krzys-h
64ebda0ab9
Added creating ini file with default values
2013-05-03 21:35:33 +02:00
erihel
5a31a93610
Changed log level in profile.cpp to error
2013-05-03 21:33:19 +02:00
erihel
3c442d17dc
Fix for issue #202 with 3D sound disabled
2013-05-03 21:12:39 +02:00
krzys-h
f68581a3ae
Improved log levels of trace control
2013-05-03 12:26:26 +02:00
krzys-h
1250f889d9
Improved MissionController movement a little bit
2013-05-02 20:59:20 +02:00
krzys-h
02b65fecd3
Fixed Destroyer button
...
* Commands were executed for all Destroyers on map
* Button can't be clicked when Destroyer is working
2013-05-02 19:17:17 +02:00
krzys-h
8a1e4b1e5f
Added button for Destroyer
...
Issue #142
2013-05-02 17:55:53 +02:00
krzys-h
166a6b4403
Improved music cache
2013-05-02 16:37:11 +02:00
krzys-h
56709f0e56
Small changes to looping main menu music
2013-05-02 10:58:38 +02:00
krzys-h
d9f1b4f69d
Added CacheAudio to level files
2013-05-02 10:53:18 +02:00
krzys-h
c1db140ad3
Updated Main Mnu music
...
For now only code - we need to wait for PiXeL to give us new music :)
2013-05-02 10:44:07 +02:00
krzys-h
fb5d14dddf
Functions playmusic(filename, repeat) and stopmusic()
...
for MissionController
Parameter repeat can be 0 or 1
2013-05-01 22:11:08 +02:00
krzys-h
07374db2a3
Increased maximum font size
2013-05-01 21:32:40 +02:00
krzys-h
d815fbf09e
Saving information to profile ( #154 )
2013-05-01 21:02:43 +02:00
krzys-h
23e3e552f3
Made colobot.ini & savegame dir location depended on build type
...
For Debug, it's current dir
For Release it's like it was before
Made on @CoLoRaptor's request :)
2013-05-01 19:44:55 +02:00
krzys-h
9e1870f6bd
Removed some warnings
...
+ fix for previous commit
2013-05-01 13:19:10 +02:00
krzys-h
293376b82d
Removed sound081.wav
...
It wasn't used in Colobot and caused errors because we removed it from data package.
2013-05-01 12:47:06 +02:00
krzys-h
f419293207
Minor refactoring
2013-05-01 12:12:32 +02:00
krzys-h
643153d64d
Added function endmission()
...
Works only with MissionFile version=3
Created for MissionController, but works on any bot
- 1st parameter:
* ResultWin - win mission
* ResultLost - lost mission
* ResultLostQuick - lost mission (Me died)
- 2nd parameter: win/lost delay, like in mission file. Doesn't work for ResultLostQuick.
Please don't use for cheating =)
2013-04-30 21:43:59 +02:00
krzys-h
75950c55ba
MissionController improved
2013-04-29 17:26:32 +02:00
krzys-h
c2932f4ee3
Added new Intro music (by PiXeL)
2013-04-29 15:33:28 +02:00
erihel
2ba146cd63
Fixed problem with test compilation
...
Altered test cmake files to fix linker problem.
Changed tga to png in pyro.
Changed enum in CMotionDummy.
2013-04-29 14:29:12 +02:00
erihel
64162a0e6f
Merge branch 'fix-for-shadows' of https://github.com/xiendev/colobot into xiendev-fix-for-shadows
2013-04-29 14:20:07 +02:00
XienDev
d425e09186
Merge branch 'shadow-bug' into fix-for-shadows
2013-04-29 13:55:02 +03:00
XienDev
658ebe015f
Fix for shadows (bugs #176 and #132 )
2013-04-29 13:51:37 +03:00
krzys-h
5fd64624d3
Fix for game crashing sometimes when using MissionController
2013-04-28 20:24:46 +02:00
erihel
919b0e8114
Merge branch 'dev' of github:colobot/colobot into dev
2013-04-28 20:09:41 +02:00
krzys-h
c7d289c00b
Beggining of MissionController
...
Controling mission using CBot
2013-04-28 20:05:19 +02:00
krzys-h
fc28a8e840
Implemented EndMissionNever ( #181 )
2013-04-28 18:33:59 +02:00
XienDev
6a4ac9ce16
Added functions "canbuild(category)" and "buildinfo(category)"
...
Also fixed issue with undefined behaviour of build(category) function
2013-04-28 16:49:48 +03:00
erihel
5669053de0
Some code refactoring
...
Changed vehicule (french) to vehicle (english) in enums and variables
2013-04-27 17:50:30 +02:00
XienDev
41fb814e99
Added build
...
Third patch
2013-04-27 18:11:26 +03:00
krzys-h
4f1e000cea
Fix for #167 when starting mission
...
+ various fixes
2013-04-27 13:43:01 +02:00
erihel
a693e87293
* Patch for issue #167
2013-04-27 13:03:20 +02:00
erihel
45f06cec51
* Fix for issue #71 : division by zero on init resulted in bad value after
2013-04-26 16:51:17 +02:00
erihel
adb4b06550
* Issue #173
2013-04-26 15:55:06 +02:00
erihel
1828e60c92
* Changed order of reading Audio and AudioChange (issue #173 )
2013-04-26 15:34:02 +02:00
erihel
88478990b9
* Fix a problem with CleanUp function trying to clean up music cache twice
2013-04-26 14:15:11 +02:00
Erihel
eb37da86ce
Merge pull request #187 from xiendev/Programs-list-size
...
Fixes size of a programs list control
2013-04-26 04:56:58 -07:00
XienDev
02cb9a6993
Fixes programs list size
2013-04-25 22:11:36 +03:00
XienDev
b8d2ce2e4e
Welcome screen blinking fix
2013-04-25 22:05:27 +03:00
erihel
6a1dba0f15
* Resetting arm position on abort for sniffer (issue #162 )
2013-04-23 12:05:04 +02:00
erihel
1932cfbfd0
Merge branch 'dev' of github:colobot/colobot into dev
2013-04-20 19:42:05 +02:00
erihel
32fdf993ea
* Changed order of libs in cmake for clipboard
2013-04-20 19:41:39 +02:00
krzys-h
364482f022
Fix for #180 (bug in commit dd180dd887
)
2013-04-20 15:17:40 +02:00
krzys-h
dd180dd887
Added powermin= and powermax= parameters
...
Issue #174
2013-04-20 12:08:48 +02:00
krzys-h
81fcde4d67
Fix for "Ability to select the object in Vault"
...
Issue #170
2013-04-20 11:17:21 +02:00
krzys-h
ec68802136
Fix for not saving robot programs
...
It was Windows-only bug.
issue #137
2013-04-20 10:57:42 +02:00
krzys-h
90c691ab0f
Small fix to music cache
2013-04-20 09:33:54 +02:00
erihel
af24aba899
* Key repeating in edit fields
2013-04-18 21:02:25 +02:00
krzys-h
6ea0031d83
Added loading from custom files for Audio
2013-04-13 16:35:35 +02:00
krzys-h
cdba398d29
Added music files cache
2013-04-13 16:34:52 +02:00
krzys-h
e3b92fb9d8
Some optimalizations to AudioChange
2013-04-13 15:07:27 +02:00
krzys-h
ebffda717b
Implemented AudioChange (partially)
...
There is some issues due to #173
Issue #172
2013-04-13 11:44:16 +02:00
krzys-h
69e52e5f24
Removed find() & repeat() functions
...
Issue #168
2013-04-12 23:28:44 +02:00
krzys-h
7b2e0e6519
Added cheats "all" & "allbuildings" ( #163 )
2013-04-12 22:53:03 +02:00
erihel
8a0383c9f0
* More work on sound
2013-04-12 01:46:30 +02:00
erihel
82fdc2ba23
* Fixed problem with 2D sound mode
2013-04-11 23:16:32 +02:00
erihel
bc760e3513
* Added X11 to libs in CMakefiles for linux build
2013-04-11 21:55:49 +02:00
erihel
593be3b776
* Fix for bad file listing (issue #60 )
2013-04-11 21:37:19 +02:00
erihel
b0919139bd
* Fix for issue #161 : function checking for radar didn't check if it's finished
2013-04-11 15:34:03 +02:00
erihel
01309c8bd0
* Added clipboard support (issue #60 )
...
* Fixed keyboard shortcuts while code editing in game
2013-04-11 13:37:15 +02:00
erihel
99d386b61a
* Fixed problem with MuteAll and some sounds not playing after muting other sounds (like game menu sound)
2013-04-09 13:20:31 +02:00
erihel
a66abd4990
* Loading 3D sound settings from profile
2013-04-09 12:20:40 +02:00
erihel
7146cf8ee6
* Issue #60 : Fix for "(null)" instead of time on windows platform
2013-04-08 12:58:00 +02:00
erihel
846e7b6578
* Adjusted pan computing function from original game (2D sound should work correctly)
...
* Set max sound distance to 110.0f to match original colobot (for issue #123 )
2013-04-08 01:42:12 +02:00
erihel
7513bc5864
* Set distance model to fix issue #123
2013-04-07 16:26:15 +02:00
erihel
f4b1cabbde
* Sound are too quiet in 3D mode, for now added support for 2D sound option in menu. In 2D mode sounds are normal (Issue #123 )
2013-04-07 13:35:39 +02:00
erihel
926126d5ad
* Changed loading of scene and player info (there's problem with locales using , as comma separator). Issue #137
...
* Changed way of saving files. Now it's not based on slot (from 000 to 999) but it uses save name as a base.
* Changed way of displaying saved games. Listing directory instead of checking from 000 to 999. Issue #138
2013-04-01 18:24:12 +02:00
krzys-h
9485e1a95f
Improved log levels
2013-04-01 12:58:55 +02:00
Piotr Dziwinski
ff97de5477
Fixed graphics objects after reset
...
Should fix #120 and perhaps some other bugs as well
2013-03-31 13:06:38 +02:00
krzys-h
0d70b6e2f8
More parameters to destroy()
...
Also, removed some warnings in script.cpp
2013-03-31 12:04:12 +02:00
krzys-h
2f7ff844d3
Small fix to CObject::ExploObject
2013-03-31 11:15:45 +02:00
krzys-h
a6d68d58e5
And it compiled and worked? o.O
2013-03-31 10:26:37 +02:00
krzys-h
0625f064a7
Merge branch 'dev' of github.com:colobot/colobot into dev
2013-03-31 10:22:08 +02:00
krzys-h
90301e24c0
Added field "item" to class "object" in CBot
2013-03-31 10:21:22 +02:00
erihel
5a60a7a219
Merge branch 'dev' of github:colobot/colobot into dev
2013-03-30 16:04:58 +01:00
erihel
b7b5f002a6
* Removed warning while compiling brain.cpp
...
* Fix for issue #130
* Fix for issue #128 with wrong sound pitch
2013-03-30 16:03:25 +01:00
krzys-h
845c8e9437
Merge branch 'dev' of github.com:colobot/colobot into dev
2013-03-30 15:43:39 +01:00
krzys-h
040a7e8f24
Added function destroy(rank)
2013-03-30 15:43:09 +01:00
Piotr Dziwinski
e607fed265
Fixed power cell bug ( #120 )
2013-03-30 14:45:55 +01:00
krzys-h
8777c126de
Added SatCom translations
2013-03-29 10:03:35 +01:00
krzys-h
b284fd74f3
Changes to fix multilanguage on Windows
...
Issue #118
2013-03-28 15:59:13 +01:00
krzys-h
8659fb984f
Added option to lock SatCom
2013-03-27 22:20:50 +01:00
krzys-h
c6d89f6210
Revert "Fix for #30"
...
This reverts commit bfdd52ade0
.
That wasn't working. :(
2013-03-27 21:58:34 +01:00
krzys-h
bfdd52ade0
Fix for #30
2013-03-27 21:37:37 +01:00
Piotr Dziwinski
8301a3639b
Moved boost flags to CMakeLists
2013-03-27 20:54:04 +01:00
krzys-h
672abbbbca
Removed "X" button
2013-03-27 20:38:36 +01:00
krzys-h
3402219438
Changed savegame & profile dir on Windows
2013-03-27 20:24:05 +01:00
krzys-h
8f379e5cf1
Changes to Scribbler interface
2013-03-27 19:55:27 +01:00
krzys-h
0691460682
Added button for grab()/drop() for AlienWasp
2013-03-27 15:30:34 +01:00
erihel
e93ed747c2
* Another define to fix linker problems
2013-03-27 15:13:51 +01:00
Didier Raboud
4c1a7057bb
Add Linux-specific savegame and profile settings according to the XDG Base Directory Specification
...
http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
2013-03-27 10:29:58 +01:00
Didier Raboud
991dbd1e37
Add profile and savegame fetchers in SystemUtils
...
This breaks the tests compilation. :/
2013-03-27 10:20:06 +01:00
krzys-h
df5edc703c
Added interface button for AlienSpider explosion
...
Issue #142
2013-03-26 15:33:54 +01:00
krzys-h
43c39f60cd
Added option "zoom=x;y;z" to CreateObject in mission files
2013-03-25 16:12:18 +01:00
krzys-h
5810fdd717
In Retro mode, robot's lights always blink.
2013-03-24 21:31:31 +01:00
krzys-h
f4e222248f
Retro mode now disables possibility of writing and running programs
2013-03-24 19:05:20 +01:00
krzys-h
5deb68e698
Small fix in mission files code
2013-03-24 16:35:00 +01:00
krzys-h
5eb4e10c2b
Reverted "Fix for issue #149"
...
because it was broken again after commit 7ebba6abaa
2013-03-24 16:05:21 +01:00
Piotr Dziwinski
195d6cded0
Fixed timer functions on win32
...
* changed win32 implementation to QueryPerformaceTimer system function
* refactored system utils code
* proper tests for time utils and update event creation in application
* should fix issue #134
2013-03-24 12:00:12 +01:00
erihel
7ebba6abaa
* Changed ending screen (issue #129 )
2013-03-23 21:22:44 +01:00
erihel
956efb1feb
* Blocked cheat input in SatCom, intro movie and while editing cbot (issue #130 )
2013-03-23 20:33:14 +01:00
krzys-h
25c3ba0d3b
Basic detection of syntax errors in mission levels
...
+ option to enable Retro mode (for now doesn't do enything)
2013-03-23 19:06:49 +01:00
Piotr Dziwinski
4a30800cf1
Fixes for compiling on MSYS
...
* fixed SDL_main() and putenv() issues
* disabled desktop subdir for MSYS
* disabled building CBot_console for now
2013-03-22 19:17:08 +01:00
erihel
1406464f0c
* Changed Set/Get HilateCap to Set/Get HighlightCap
...
* Changes ReadText in CEdit to fix problem with SatCom links
* Filenames when loading/saving scripts should be fixed on mxe
2013-03-20 21:50:44 +01:00
erihel
64be7a5df6
* Fix for mxe with boost path
2013-03-20 20:27:19 +01:00
Piotr Dziwinski
3bb83e5595
Changed Linux time function
...
With CLOCK_MONOTONIC_RAW, the timer should never go back in time.
2013-03-19 23:08:39 +01:00
Piotr Dziwinski
025bedecfb
Refactored platform-specific code
...
Moved functions from .h to .cpp files
2013-03-19 23:07:39 +01:00
erihel
4abcaae0f7
* Changes std::stoi to atoi as gcc does not support it on windows platform
2013-03-17 23:16:26 +01:00
erihel
0cd64113aa
* Implemented CStudio::UpdateDialogList() function for listing saved files
2013-03-17 20:23:57 +01:00
erihel
e5aadfdaac
Merge branch 'dev' of github:colobot/colobot into dev
2013-03-17 19:05:29 +01:00
erihel
d6bbc99c90
* Changed file loading to fix issue #73
...
* Moved few functions from misc.cpp to profile.cpp (used to set/get user dir)
* Removed some warnings
* More work to change const char* to std::string
* Some work on file path to fix issue #60 with bad slashes on POSIX platform
2013-03-17 19:01:32 +01:00
krzys-h
f88e74f887
Fix for issue #129
...
Text on exit screen is improperly placed
2013-03-17 15:05:53 +01:00
erihel
9f5bef030d
* Adjusted sound volume to game settings
...
* Added fabs to remove logs about pitch having negative values
2013-03-14 23:03:03 +01:00
erihel
6c783b9033
* Fix for issue #122 with sound not being played in menu after playing mission
2013-03-14 21:30:32 +01:00
Piotr Dziwinski
bc859c4c59
VBO override option; argv parsing using getopt
...
* added -vbo option to override autodetection of OpenGL VBO extension
* refactored argument parsing to use getopt()
* fixed failing UTs
2013-03-10 15:44:21 +01:00
krzys-h
1f565fdf38
"allmission" default value depends on build type
2013-03-09 15:28:36 +01:00
krzys-h
37a095b5b6
MORE improvements to produce()
2013-03-01 21:56:52 +01:00
krzys-h
0864e44c7b
Fix for #135
...
jet() parameter > 1
2013-03-01 21:36:38 +01:00
Piotr Dziwinski
f729686539
Fixed segfault in light manager
...
Also fixed minor memory leak
2013-02-28 22:56:44 +01:00
Piotr Dziwinski
08c646bb92
Fixed stupid error, tweaked ambient light colors
...
* fixed stupid error in light manager
* tweaked ambient light colors to 0.1 of diffuse;
colors should not be oversaturated now
2013-02-28 22:06:22 +01:00
Piotr Dziwinski
b361d27d33
Removed unnecessary print
2013-02-28 20:29:16 +01:00
Piotr Dziwinski
b0d86ebe5a
Better light sorting
...
Should fix lighting issue (#62 )
2013-02-25 21:58:01 +01:00
erihel
3a594dc3a8
* Changed AdjustFrequency formula
...
* Changed SetVolume to match orginal game formula
2013-02-24 18:04:38 +01:00
erihel
ba2df2cb42
* Fix for satcom freeze
2013-02-24 01:40:55 +01:00
Piotr Dziwinski
64af5f5be0
Reverted RotateAngle to old formula
...
This should solve incontinuities in angle calculations, possibly
fixing the "teleportation bug"
2013-02-21 12:26:01 +01:00
krzys-h
c42515927e
Music restarting on PHASE_WELCOME2
2013-02-17 13:28:04 +01:00
krzys-h
c79c176e46
Show compilation date in main menu
2013-02-17 13:20:18 +01:00
Piotr Dziwiński
001d37b257
CInstanceManager refactoring
...
* removed classes managed by CInstanceManager
except for CObject, CPyro, CBrain and CPhysics
because of dependencies
* refactored instance searching to use existing singleton instances of
CApplication, CEngine and CRobotMain and calling their getter
functions
2013-02-17 12:11:56 +01:00
krzys-h
5d331f37ae
Another small fix.
...
I'm a noob. Sorry.
2013-02-14 17:26:01 +01:00
krzys-h
945299ae5d
Small fix
2013-02-14 17:23:26 +01:00
krzys-h
e2d0f44961
More fixes to produce()
...
Now every object can be created.
2013-02-14 17:18:04 +01:00
krzys-h
de228f57e8
Small fix in produce()
2013-02-14 16:04:52 +01:00
krzys-h
89a272cf87
produce() extended
2013-02-14 15:48:02 +01:00
krzys-h
59a40088a5
Merge pull request #125 from PaweX/dev
2013-02-13 11:26:17 -08:00
krzys-h
8658d6da80
Added Destroyer from Ceebot-Teen.
...
We need a new icon for it.
2013-02-13 16:58:19 +01:00
PaweX
86b302eb17
Added cAim(CBotVar* &var, void* user)
2013-02-13 16:20:35 +01:00
PaweX
4128383ee1
Update src/script/script.cpp
2013-02-13 14:04:24 +01:00
PaweX
bcd06bd0e8
Function aim(x, y) - "Giv" to "Get"
2013-02-13 13:56:50 +01:00
PaweX
f25aed44d2
aim(x,y) - "Giv" to "Get"
2013-02-13 13:48:56 +01:00
PaweX
551d6c4d95
Additional parameter for function aim(x, y).
2013-02-13 02:59:40 +01:00
PaweX
34e758a9da
Additional parameter for function aim(x, y)
2013-02-13 02:44:43 +01:00
PaweX
c26c063c5f
Additional parameter for function aim(x, y).
2013-02-13 02:36:20 +01:00
PaweX
34a008a49d
Additional parameter for function aim(x, y).
2013-02-13 02:32:41 +01:00
adiblol
d3106c73ff
More camera distance from AlienQueen
2013-02-11 22:59:51 +01:00