1c947f9a80
Renamed some phases to more meaningful names
2015-07-19 23:11:41 +02:00
a2f1aa195b
Combined all level list phases into one, removed PHASE_TERM
2015-07-19 23:07:57 +02:00
347654db15
Refactored CBot class "file" to PHYSFS
2015-07-19 22:34:41 +02:00
0554a77813
Refactor reading "object" class in CBot
2015-07-19 21:53:08 +02:00
8c87eedd28
Fixed huge lag on closing settings
...
Introduced in 02c24fbf27
2015-07-19 21:35:55 +02:00
d3c3f47b19
Fixed particle rendering ( #518 )
...
Introduced in 5a1c6d19ff
2015-07-19 21:17:58 +02:00
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
73536290b2
Fix for incorrect compile flags in colobot-lint
2015-07-19 18:11:12 +02:00
963fa15a1c
Fix for #516
2015-07-19 16:43:03 +02:00
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
ffb387f8af
Changed scene loading to use CPlayerProfile for paths
2015-07-19 16:05:09 +02:00
7dc3e90e41
CPlayerProgress -> CPlayerProfile
2015-07-19 16:05:09 +02:00
02c24fbf27
CProfile -> CConfigFile
2015-07-19 16:05:09 +02:00
644f5b4d7f
Corrected some problems with dynamic shadows
2015-07-19 00:07:59 +02:00
e2691d943c
Fixed #346
...
Thanks @erihel
2015-07-18 23:16:14 +02:00
3e1fc06d6c
CPlayerProgress
...
Extracted most operations on user profile from CRobotMain and CMainDialog to a dedicated class
2015-07-18 23:14:20 +02:00
86f473ac16
Finished support for up to 999 chapters and levels
2015-07-18 19:48:25 +02:00
ea9361fbb4
LevelCategory enum
2015-07-18 19:45:40 +02:00
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
1d69021e94
Potential fix to #511
2015-07-18 02:02:38 +02:00
25eaf8f72f
Add MakeUniqueArray for array types
2015-07-17 20:57:12 +02:00
b3b6435039
Use MakeUnique with level parser classes
2015-07-17 20:38:21 +02:00
35043e04de
Addressed commit comments on a872ea128b
2015-07-17 20:29:53 +02:00
a872ea128b
Add MakeUnique template to avoid use of naked new
2015-07-17 20:06:59 +02:00
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
dffeff929e
Removed manual memory management in CBrain in program list
2015-07-17 19:53:17 +02:00
5e44092144
Fixed brain.cpp compilation under MSVC
2015-07-17 17:01:31 +02:00
2ef68cf12d
Fixed Polish translations for Scribbler
2015-07-17 11:59:44 +02:00
14f784646b
Refactored Scribbler recorder to std::string
2015-07-17 11:52:11 +02:00
82247e75fc
Fixed a crash
...
This replaced more than I throught
2015-07-16 22:27:25 +02:00
9e19d8433c
Removed old CBot-related files
2015-07-16 22:17:54 +02:00
aa0946f4ba
Fixed line endings in pathman.cpp
2015-07-16 22:15:22 +02:00
999c35e46b
Fixed Alt+Enter starting not runnable programs, fixes #510
2015-07-16 22:12:44 +02:00
c8f6e8124e
Replaced CLogger::GetInstancePointer() calls with GetLogger()
2015-07-16 22:12:44 +02:00
c115d72d71
More TraceColor refactoring
2015-07-16 22:09:50 +02:00
2b9811d225
Movie lock refactoring
2015-07-16 22:09:50 +02:00
6dcf4dffa6
Refactor CSNDFile -> CSNDFileWrapper
...
This seems more consistent
2015-07-16 21:47:48 +02:00
8ca77f27a1
Extracted CSDLFileHandler from CResourceManager
...
This also possibly fixes some rare error cases (e.g. #439 )
2015-07-16 21:13:38 +02:00
8a72f0a849
Addressed commit comments on a0e0ee3631
2015-07-16 20:09:06 +02:00
a0e0ee3631
Separate shortcut bars for teams
2015-07-16 13:46:40 +02:00
f581d87474
Fix double increment bug in OpenAL channel allocation
2015-07-16 07:16:55 +02:00
c8498548cc
Remove manual memory management in oalsound
...
Plugging a few more memory leaks detected by valgrind
2015-07-15 22:43:30 +02:00
83f3cfa6e0
Fix some memory problems reported by valgrind
...
Also remove some manual memory management
2015-07-15 20:23:21 +02:00
31bc740f4b
Fix focusing issues with controls and cheat console
2015-07-15 19:11:48 +02:00
61ea372e51
Fixed enemy ruins not becoming neutral on destruction
2015-07-15 18:49:15 +02:00
80963f1a2b
Added global magnifyDamage setting
2015-07-15 18:15:26 +02:00
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
9af1422589
Fix setting wrong explosion type
2015-07-14 22:14:14 +02:00
730319ba20
Fixed Robby (OBJECT_TOTO) animations
2015-07-14 21:40:07 +02:00
d5da68d59a
Refactor old Get/SetAngle/Zoom -> Get/SetPartRotation/Scale
2015-07-14 21:35:43 +02:00
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
a1a96c62ab
Fixed system mouse setting
2015-07-14 21:03:40 +02:00
1183ed1980
Refactor old Get/SetPosition -> Get/SetPartPosition
2015-07-14 19:40:39 +02:00
7c229b4e83
Fix reading new model format with CRLF line endings
2015-07-14 19:40:07 +02:00
3f41555a61
Better exception handling in CRobotMain
2015-07-14 18:46:22 +02:00
0d1b97510d
Add exception handling when creating new objects on level loading
2015-07-14 18:28:42 +02:00
62fddd6d4f
Made pendown() trace opaque
2015-07-14 17:38:29 +02:00
5a1c6d19ff
Removed unused particle types
2015-07-14 14:16:19 +02:00
4506a4b8bd
TraceColor enum
2015-07-14 13:53:50 +02:00
fdc0081bb8
Fix checking boolean like int
2015-07-13 23:04:11 +02:00
62fdfc9f92
Refactor ResetCap -> AnimateOnReset
2015-07-13 22:47:11 +02:00
20dbb8320b
Remove unused reset code
2015-07-13 22:46:51 +02:00
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
78f4749134
Disallow controlling enemy objects from CBot
2015-07-13 18:53:56 +02:00
0e66104829
Hacked CBot engine to get pointers to CObject* in calls to class members
2015-07-13 18:40:13 +02:00
79c131394d
Separate DoneResearch for teams
2015-07-13 18:13:28 +02:00
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
38a0849e10
Added system mouse option
...
This reverts commit e21853d632
2015-07-13 12:11:11 +02:00
6e404f5aa2
Better mouse scaling on widescreen resolutions
2015-07-13 11:58:52 +02:00
9023aac960
Fix for #504
2015-07-12 20:49:00 +02:00
6c7a79de5a
Fix for #503
2015-07-12 20:44:46 +02:00
e72936c240
Clean up more functions from COldObjectInterface
2015-07-12 20:05:12 +02:00
394f911d7b
Remove unnecessary #include "object/object.h"
2015-07-12 14:23:18 +02:00
3ed8980c46
Make CTask classes use COldObject
2015-07-12 14:22:12 +02:00
45302a3f4e
Make CPhysics and CBrain use COldObject
2015-07-12 14:19:09 +02:00
2c474d7c06
Make CMotion classes use COldObject
2015-07-12 14:01:14 +02:00
16883fcdc4
Make CAuto classes use COldObject
2015-07-12 14:01:07 +02:00
fdb594b9f7
Fix crash when replacing power cell
2015-07-12 13:19:41 +02:00
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
4dc40a8853
Fix missing curly braces
2015-07-12 12:38:25 +02:00
37b0d5796d
Fix PNGSaveSurface not closing file sometimes
2015-07-12 12:33:30 +02:00
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
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
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
03717e11d4
Added aspect ratio in resolution list ( #501 )
2015-07-11 23:53:25 +02:00
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
639de56e6c
Fixed file.readln() help file
2015-07-11 18:36:36 +02:00
6dcef71802
GlobalSphere -> CameraCollisionSphere refactoring
2015-07-11 13:52:04 +02:00
f4b2f3468d
CPoweredObject interface
2015-07-11 13:38:27 +02:00
36d08e852c
Better splashscreen scaling on widescreen resolutions
2015-07-11 12:57:18 +02:00
0a85fae9b5
Fix crash in appearance menu
2015-07-10 23:58:53 +02:00
9537048964
Cleaned up GetHelpFilename
2015-07-10 23:30:11 +02:00
4c10730f87
CCarrierObject interface
2015-07-10 23:16:55 +02:00
8d5ddd848d
CJostleableObject interface
2015-07-10 23:04:30 +02:00
5d30de0d09
CProgrammableObject interface
2015-07-10 20:46:33 +02:00
17ae31e639
Added 'speed ###' cheat for changing simulation speed to arbitrary value
2015-07-10 20:45:50 +02:00
24db675d3f
Added x6 speed option
2015-07-10 20:17:00 +02:00
0dfbb00491
Remove unused variable
2015-07-10 19:55:18 +02:00
93479af188
CTransportableObject interface
2015-07-10 19:51:49 +02:00
52f809b8bb
Removed cmdline limit
2015-07-10 13:40:29 +02:00
b84130e067
Fix not updating track texture mapping
2015-07-10 12:22:00 +02:00
ad08d50bea
Renamed some CAuto and CMotion classes
2015-07-10 12:18:21 +02:00
26619e3f88
Removed old level parser functions (cmdtoken.cpp)
2015-07-10 11:51:59 +02:00
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
c63efeca46
Fixed EndMissionTake conditions (again)
2015-07-10 10:45:30 +02:00
d3c3a51ede
Don't open joystick if it's not enabled in ChangeJoystick
2015-07-10 10:28:04 +02:00
20a367783b
Added joystick settings in colobot.ini
2015-07-10 10:25:31 +02:00
7e41e9fe23
Refactored keybindings storage
2015-07-10 10:11:40 +02:00
3d5bc5c563
Fixed unused variable warnings
2015-07-10 10:11:40 +02:00
b0ac2f8326
Refactor CObject interface related to crash spheres
2015-07-10 09:38:53 +02:00
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
bd4a661a06
Made autosave timer independent from simulation speed, closes #485
2015-07-09 23:23:38 +02:00
b7c3a8a30b
Don't hardcode script4Runnable=in exercises, closes #493
2015-07-09 23:09:08 +02:00
978fc8f1fb
Remove program limit in scene files, closes #494
2015-07-09 23:01:18 +02:00
c585922a45
Use boost::lexical_cast instead of std::to_string
2015-07-09 22:53:58 +02:00
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
9b232ee3f5
Sound enum refactoring
...
* rename Sound -> SoundType
* add parsing string to SoundType
2015-07-09 21:32:25 +02:00
c84ce92a86
Fixed F12 debug screen background
2015-07-09 18:50:11 +02:00
dae7cdf229
Fixed build() particles
2015-07-09 18:45:52 +02:00
7c20bb4bf6
Fixed counting of nautral objects in EndMissionTake
2015-07-09 18:28:09 +02:00
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
1361473358
Renamed Mission -> Level, MissionController -> LevelController
...
As suggested by @CoLoRaptor
2015-07-08 20:20:46 +02:00
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
b75ab7d8f6
Fixed radar() detecting neutral objects as enemies
2015-07-07 22:27:44 +02:00
b0b313f707
Fix for issue #492
2015-07-07 21:36:37 +02:00
a6ccd7f270
Added TeamName
2015-07-07 21:25:44 +02:00
5da4adad41
Added Any constant in CBot
2015-07-07 19:01:18 +02:00
79c5fabfe6
Support for team filters in radar()
2015-07-07 18:54:36 +02:00
9a873c9bea
Added object.team in CBot
2015-07-07 18:11:28 +02:00
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
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
a32efc09a2
Refactored EndMissionTake and AudioChange
2015-07-07 16:17:19 +02:00
958ef43c1e
Address review remarks, fix names and errors in code.
2015-07-06 22:00:33 +03:00
b3c2d2c450
Set CBotVar::m_binit type to specific enum instead of plain int.
2015-07-05 23:39:55 +03:00
f1684f85be
Introduce new CObject base class and mixin class framework
2015-07-02 23:50:50 +02:00
80d93c0fea
Fix comment changed by mistake
2015-06-30 18:47:35 +02:00
f6bc8f94bf
Rename fret/truck to cargo/transporter
2015-06-29 23:11:02 +02:00
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
c7ccb29d6a
Removed spoiler from tooltip in options menu ( fixes #489 )
2015-06-28 23:07:42 +02:00
ac291f5bea
Fix for issue #488
2015-06-28 21:05:12 +02:00
f871ba4729
Create CExchangePost subclass
2015-06-27 23:22:55 +02:00
1ccb807091
Fix for issues #486 and #487
2015-06-27 18:06:49 +02:00
78e09c757d
Basic support for teams and code battle missions
2015-06-26 22:07:55 +02:00
2a672482a5
Vault now locks only objects created during level loading ( fixed #164 )
2015-06-26 20:19:16 +02:00
195667ab2c
Potential fix for rendering problems in OpenGL 2.1 engine under Linux
2015-06-26 19:55:46 +02:00
4fc8364136
Fixed Destroyer object destruction ( fixes #308 )
2015-06-26 19:20:16 +02:00
2509f99776
Fixed program arguments not being parsed on restart ( #483 )
2015-06-26 18:51:39 +02:00
efd0b2b28f
Corrected energy cell's angle when created with robot
2015-06-26 18:07:54 +02:00
ba3c049077
Corrected problem with loading level background images
2015-06-26 14:32:44 +02:00
88ec9aaae3
Drop GCC 4.6 support
2015-06-26 00:24:32 +02:00
7e21d3bd79
Get rid of some more manual memory management
2015-06-26 00:24:05 +02:00
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
7814c0c7bd
Remove unused field "material" from CObject class in CBot
2015-06-25 18:07:48 +02:00
37e2f24fbc
Corrected small rendering problem
2015-06-25 11:47:42 +02:00
3cc2857372
Small corrections in MSAA implementation
2015-06-22 23:42:01 +02:00
90bf51ba54
Possible fix for #458
2015-06-22 22:53:55 +02:00
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
7ae308cc75
Fix saving addresses instead of data in user profile
2015-06-22 21:25:00 +02:00
f2318803e5
Added Multisample anti-aliasing (MSAA)
2015-06-22 00:56:47 +02:00
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
5f1d3c21d4
Fix some more warnings reported by Clang
2015-06-21 19:46:01 +02:00
2d623b4427
Fix introduced compilation warnings
2015-06-21 19:38:07 +02:00
dabfdf1ea0
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2015-06-21 18:51:24 +02:00
7d57ec634e
Refactored framebuffer implementations
2015-06-21 18:48:31 +02:00
2513052260
Fix setting position of power cells
2015-06-21 16:29:46 +02:00
304542afe2
Some syntax sugar for iterating through all objects
2015-06-21 16:22:09 +02:00
0c9a9bce98
Proper CObject lifetime management
...
CObjectManager is now the only class responsible for storing CObjects
2015-06-21 15:13:55 +02:00
fed67e6640
Rename objman.h/cpp -> object_manger.h/cpp
2015-06-20 20:02:40 +02:00
94851c2694
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2015-06-20 20:02:11 +02:00
ec3069eea7
Defaulted shadow color value to 0.5
2015-06-20 20:02:06 +02:00
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
74a31c9fb4
Corrected compilation errors on Linux builds
2015-06-16 19:30:35 +02:00
ff44637d49
Removed VBO override switch and some unnecessary code
2015-06-16 18:00:42 +02:00
26ec927b37
Corrected compilation errors and warning
2015-06-15 20:27:44 +02:00
012eb10e19
Added automatic graphics detection (-graphics auto)
2015-06-15 20:20:03 +02:00
a880210b3d
Added ShadowRange option
2015-06-15 18:41:31 +02:00
6434ff55dd
Ending splashscreen enhancement ( fixes #472 )
2015-06-05 20:20:06 +02:00
ae29ebead3
Defaulted shadow color to 0.5 in OpenGL 2.1 engine
2015-06-05 19:48:28 +02:00
66d865942c
Added OpenGL 2.1 shaders for per-pixel lighting
2015-06-02 16:55:03 +02:00
d477caed3e
Second attempt at correcting compilation error
2015-06-01 18:41:14 +02:00
7acca9feb8
Corrected compilation error and unsigned comparison warnings
2015-06-01 17:45:51 +02:00
d112971c3e
Corrected shadow mapping and added experimental self-shadowing
2015-06-01 17:22:49 +02:00
a0c56f54cb
Shader and buffer optimizations
2015-06-01 17:21:10 +02:00
d33ddae15a
Added warnings and information what shader files are not available
2015-05-29 12:39:14 +02:00
f69dfe3421
shield() rejects incorrect robots that try to invoke it (should fix #475 )
2015-05-28 14:03:05 +02:00
e1a0f5b1c7
Added OpenGL 2.1 engine
2015-05-27 22:12:02 +02:00
08bf066f78
Added shadow color setting
2015-05-27 21:58:32 +02:00
55b4e73a7a
Corrected a problem with strmid()
2015-05-22 20:34:35 +02:00
fa67e815b8
Implemented per-vertex lighting and set it as default in OpenGL 3.3 engine
2015-05-22 18:53:51 +02:00
8abdd4b740
Improved shadow mapping
2015-05-21 18:18:46 +02:00
f67c01e5e7
Added proper render to texture support
2015-05-21 18:03:17 +02:00
a045bf3830
Added shadow ambient support
2015-05-21 16:47:24 +02:00
b1e8341475
Move OpenGL 3.3 shaders to main repository
2015-05-20 23:30:46 +02:00
619ac3cf8d
Fixed glew linking problem on MXE
2015-05-19 23:03:32 +02:00
35ce6c228a
Fix gcc warning
2015-05-19 23:03:32 +02:00
361a8c4ddd
Another fix to warning
2015-05-19 17:24:07 +02:00
3a1dffd8df
Fixing some warnings
2015-05-19 17:15:08 +02:00
df8223700b
Corrected compilation error
2015-05-19 16:26:41 +02:00
933609967a
Added OpenGL 3.3 graphics implementation
2015-05-19 14:29:31 +02:00
d210dcf70e
Implemented graceful degradation of shadow quality when not enough texture units are available
2015-05-15 10:12:35 +02:00
krzys-h