ea9361fbb4
LevelCategory enum
2015-07-18 19:45:40 +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
4506a4b8bd
TraceColor enum
2015-07-14 13:53:50 +02:00
20dbb8320b
Remove unused reset code
2015-07-13 22:46:51 +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
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
b0ac2f8326
Refactor CObject interface related to crash spheres
2015-07-10 09:38:53 +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
a32efc09a2
Refactored EndMissionTake and AudioChange
2015-07-07 16:17:19 +02:00
f1684f85be
Introduce new CObject base class and mixin class framework
2015-07-02 23:50:50 +02:00
f871ba4729
Create CExchangePost subclass
2015-06-27 23:22:55 +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
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
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
fed67e6640
Rename objman.h/cpp -> object_manger.h/cpp
2015-06-20 20:02:40 +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
e1a0f5b1c7
Added OpenGL 2.1 engine
2015-05-27 22:12:02 +02:00
b1e8341475
Move OpenGL 3.3 shaders to main repository
2015-05-20 23:30:46 +02:00
933609967a
Added OpenGL 3.3 graphics implementation
2015-05-19 14:29:31 +02:00
6c87144ae8
Merge branch 'ManuelBlanc-dev-osx' into dev
2015-04-28 15:18:37 -07:00
dec12fb977
Use wingetopt library on MSVC
2015-04-27 18:17:03 +02:00
bf55691e44
Issue #399 : Sniffer can delete mark and probe ground
2015-03-22 14:40:19 +01:00
e179847358
Fixed remapping virtual keys, closes #415
2015-03-18 21:29:33 +01:00
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
986cf98aaf
CController - entry point into CRobotMain and CMainDialog
2014-12-22 10:36:36 +01:00
07c651bd0a
Moved all CBot functions into a separate class
2014-12-20 18:45:46 +01:00
56393f4278
Modified CMake to search the path for libintl headers
...
Conflicts:
src/CMakeLists.txt
2014-12-12 01:17:10 +01:00
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
eec6041104
Refactoring of input and input bindings, CInput class
2014-12-11 19:14:33 +01:00
ccdbce8cd7
Fixed icon on Windows; updated properties in .rc file
2014-11-01 19:57:23 +01:00
f8841f96f2
Added -headless
...
For automated stuff on devices without GPU
2014-10-31 20:40:13 +01:00
81062e5e87
Fixed linking convert_model ( #332 )
2014-10-25 12:44:52 +02:00
5274acd624
Merge with dev
2014-10-07 22:15:40 +02:00
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
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
68d41d3b21
More work on streams
2014-06-23 23:19:55 +02:00
754154341d
More work on PhysFS support
...
* added output stream
* fixed music loading
2014-06-22 15:01:06 +02:00
1630cf0ed2
Implemented libsndfile loader in PhysFS
2014-06-21 02:59:26 +02:00
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
f0d97bfdb9
Better datadir mod support
2014-05-18 12:12:47 +02:00
4a237f5925
CPauseManager
2013-12-31 13:24:09 +01:00
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
89e2855f95
Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txt
2013-11-20 10:39:06 +01:00
bea84f0af4
Don't set rpath if libCBot is compiled statically
2013-11-13 09:35:32 +01:00
8f7f56f1ea
On Mac OS X, write colobot.ini and savegames to Application Support directories
2013-11-13 09:35:31 +01:00
ee90f02bc4
Add an icon and executable information to the colobot.exe when build in MXE
2013-10-29 14:40:58 +01:00
b3b6a40d9e
MacOSX: Add initial support in CMake build infra
2013-10-24 21:12:52 +02:00
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
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
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
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
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
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
5fd64624d3
Fix for game crashing sometimes when using MissionController
2013-04-28 20:24:46 +02:00
32fdf993ea
* Changed order of libs in cmake for clipboard
2013-04-20 19:41:39 +02:00
bc760e3513
* Added X11 to libs in CMakefiles for linux build
2013-04-11 21:55:49 +02:00
01309c8bd0
* Added clipboard support (issue #60 )
...
* Fixed keyboard shortcuts while code editing in game
2013-04-11 13:37:15 +02:00
90301e24c0
Added field "item" to class "object" in CBot
2013-03-31 10:21:22 +02:00
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
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
025bedecfb
Refactored platform-specific code
...
Moved functions from .h to .cpp files
2013-03-19 23:07:39 +01:00
209c6412ae
Refactoring in tests infrastructure
...
* all tests are now in /test/ subdirectory
* unit tests concatenated to one executable (TODO: ui, common)
* preparation for test environments (OpenGL and others)
* removed old TestCBot
2013-02-03 20:03:36 +01:00
9f75a29e88
* Fixed sound pitch causing segfault
...
* Sound support should now compile fine with MXE
* Added cache for 3 music files to speedup loading
* Updated howto
2013-01-16 01:45:38 +01:00
58f35e44ae
* Removed alut
...
* Using libsndfile to load sounds and music
* Added support for playing music files
2013-01-14 22:55:16 +01:00
1285712aa2
CMakeLists enhancements
...
- compiler detection (clang and gcc version check)
- compile flags only for src/ subdir
- system and local include paths
- fix for clang compilation
2013-01-08 22:12:09 +01:00
8818a8e5db
Corrected OpenGL extension detection
...
- corrected multitexture and VBO detection
- GLEW is now a required library
- minor CMakeLists refactoring
2013-01-05 23:03:06 +01:00
89a3f586a2
Merge branch 'dev' into dev-graphics
2013-01-04 00:05:28 +01:00
a75f02089c
Add translated freedesktop 'Desktop Entry' file
...
- Add po4a as build-dependency for travis
(but it fallsback to english-only if not found)
- Add (easy) french translation
2012-12-27 09:56:38 +01:00
5574eccebd
Engine optimization - rewritten model management
...
- new class CModelManager
- rewritten engine object structure in CEngine
- created shared model data instead of separate objects per each
model instance
- minor refactoring
2012-12-26 20:58:02 +01:00
f0e76ad446
sound fix
2012-12-20 21:57:57 +01:00
a6ff654ae3
removing plugins for gold version (for mxe cross compiling)
2012-12-20 20:59:11 +01:00
f77734e01c
Installation path fixes and CMakeLists refactoring
...
make && make install should now give a working installation.
2012-12-20 00:23:12 +01:00
c6c57c0e99
Fix RPath in installed colobot
2012-12-19 08:50:46 +01:00
e062b74a3a
Install libCBot to a private directory
...
closes #90
- Make it configurable;
- Move stanzas above the src directory inclusion, otherwise the value
doesn't propagate.
2012-12-17 10:15:14 +01:00
56a170391f
Split gtest and gmock, fixed using system packages
...
- split the bundled gtest and gmock libraries
- allowed the use of system gmock
- refactoring in CMakeLists
2012-12-16 13:22:58 +01:00
72ce040054
Merge branch 'master' into dev
2012-12-15 20:23:58 +01:00
9b127fc0a3
Add FindLTDL cmake module
...
As mentionned in FindLTDL.cmake, this is code that is hereby relicensed
under GPLv3.
closes #68
2012-12-14 15:50:11 +01:00
19b75e1743
Handle translations with CMakes.
...
closes #81
2012-12-13 22:10:49 +01:00
0305e0ba17
Restext rewrite to runtime initialized arrays
2012-10-17 23:16:19 +02:00
7575ffd49b
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2012-10-11 23:10:07 +02:00
8a932fed3e
Added saving user scripts on game save. Fixed bug in writing script to file.
2012-10-11 23:09:29 +02:00
b7667cef35
Added "make install" target.
2012-10-05 22:07:58 +02:00
e7e8954384
MXE support and CMake files refactoring
...
- added support for cross-compiling with MXE (http://mxe.cc/ )
- refactored CMake files, adding some options and moving definitions
to more suitable places
2012-09-29 17:19:23 +02:00
df4e3dfb6e
Small fix in profile + profile_test rewritten to gtest.
2012-09-28 21:03:28 +02:00
6cce7ec6fd
Removed metafile editor and loader
2012-09-22 21:07:23 +02:00
15ff1d512b
* Fixed audio problems
...
* Added colobot.ini to CApp in Create function
* Fixes to plugin manager
* Fixed CProfile segfault
2012-09-22 00:11:16 +02:00
34a11021da
changed paths for models and levels. Now it's possible to load level. Merged with latest trunk
2012-09-20 23:04:37 +02:00
191fdc614e
changed paths for models and levels. Now it's possible to load level.
2012-09-20 22:58:00 +02:00
7b6bbf79c4
Namespace and styling fix
2012-09-19 23:50:28 +02:00
844e11db4f
changes needeto to cimpile on windows.
2012-09-17 20:47:27 +02:00
af9af56bb0
Successful compilation & running
...
- temporarily mocked CSoundInterface and CPluginInterface
- added CRobotMain to application
- successfully compiles & runs, but doesn't display correctly at the
moment
2012-09-15 22:19:32 +02:00
8ad15c0ef7
CMainDialog rewrite
...
- rewritten CMainDialog and updated CRobotMain
2012-09-15 21:47:19 +02:00
ad6bc13dc2
Merge dev-common and various fixes to achieve compilation
...
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
2012-09-15 18:50:51 +02:00
95d2f8da2c
Merge branch 'dev-object' into dev
...
Conflicts:
src/object/robotmain.cpp
src/object/robotmain.h
2012-09-15 16:54:35 +02:00
d439f4fa93
Merge branch 'dev-ui' into dev
...
Conflicts:
src/CMakeLists.txt
src/common/misc.cpp
src/common/misc.h
src/object/robotmain.cpp
src/object/robotmain.h
src/script/cbottoken.cpp
src/script/cbottoken.h
src/ui/button.cpp
src/ui/button.h
src/ui/check.cpp
src/ui/check.h
src/ui/color.cpp
src/ui/color.h
src/ui/compass.cpp
src/ui/compass.h
src/ui/control.cpp
src/ui/control.h
src/ui/displayinfo.cpp
src/ui/displayinfo.h
src/ui/displaytext.cpp
src/ui/displaytext.h
src/ui/edit.cpp
src/ui/edit.h
src/ui/gauge.cpp
src/ui/gauge.h
src/ui/interface.cpp
src/ui/interface.h
src/ui/key.cpp
src/ui/map.h
src/ui/shortcut.h
src/ui/slider.h
src/ui/target.cpp
src/ui/target.h
src/ui/window.cpp
src/ui/window.h
2012-09-15 16:35:48 +02:00
9bfdcacc52
Fixes in [object/auto]
2012-09-13 18:28:50 +02:00
8f285465e8
[object/motion] Folder compiles
2012-09-13 17:40:39 +02:00
8b223eb096
all tasks compile.
2012-09-12 22:34:40 +02:00
064fedb814
commented part of tasks that does not compile.
2012-09-11 23:14:55 +02:00
1bb1eb7b87
half of task compile.
2012-09-11 23:11:34 +02:00
6c21dceb35
Tests rewrite and Doxygen in src/math
...
- rewritten tests to use new framework
- updated/reformatted Doxygen
- removed legacy conversions
2012-09-11 21:14:32 +02:00
e57be247c2
commented new part in cmakelist and reverted stubs in camera.cpp. Will be commited later after implementation is finished in dev-object branch.
2012-09-10 23:39:22 +02:00
479a67a731
Merge with changes from Zaba999 fork.
2012-09-10 23:29:38 +02:00
cf2295d08d
Commenting out src/object/auto temporarily
2012-09-09 17:58:09 +02:00
efe4f0badd
Refactoring in src/common
...
- refactored CInstanceManager and some headers
- removed old headers
2012-09-09 17:51:10 +02:00
6892d37a4f
[src/object/auto] Folder rewritten
2012-09-09 14:28:19 +02:00
b3d5491af4
Merge branch 'dev' into dev-graphics
2012-09-09 13:05:41 +02:00
31c29ea482
CModelFile fixes; test framework
...
- fixes in CModelFile IO
- added Google Test framework for automatic testing
- rewrote modelfile_test in the new framework
2012-09-08 03:05:12 +02:00
5903e400d4
Merge branch 'dev' of https://github.com/adiblol/colobot into dev-ui
...
Conflicts:
src/common/restext.cpp
src/common/restext.h
2012-09-03 18:26:51 +02:00
6ba0f42f22
latest changes; few more classes should compile now
2012-08-31 22:28:07 +02:00
e94e26ae1e
New model file format
...
- added new binary and text formats for models
- fixes and improvements in CModelFile
- tool for converting model files
- minor additions and fixes
2012-08-31 20:55:16 +02:00
9b4628fd02
Move strings out of restext. Add i18n via gettext
2012-08-25 14:37:51 +04:00
8d4a3ed579
* wrong enum used for text alignment
...
* wrong event function used
2012-08-18 21:04:51 +02:00
48ad79a03c
* minor changes to control.cpp to compile it without errors
2012-08-18 11:30:29 +02:00
c3ab23ac9d
Graphics stubs
...
- added stubs for functions in CLightning, CParticle and CPyro
- cleaned object.h and physics.h headers
- created temporary stubs to compile CCamera
- other necessary changes to compile successfully
2012-08-09 22:50:04 +02:00
61bfb22f27
Basic font rendering
...
- added basic font rendering
- minor refactoring & fixes
2012-08-03 23:23:13 +02:00
220ff9fe52
CCamera rewrite
...
Rewritten old code; doesn't compile yet because changes in other
modules are needed.
2012-07-29 18:42:56 +02:00
72c0188ec3
GLEW
...
Added GLEW for loading OpenGL extensions
2012-07-28 23:36:12 +02:00
ab8e55a651
Merge branch 'dev' into dev-opengl
...
Pulled changes & resolved conflicts
2012-07-27 18:09:50 +02:00
4ddcd9f810
Change of paths in src/graphics
...
- moved abstract core to src/graphics/core
- moved proper graphics engine to src/graphics/engine
2012-07-26 22:26:19 +02:00
92bcec10c5
Merge pull request #33 from Zaba999/dev
...
Changes in CBot
2012-07-25 15:09:09 -07:00
9cd28e26e9
Fix in CMakeLists.txt
2012-07-25 00:28:56 +02:00
9d59204531
Cursor drawing
...
- fixed cursor drawing in CEngine
- changed event loop to generate more events
2012-07-23 21:41:27 +02:00
86ea086790
ComputeSphereVisibility function
...
- borrowed implementation of ComputeSphereVisibility from libwine
- added -lrt to Linux libs
2012-07-18 21:47:47 +02:00
68a7bafe37
Fixes in texture loading
...
- added other texture formats: BGR and BGRA
- fixed texture loading in model viewer
- moved code from texture.cpp module to texture.h
2012-07-16 19:17:26 +02:00
2383a42347
Rewritten model loading
...
- written new implementation of CModelFile (old CModFile)
- added stringutils and ioutils in src/common
- removed old CModel (model viewer)
2012-07-11 20:50:42 +02:00
3204360515
Refactoring in math & texture modules
...
- moved texture-related structs to texture.h & code to texture.cpp
- cleaned up texture test code
- added Math:: namespace qualifiers to math modules for clarity
2012-07-06 19:00:22 +02:00
dbd62c96aa
Fixed code compilation without fpermissive flag.
...
Removed Winapi, but now library don't work - work in progress.
Some translations.
2012-07-04 22:14:28 +02:00
af3057df7e
Merged changes from dev
...
Resolved conflicts & added fixes.
2012-07-04 19:56:22 +02:00
092e4ae75e
Enabled logging & minor fixes
...
- added logger to main()
- removed reference to Snd namespace and renamed back to sound.h
- fixed minor issues
2012-07-04 19:20:22 +02:00
f95df35dc5
Multitexturing support
...
- added CImage class for loading/saving images and a simple test for it
- added libpng library to build
- added Gfx::Texture struct
- updated the Gfx::CDevice interface to include new features
- implemented the new features in Gfx::CGLDevice
2012-07-04 00:04:53 +02:00
e738c55b73
Removed old code and build target
...
- removed directory with old target
- changed CMakeLists.txt to new target only and temporarily commented
out reference to CBot
- updated README
2012-06-26 23:39:31 +02:00
b08a63790c
SDL project
...
- added (very basic) SDL template in CApplication and CEngine
- split project into two targets: colobot_old (dependent on DirectX and WinAPI)
and colobot_new (dependent on SDL and OpenGL)
- moved sound.h/cpp to old/ and created new template in Snd namespace
- added platform-independent dialog boxes in app/system.h/cpp
2012-06-25 19:59:17 +02:00
f58918031c
Declarations for graphics/common
2012-06-25 16:37:03 +02:00
3478978c21
CApplication and Gfx::CEngine interfaces & other
...
- added CApplication and Gfx::CEngine interfaces
- added Gfx::Material struct
- added Math::IntPoint struct
- added template for Gfx::CDevice class
- added templates for Gfx::CGLDevice and Gfx::CGLEngine classes
2012-06-24 15:41:56 +02:00
8bb223e679
Templates for new implementation
...
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
2012-06-22 16:31:55 +02:00
9f784e81f8
Switched to new implementation of the rest of math module
...
- changed structs from D3DVECTOR to Math::Vector
and from D3DMATRIX to Math::Matrix
- changed functions to new Math namespace functions
- moved mainmovie module from graphics to object
- added Get and Set to Math::Matrix
2012-06-19 20:11:47 +02:00
b735913deb
FPOINT -> Math::Point & other math functions
...
- changed FPOINT to Math::Point and some functions
from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options
2012-06-13 22:48:35 +02:00
680af17819
Fixed include paths and CMakeLists.txt
...
Additionally, changed #ifndef to #pragma once everywhere
2012-06-10 00:18:08 +02:00
45b75ee37b
Adding new MinGW branch
2012-04-15 01:02:51 +02:00
krzys-h