erihel
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
erihel
6ba0f42f22
latest changes; few more classes should compile now
2012-08-31 22:28:07 +02:00
Piotr Dziwinski
01fd19d2cd
Fix
2012-08-31 21:51:28 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
7f277c9ab9
Whitespace fix
2012-08-27 01:05:59 +02:00
Piotr Dziwinski
3e52ae4ca9
Fixes in terrain rendering
2012-08-27 01:02:25 +02:00
Alexander Monakov
896291b769
Add translation files
2012-08-25 14:37:51 +04:00
Alexander Monakov
9b4628fd02
Move strings out of restext. Add i18n via gettext
2012-08-25 14:37:51 +04:00
Alexander Monakov
5ff4ce146a
Move ResTextType enum to a separate file
2012-08-25 13:51:17 +04:00
Alexander Monakov
f5a8a92050
Move ObjectType enum to a separate file
2012-08-25 13:47:48 +04:00
Alexander Monakov
43f7b384e9
Move Error enum to a separate file
2012-08-25 13:46:49 +04:00
Alexander Monakov
5b2bc48986
Move EventType enum to a separate file
2012-08-25 13:45:40 +04:00
erihel
5408fe9252
* added nullptr
...
* changed Ret to Get function names
* minor changes
2012-08-21 21:38:13 +02:00
erihel
4faa1b9c44
merged changes from michkon
2012-08-21 20:55:03 +02:00
erihel
75a76e8252
latest changes
2012-08-21 20:53:39 +02:00
Michał Konopacki
1997682808
added ui/shortcut.*
2012-08-21 15:23:59 +02:00
Michał Konopacki
60950ce66b
Typo fix
2012-08-20 21:45:17 +02:00
Michał Konopacki
af45bc399f
added ui/scroll.*
2012-08-20 21:42:07 +02:00
Michał Konopacki
59ec83c409
added ui/slider.*
2012-08-20 21:35:11 +02:00
Michał Konopacki
02dc368a38
added ui/target.*
2012-08-20 21:31:16 +02:00
Michał Konopacki
bd9c581ced
added ui/window.* -- not fully ported
2012-08-20 21:22:24 +02:00
Michał Konopacki
7a4ec2adc4
Merge remote-tracking branch 'erihel/dev-ui' into dev-ui
...
Conflicts:
src/ui/button.h
src/ui/color.h
src/ui/compass.h
src/ui/control.h
src/ui/displayinfo.h
src/ui/displaytext.h
src/ui/edit.h
src/ui/editvalue.h
src/ui/gauge.h
src/ui/group.h
src/ui/image.h
src/ui/slider.h
2012-08-20 15:12:26 +02:00
Michał Konopacki
8666d35f7c
UI porting
2012-08-20 14:05:36 +02:00
Michał Konopacki
574c07e388
Further improvements in UI porting
2012-08-18 22:56:42 +02:00
erihel
8d4a3ed579
* wrong enum used for text alignment
...
* wrong event function used
2012-08-18 21:04:51 +02:00
erihel
48ad79a03c
* minor changes to control.cpp to compile it without errors
2012-08-18 11:30:29 +02:00
erihel
c02ac93379
* list.cpp compiles
2012-08-17 23:56:29 +02:00
erihel
a00032d075
* ui/label.cpp compiles
2012-08-17 23:05:59 +02:00
erihel
ea6269c411
* ui/key.cpp compiles
...
* csoundinterface to ccontrol
2012-08-17 23:03:52 +02:00
erihel
6ff8706d04
* last commit should not include sound changes
2012-08-17 22:49:16 +02:00
erihel
c2464d4c71
* changes to ui classes
2012-08-17 22:43:07 +02:00
Michał Konopacki
10b2c562fb
First approach to port 2D UI Interface
...
- changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs
- necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile
2012-08-15 01:48:49 +02:00
Piotr Dziwinski
8b2bca72dd
Merge branch 'dev-graphics' into dev
...
Documentation, rendering functions & fixes
2012-08-13 23:13:10 +02:00
Piotr Dziwinski
5b45911856
Improved error messages
...
Added some logging and improved error messages displayed to user
2012-08-13 23:09:30 +02:00
Piotr Dziwinski
a2dd39960b
Fix
2012-08-13 18:17:54 +02:00
Piotr Dziwinski
b68dfcd155
Test fix
2012-08-13 18:03:12 +02:00
Piotr Dziwiński
dc3cadd309
Merge pull request #37 from konopackim/dev
...
Fixes and console interpreter
2012-08-13 08:46:03 -07:00
Michał Konopacki
e154e654f1
Reduced amount of warnings in CBot library
...
Changed most of C-style casting to C++ casting
Commented unused variables
2012-08-13 01:45:35 +02:00
Piotr Dziwinski
712154bc4f
Rendering functions, documentation
...
- rewrote the render functions for CEngine, CCloud and CWater
- added documentation
2012-08-13 00:14:42 +02:00
Piotr Dziwinski
146ad47e4a
Merge branch 'dev-graphics' into dev
...
CEngine object handling
2012-08-12 19:30:31 +02:00
Piotr Dziwinski
45a5e1e865
Object handling in CEngine
...
- finished rewriting CEngine object, shadow, etc. handling
- refactored texture code
- added new log levels
2012-08-12 19:28:22 +02:00
erihel
62b545128f
* Final changes to plugin interface
...
* Added doxygen comments to plugin manager and plugin loader
2012-08-12 18:37:11 +02:00
erihel
f01296690e
Merge branch 'dev-opengl' into dev
2012-08-12 17:09:11 +02:00
erihel
5e271e550d
* New CPluginManager class for managing plugins based on colobot.ini
...
* Moved sound plugin into sound dir
* Minor changes in logger and profile
2012-08-12 15:00:37 +02:00
Piotr Dziwinski
b4b74c30e9
Fixes & testing in CEngine
...
- fixed bugs in settings modes, etc.
- some additions and minor refactoring
2012-08-12 10:45:04 +02:00
Michał Konopacki
a9186d1960
Changed GivAttrName() to GetAttrName()
2012-08-11 20:59:35 +02:00
Piotr Dziwinski
1996507fd3
Documentation update
...
- updated Doxyfile
- added/changed file, dir and namespace descriptions
- fixed some errors in doxygen tags
2012-08-11 18:39:16 +02:00
Piotr Dziwinski
7f80ca2971
Render mode setting, refactoring
...
- finished SetState in CEngine
- refactored Size and IntSize back to Point and IntPoint
- other minor changes in CEngine
2012-08-11 17:17:04 +02:00
Piotr Dziwinski
63257034c9
Partial CEngine implementation
...
- added rewritten implementation for basic modesetting in CEngine
- started rewriting proper rendering and object handling in CEngine
2012-08-10 23:31:42 +02:00
erihel
9946459c0c
* changed 0, NULL to nullptr
...
* changed profile.cpp to use SimpleIni to load config files
* added new CProfile singleton class for loading config
* added SimpleIni to lib/ dir
* added config loading tests
2012-08-09 23:04:29 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
acff306cc1
CPlanet implementation
...
Added rewritten CPlanet implementation
2012-08-09 22:49:13 +02:00
Michał Konopacki
7b03a6a2ac
CBot console interpreter
...
Based on program found in sources
2012-08-09 22:13:10 +02:00
Michał Konopacki
ef7e297efe
CBotString.cpp Bug resolve
2012-08-09 22:05:42 +02:00
erihel
f1d1cdceee
Changes after merge
2012-08-09 21:21:14 +02:00
erihel
611680a72e
Merge branch 'dev' of https://github.com/adiblol/colobot into dev
...
Conflicts:
src/sound/sound.h
2012-08-09 20:20:47 +02:00
Piotr Dziwinski
c1936514c0
CWater and CCloud basic implementation
...
Added rewritten implementation for CWater and CCloud
Won't link yet because of missing functions
2012-08-08 23:51:19 +02:00
Piotr Dziwinski
bc24b9f9e5
Whitespace fix
2012-08-08 22:35:17 +02:00
Piotr Dziwinski
878eec8eea
CTerrain implementation
...
Added rewritten CTerrain implementation
Compiles OK, but functions are missing from other classes
Also needs testing
2012-08-08 21:32:44 +02:00
Michał Konopacki
a760e8a749
Cleanups
2012-08-08 02:23:38 +02:00
Michał Konopacki
0919796df7
Transation of comments complete
2012-08-08 02:01:06 +02:00
Michał Konopacki
0844a0f7bd
Further CBot translations
2012-08-07 15:46:04 +02:00
Michał Konopacki
a1c83c7d0a
CBot library comments further translations
2012-08-07 12:46:19 +02:00
Piotr Dziwinski
f7e78b21e9
Font rendering
...
- implemented rest of CText interface excluding some minor features
2012-08-06 20:20:50 +02:00
Piotr Dziwinski
61bfb22f27
Basic font rendering
...
- added basic font rendering
- minor refactoring & fixes
2012-08-03 23:23:13 +02:00
Michał Konopacki
bf3f9e1860
Commentary translation
2012-08-03 00:50:25 +02:00
Michał Konopacki
d00a283519
Comments translation
2012-08-02 19:41:13 +02:00
Piotr Dziwinski
5e637ca028
Switched to new style casts
...
- rewrote old C-style casts to new ..._cast<>
- corrected some dangerous casts
- added -Wold-style-cast to compile flags
2012-07-30 22:59:18 +02:00
Piotr Dziwinski
d8a0c8d32e
Lines and line strip primitives
...
Will probably be useful
2012-07-30 22:32:28 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
7c5a3514dd
Video mode changing
...
- added video mode querying & changing
- added joystick querying & changing
- cleaned up CApplication interface
2012-07-29 15:09:53 +02:00
Piotr Dziwinski
72c0188ec3
GLEW
...
Added GLEW for loading OpenGL extensions
2012-07-28 23:36:12 +02:00
Piotr Dziwinski
db0b880674
Updated Doxygen main page
2012-07-27 18:50:29 +02:00
Piotr Dziwinski
851300d61d
Whitespace fix
2012-07-27 18:44:43 +02:00
Piotr Dziwinski
ab8e55a651
Merge branch 'dev' into dev-opengl
...
Pulled changes & resolved conflicts
2012-07-27 18:09:50 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
045f17a274
Dynamic light manager
...
- rewrote old CLight as CLightManager
2012-07-26 21:35:04 +02:00
Piotr Dziwinski
d1fe0d2dcc
Lighting
...
- fixed problems with lighting
- added light_test
2012-07-26 19:05:09 +02:00
Piotr Dziwinski
6b846aa629
Compile fixes
...
Fixed some compiling issues
2012-07-26 00:18:02 +02:00
Piotr Dziwiński
92bcec10c5
Merge pull request #33 from Zaba999/dev
...
Changes in CBot
2012-07-25 15:09:09 -07:00
Piotr Dziwinski
bc1c9b5284
Fixed bug in texturing
2012-07-25 20:27:13 +02:00
Piotr Dziwinski
9cd28e26e9
Fix in CMakeLists.txt
2012-07-25 00:28:56 +02:00
Piotr Dziwinski
42963b341f
Refactoring of texture code
...
- refactored texture structs & functions
- added note about OpenGL extensions
- removed device.cpp as unnecessary
- minor changes in CEngine
2012-07-25 00:27:01 +02:00
Piotr Dziwinski
9d59204531
Cursor drawing
...
- fixed cursor drawing in CEngine
- changed event loop to generate more events
2012-07-23 21:41:27 +02:00
Piotr Dziwinski
8797569d33
Texture & mouse functions; refactoring & fixes
...
- cleaned up and added documentation to engine.h
- refactored CEngine interface and associated structs
- added mouse handling functions in CApplication & CEngine
- fixed bugs in projection matrix setting
- changed texture loading & handling
- added const-values in CDevice & CGLDevice
- changed event management in CApplication
- other minor changes & bugfixes
2012-07-22 22:05:12 +02:00
Zaba999
26f9149947
Further translations and doxygen comments.
2012-07-20 23:13:02 +02:00
erihel
d56db5f4e4
* Chaned plugin interface
...
* Added plugin class for plugin loading
* Added plugin loading test
2012-07-19 19:19:21 +02:00
Piotr Dziwinski
86ea086790
ComputeSphereVisibility function
...
- borrowed implementation of ComputeSphereVisibility from libwine
- added -lrt to Linux libs
2012-07-18 21:47:47 +02:00
Piotr Dziwinski
f364f378cf
Fixed OpenGL transformations
...
- fixed wrong order of transformations
- added transform_test
2012-07-18 19:08:34 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
54f4da8792
Fix in model loading; simple model viewer
...
- fixed model loading code
- added simple model viewer (model_test) in src/graphics/opengl/test
- added system time stamp code
- split the code in app/system modules to separate headers
- added debug messages in model loading
- minor fixes in OpenGL engine
2012-07-15 19:17:49 +02:00
Piotr Dziwinski
eca6d26459
Minor changes
...
- moved mainpage src/doc/docmain.doc.txt to src/app/main.cpp
- removed old modfile modules from src/common
- removed Snd namespace in engine.h
2012-07-11 20:56:09 +02:00
Piotr Dziwinski
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
Zaba999
1910219518
Dependency on WINAPI completely removed.
2012-07-10 22:58:52 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
e8c9945e13
Fixed bug with texturing
...
- moved creation-time tex params to Gfx::TextureCreateParams
- fixed bug with texture creation
- added simple test for multitexturing
2012-07-05 23:47:29 +02:00
Zaba999
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
erihel
0e4b070b5f
just some fixes
2012-07-04 20:03:17 +02:00
Piotr Dziwinski
af3057df7e
Merged changes from dev
...
Resolved conflicts & added fixes.
2012-07-04 19:56:22 +02:00
erihel
ecab9761d4
* Added OpenAL sound plugin
...
Plugin needs some more work and tests. It doesn't support playing music
yet as sound interface is propably going to change a bit.
2012-07-04 19:38:18 +02:00
Piotr Dziwinski
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
erihel
4a839d8734
* Added CLogger class for loggin info to console or file
...
* Added CSoundInterface
* Added basic plugin interface
2012-07-04 18:04:34 +02:00
Piotr Dziwinski
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
Zaba999
fd6147bea0
translations plus small fixes
2012-07-02 21:41:24 +02:00
Piotr Dziwinski
d9c5a439d0
CGLDevice implementation
...
- extended Gfx::CDevice interface
- written OpenGL implementation in Gfx::CGLDevice
- rewrote color and light module
- added Gfx::VertexCol
- added array casts to Math::Vector, Math::Matrix and Gfx::Color
2012-07-01 22:59:22 +02:00
Piotr Dziwinski
9bd4ec03b2
CDevice interface and stub of implementation
...
- added CDevice abstract interface
- began implementation of CGLDevice
- added stub for Texture struct
- created CGLDeviceConfig
- changed particule -> particle & other minor changes
2012-07-01 01:37:30 +02:00
Programerus
ca254d70b6
Deleted #include "ClassFILE.cpp" code.
2012-07-01 01:00:27 +02:00
Piotr Dziwinski
00c737b880
Joystick polling with timer
...
- added joystick polling through timer
- updated documentation on CApplication class
2012-06-30 12:26:40 +02:00
Piotr Dziwinski
9a268f5538
Switched back to old standard; addded -Wall
...
- removed -std=c++11
- added -Wall and removed most reported warnings
2012-06-30 10:16:52 +02:00
Piotr Dziwinski
e37019943c
Event handling, CApplication and switch to c++-11
...
- added/changed event structs and event queue in common/event.h
- added event handling and some minor functions in CApplication
- switched to --std=c++11 because of union in Event struct
2012-06-30 00:12:04 +02:00
Piotr Dziwinski
1b83929487
Pulled changes from master branch
2012-06-28 22:54:53 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
c2a7375788
Removed trailing whitespace
2012-06-26 23:01:17 +02:00
Piotr Dziwinski
cf312c0b87
Fixed brief Doxygen description
2012-06-26 22:50:55 +02:00
Piotr Dziwinski
bf06998ece
Forgotten language change
2012-06-26 22:36:52 +02:00
Piotr Dziwinski
ebed57aa22
Whitespace and language change
...
- changed tabs to spaces and DOS line endings to Unix
(except in CBot and metafile)
- changed language to English
- fixed #include <d3d.h> in d3dengine.h
2012-06-26 22:23:05 +02:00
Piotr Dziwinski
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
Programerus
f58918031c
Declarations for graphics/common
2012-06-25 16:37:03 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
11c947f212
Fix in light.h
2012-06-22 16:54:02 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
4531ac88d3
Moved old implementations to src/old
2012-06-22 15:54:16 +02:00
Piotr Dziwinski
11df0ebf94
Vertex and Light structures
2012-06-20 19:34:54 +02:00
Programerus
4ecc4bb4c0
Add functions to namespace.
2012-06-20 20:17:00 +03:00
Programerus
d709f9ecaa
.
2012-06-20 20:08:21 +03:00
Programerus
81468f8dc9
Struct ColorHSV copied to color.h
2012-06-20 20:07:54 +03:00
Programerus
f244921ba9
Struct ColorHSV copied to color.h
2012-06-20 20:01:05 +03:00
Piotr Dziwinski
c0461add5f
Refactoring of #includes and forward declarations in object/
2012-06-20 17:00:16 +02:00
Programerus
918f677ae8
Color functions
2012-06-20 17:44:27 +03:00
Programerus
1415bf0bd2
Struct Color
2012-06-20 17:38:27 +03:00
Piotr Dziwinski
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
Piotr Dziwinski
b8027ce9a7
Tests and fixes in math geometry.h module
2012-06-15 16:58:04 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
b5d16ef340
Fixes in math module
...
- rewritten RotateAngle() function and test for it in geometry_test.cpp
- added conv.h - conversion functions
- added comments in math3d.h and d3dmath.h pointing to new functions
- other minor fixes
2012-06-12 13:48:17 +02:00
Piotr Dziwinski
a8665d2042
Changed #defined constants to consts; typedef struct -> struct
2012-06-11 17:28:27 +02:00
Piotr Dziwinski
697fbdabf1
BOOL -> bool; additional fixes in constructors/destructors
2012-06-10 15:28:12 +02:00
Piotr Dziwinski
680af17819
Fixed include paths and CMakeLists.txt
...
Additionally, changed #ifndef to #pragma once everywhere
2012-06-10 00:18:08 +02:00
Piotr Dziwinski
d6525b5661
Changes from master
2012-06-08 20:30:57 +02:00
Piotr Dziwinski
6d754dc45e
Moved old math files
2012-06-07 13:35:59 +02:00
Piotr Dziwinski
5dee2731e6
Finished implementation of math functions
2012-06-07 13:35:23 +02:00
Piotr Dziwinski
f67a62fb28
Structs continued
2012-05-03 13:35:32 +02:00
Piotr Dziwinski
ea442a887d
Structs continued
2012-05-02 22:39:43 +02:00
Piotr Dziwinski
2513f6556e
Structs continued
...
Basic functions finished and tested for matrix and vector.
2012-05-01 20:05:48 +02:00
Piotr Dziwinski
7369b10a87
Structs continued
2012-04-29 23:21:35 +02:00
Piotr Dziwinski
b5b9fdb680
Structs continued
2012-04-28 22:56:07 +02:00
Piotr Dziwinski
1c275dbd78
Structs continued
2012-04-28 22:32:37 +02:00
Piotr Dziwinski
d57258ae1c
Split math functions; beginning of common structures
2012-04-28 21:46:26 +02:00
Piotr Dziwinski
449cc186d5
Source files split into modules
2012-04-28 17:53:17 +02:00
Piotr Dziwinski
eeb69b34d2
Moved docmain.doc.txt
2012-04-28 16:39:30 +02:00
Programerus
0d3564a245
Unneeded files deleted.
2012-04-17 17:01:25 +02:00
Piotr Dziwinski
330972d96b
Removed MSVC project files and binary files
2012-04-17 00:52:46 +02:00
Piotr Dziwinski
7cd9f49e59
Merge branch 'master' into mingw_dev
2012-04-17 00:31:16 +02:00
Piotr Dziwinski
698932646a
Fixed graphics bug ( #18 )
2012-04-16 23:34:59 +02:00
Programerus
658226a6f7
Merge branch 'master' of github.com:adiblol/colobot
2012-04-16 23:31:27 +02:00
Programerus
0c2073a80b
Fixed graphics bug on MSVC 2010 and MinGW.
2012-04-16 23:27:10 +02:00
Piotr Dziwinski
6d6faaa19d
Fixes in file descriptions
2012-04-16 20:51:10 +02:00
Piotr Dziwinski
6b7bfedab2
Merge branch 'master' into mingw_dev
2012-04-16 20:25:03 +02:00
Piotr Dziwinski
121054c6b7
Main documentaion file, fixes in Doxyfile
...
* added docmain.doc.txt with Doxygen \mainpage
* fixed paths in Doxyfile
* disabled some graph generation (for now)
2012-04-16 19:07:17 +02:00
Piotr Dziwinski
45b75ee37b
Adding new MinGW branch
2012-04-15 01:02:51 +02:00
Piotr Dziwinski
011d86ed66
Pulled changes from test mingw branch
...
* include fixes
* syntax fixes for MinGW
* fixed encoding of restext.cpp
* temporary fix for MinGW in joystick.cpp
Successfully compiles under MinGW :)
2012-04-15 00:50:13 +02:00
Programerus
b2589d2f6a
Unneeded files deleted.
2012-04-11 23:16:24 +02:00
Programerus
30d8e6a182
Comment fix.
2012-04-11 23:16:01 +03:00
Programerus
445825e653
Comments translated from French to English.
2012-04-11 23:15:32 +03:00
Programerus
130eb60ba9
Comments translated from French to English.
2012-04-11 21:25:19 +03:00
Programerus
e7a6d78cdd
Comments translated from French to English.
2012-04-11 21:22:02 +03:00
Programerus
1085c04204
Comment fix.
2012-04-11 21:12:58 +03:00
Programerus
b486cfde48
Comments translated from French to English.
2012-04-11 21:12:26 +03:00
Programerus
52fb7f5154
Comments translated from French to English.
2012-04-11 20:47:38 +03:00
Programerus
198f5444df
Comments translated from French to English.
2012-04-11 20:43:20 +03:00
Programerus
ecd78ea715
Comments translated from French to English.
2012-04-11 17:04:01 +03:00
Programerus
b33691f490
Comment fix.
2012-04-11 00:23:03 +03:00
Programerus
18de129d54
Comments translated from French to English.
2012-04-11 00:22:44 +03:00
Programerus
bbb83ec2af
Comment fix.
2012-04-11 00:20:50 +03:00
Programerus
38d01af159
Comments translated from French to English.
2012-04-11 00:20:26 +03:00
Programerus
e6ba3f08dc
Comments translated from French to English.
2012-04-11 00:18:19 +03:00
Programerus
5e86333bde
Comments translated from French to English.
2012-04-11 00:17:16 +03:00
Programerus
8145215c62
Comments translated from French to English.
2012-04-11 00:12:14 +03:00
Programerus
401197721e
Comments translated from French to English.
2012-04-11 00:10:24 +03:00
Programerus
8d7dfc5c3e
Comment fix.
2012-04-10 20:49:35 +03:00
Programerus
e82a8c52bd
Comments translated from French to English.
2012-04-10 20:49:15 +03:00
Programerus
4197469659
Comments translated from French to English.
2012-04-10 20:46:56 +03:00
Programerus
121248c58e
Comments translated from French to English.
2012-04-10 20:44:49 +03:00
Programerus
525bfb41ba
Comments translated from French to English.
2012-04-10 20:33:08 +03:00
Programerus
08597353ec
Comments translated from French to English.
2012-04-10 20:31:41 +03:00
Programerus
216d8ba95a
Comments translated from French to English.
2012-04-10 20:22:25 +03:00
Programerus
d8afd8dab5
Comments translated from French to English.
2012-04-10 20:20:46 +03:00
Programerus
22b6606c2b
Comments translated from French to English.
2012-04-10 20:17:31 +03:00
Programerus
580dde77e4
Comments translated from French to English.
2012-04-10 20:15:18 +03:00
Programerus
6cbd517739
Comments translated from French to English.
2012-04-10 20:09:57 +03:00
Programerus
eadbe30bf0
Comments translated from French to English.
2012-04-10 20:08:55 +03:00
Programerus
30d4724c6b
Comments translated from French to English.
2012-04-10 20:00:21 +03:00
Programerus
a7f74edaea
Comments translated from French to English.
2012-04-10 19:57:37 +03:00
Programerus
ea4c7e7034
Comment fix.
2012-04-10 19:29:25 +03:00
Programerus
200e139c5c
Comments translated from French to English.
2012-04-10 19:28:46 +03:00
Programerus
cf01920a4e
Comment fix.
2012-04-10 19:22:19 +03:00
Programerus
19c300b17a
Comments translated from French to English.
2012-04-10 19:08:47 +03:00
Programerus
5545f232c7
Comments translated from French to English.
2012-04-10 19:00:27 +03:00
Programerus
d8cebd443d
Comments translated from French to English.
2012-04-10 18:59:24 +03:00
Programerus
cacf81e852
Comments translated from French to English.
2012-04-10 18:57:16 +03:00
Programerus
bfbdcf297a
Comments translated from French to English.
2012-04-10 18:47:27 +03:00
Programerus
d49b06a7cb
Comments translated from French to English. (partially)
2012-04-10 16:54:20 +03:00
Programerus
4d744862e7
Comments translated from French to English.
2012-04-10 00:45:19 +03:00
Programerus
0b60904b95
Comments translated from French to English.
2012-04-10 00:44:29 +03:00
Programerus
aebce55a61
Comments translated from French to English.
2012-04-10 00:39:18 +03:00
Programerus
d6101829b6
Comments translated from French to English.
2012-04-10 00:37:56 +03:00
Programerus
76cfe9e923
Comment fix.
2012-04-10 00:33:41 +03:00
Programerus
17c7ffef65
Comments translated from French to English.
2012-04-10 00:33:07 +03:00
Programerus
5d08432a53
Comments translated from French to English.
2012-04-10 00:28:31 +03:00
Programerus
235f767de7
Comments translated from French to English.
2012-04-10 00:24:15 +03:00
Programerus
caddc90327
Comment fix.
2012-04-10 00:09:55 +03:00
Programerus
83d188c2b3
Comments translated from French on English.
2012-04-10 00:09:29 +03:00
Programerus
60e7df156d
Comments translated from French to English.
2012-04-10 00:06:28 +03:00
Programerus
356e9ef5e0
Comments translated from French to English.
2012-04-10 00:05:01 +03:00
Programerus
265f694241
Comment fix.
2012-04-10 00:03:33 +03:00
Programerus
de658d1952
Comments translated from French to English.
2012-04-10 00:03:09 +03:00
Programerus
1919cb2776
Comment fix.
2012-04-09 23:59:27 +03:00
Programerus
20edb7a379
Comments translated from French to English.
2012-04-09 23:58:41 +03:00
Programerus
3dbd661218
Comment fix.
2012-04-09 23:32:50 +03:00
Programerus
eca81da72d
Comments translated from French to English.
2012-04-09 23:31:24 +03:00
Programerus
b69151e06d
Comments translated from French to English.
2012-04-09 23:25:37 +03:00
Programerus
b8d2d56dca
Comment fix.
2012-04-09 19:17:17 +03:00
Programerus
bc0eff4895
Comments translated from French to English.
2012-04-09 19:15:33 +03:00
Programerus
82a9a1b233
Comment fix.
2012-04-09 17:37:07 +03:00
Programerus
688157ad2c
Comments translated from French to English.
2012-04-09 17:36:45 +03:00
Programerus
f7dafb1b9d
Comment fix.
2012-04-09 17:34:59 +03:00
Programerus
65a279bba8
Comments translated from French to English.
2012-04-09 17:34:16 +03:00
Programerus
2d01c8b649
Comments translated from French to English.
2012-04-09 17:00:24 +03:00
Programerus
f2da16756e
Comments translated from French to English.
2012-04-09 16:56:41 +03:00
Programerus
8df6f9c1f0
Comments translated from French to English.
2012-04-08 23:28:16 +03:00
Programerus
a69af4f845
Comments translated from French to English.
2012-04-08 23:21:11 +03:00
Programerus
a70b3ebfa8
Comments translated from French to English. (partially)
2012-04-08 00:02:06 +03:00
Programerus
00fddf5169
Comments translated from French to English.
2012-04-07 17:07:32 +03:00
Programerus
558a3cb125
Comments translated from French to English.
2012-04-07 17:04:32 +03:00
Piotr Dziwinski
dcd5bf8609
Better fix for #17
2012-04-07 15:58:46 +02:00
Programerus
b1bf48e9fd
Comment fix.
2012-04-07 16:30:51 +03:00
Programerus
699187758d
Comments translated from French to English.
2012-04-07 16:29:14 +03:00
Programerus
b3fd18d133
Comments translated from French to English.
2012-04-07 00:36:22 +03:00
Programerus
8c0dd5ced2
Comment fix.
2012-04-06 22:13:01 +03:00
Programerus
155c6c151c
Comment fix.
2012-04-06 22:12:38 +03:00
Programerus
80cb8c399f
Comments translated from French to English.
2012-04-06 22:11:02 +03:00
Programerus
9c03ff837f
Comments translated from French to English.
2012-04-06 22:09:00 +03:00
Programerus
6071aea68c
Comments translated from French to English.
2012-04-06 22:05:02 +03:00
Programerus
cfddac0e46
Comments translated from French to English.
2012-04-06 21:57:20 +03:00
Programerus
bb21367eea
Comments translated from French to English. (partially)
2012-04-06 02:45:33 +03:00
Programerus
b4ddfeacfa
Comments translated from French to English.
2012-04-06 00:46:21 +03:00
Programerus
4511a636e0
Comments translated from French to English.
2012-04-06 00:19:43 +03:00
Piotr Dziwinski
f25f8229a0
Temporary fix for #17
2012-04-05 22:49:31 +02:00
Piotr Dziwinski
99d42707cb
Merge branch 'master' of https://github.com/adiblol/colobot
2012-04-05 22:30:48 +02:00
Piotr Dziwinski
5bd2688eb0
Fixes for GCC and removal of extern inline ( #12 )
2012-04-05 22:29:50 +02:00
Programerus
346d310b7a
Comments translated from French to English.
2012-04-05 23:26:09 +03:00