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
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
d425e09186
Merge branch 'shadow-bug' into fix-for-shadows
2013-04-29 13:55:02 +03:00
658ebe015f
Fix for shadows (bugs #176 and #132 )
2013-04-29 13:51:37 +03:00
5fd64624d3
Fix for game crashing sometimes when using MissionController
2013-04-28 20:24:46 +02:00
919b0e8114
Merge branch 'dev' of github:colobot/colobot into dev
2013-04-28 20:09:41 +02:00
c7d289c00b
Beggining of MissionController
...
Controling mission using CBot
2013-04-28 20:05:19 +02:00
fc28a8e840
Implemented EndMissionNever ( #181 )
2013-04-28 18:33:59 +02:00
5669053de0
Some code refactoring
...
Changed vehicule (french) to vehicle (english) in enums and variables
2013-04-27 17:50:30 +02:00
4f1e000cea
Fix for #167 when starting mission
...
+ various fixes
2013-04-27 13:43:01 +02:00
45f06cec51
* Fix for issue #71 : division by zero on init resulted in bad value after
2013-04-26 16:51:17 +02:00
adb4b06550
* Issue #173
2013-04-26 15:55:06 +02:00
1828e60c92
* Changed order of reading Audio and AudioChange (issue #173 )
2013-04-26 15:34:02 +02:00
02cb9a6993
Fixes programs list size
2013-04-25 22:11:36 +03:00
6a1dba0f15
* Resetting arm position on abort for sniffer (issue #162 )
2013-04-23 12:05:04 +02:00
364482f022
Fix for #180 (bug in commit dd180dd887)
2013-04-20 15:17:40 +02:00
dd180dd887
Added powermin= and powermax= parameters
...
Issue #174
2013-04-20 12:08:48 +02:00
81fcde4d67
Fix for "Ability to select the object in Vault"
...
Issue #170
2013-04-20 11:17:21 +02:00
ec68802136
Fix for not saving robot programs
...
It was Windows-only bug.
issue #137
2013-04-20 10:57:42 +02:00
6ea0031d83
Added loading from custom files for Audio
2013-04-13 16:35:35 +02:00
cdba398d29
Added music files cache
2013-04-13 16:34:52 +02:00
e3b92fb9d8
Some optimalizations to AudioChange
2013-04-13 15:07:27 +02:00
ebffda717b
Implemented AudioChange (partially)
...
There is some issues due to #173
Issue #172
2013-04-13 11:44:16 +02:00
7b2e0e6519
Added cheats "all" & "allbuildings" ( #163 )
2013-04-12 22:53:03 +02:00
b0919139bd
* Fix for issue #161 : function checking for radar didn't check if it's finished
2013-04-11 15:34:03 +02:00
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
ff97de5477
Fixed graphics objects after reset
...
Should fix #120 and perhaps some other bugs as well
2013-03-31 13:06:38 +02:00
0d70b6e2f8
More parameters to destroy()
...
Also, removed some warnings in script.cpp
2013-03-31 12:04:12 +02:00
2f7ff844d3
Small fix to CObject::ExploObject
2013-03-31 11:15:45 +02:00
0625f064a7
Merge branch 'dev' of github.com:colobot/colobot into dev
2013-03-31 10:22:08 +02:00
90301e24c0
Added field "item" to class "object" in CBot
2013-03-31 10:21:22 +02:00
5a60a7a219
Merge branch 'dev' of github:colobot/colobot into dev
2013-03-30 16:04:58 +01:00
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
e607fed265
Fixed power cell bug ( #120 )
2013-03-30 14:45:55 +01:00
8777c126de
Added SatCom translations
2013-03-29 10:03:35 +01:00
8659fb984f
Added option to lock SatCom
2013-03-27 22:20:50 +01:00
672abbbbca
Removed "X" button
2013-03-27 20:38:36 +01:00
8f379e5cf1
Changes to Scribbler interface
2013-03-27 19:55:27 +01:00
0691460682
Added button for grab()/drop() for AlienWasp
2013-03-27 15:30:34 +01:00
df5edc703c
Added interface button for AlienSpider explosion
...
Issue #142
2013-03-26 15:33:54 +01:00
43c39f60cd
Added option "zoom=x;y;z" to CreateObject in mission files
2013-03-25 16:12:18 +01:00
5810fdd717
In Retro mode, robot's lights always blink.
2013-03-24 21:31:31 +01:00
f4e222248f
Retro mode now disables possibility of writing and running programs
2013-03-24 19:05:20 +01:00
5deb68e698
Small fix in mission files code
2013-03-24 16:35:00 +01:00
956efb1feb
* Blocked cheat input in SatCom, intro movie and while editing cbot (issue #130 )
2013-03-23 20:33:14 +01:00
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
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
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
6c783b9033
* Fix for issue #122 with sound not being played in menu after playing mission
2013-03-14 21:30:32 +01:00
1f565fdf38
"allmission" default value depends on build type
2013-03-09 15:28:36 +01:00
f729686539
Fixed segfault in light manager
...
Also fixed minor memory leak
2013-02-28 22:56:44 +01:00
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
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
59a40088a5
Merge pull request #125 from PaweX/dev
2013-02-13 11:26:17 -08:00
8658d6da80
Added Destroyer from Ceebot-Teen.
...
We need a new icon for it.
2013-02-13 16:58:19 +01:00
551d6c4d95
Additional parameter for function aim(x, y).
2013-02-13 02:59:40 +01:00
6f64770714
* Fixes to ingame editor
...
* Fixes to editor window. It's now possible to resize, move and press buttons
2013-02-09 21:00:07 +01:00
a937a7b6ec
Changed model min/max to LOD levels
2013-01-27 11:43:53 +01:00
b50f9ae8b7
Fixed some clang warnings
2013-01-17 20:54:35 +01:00
89a3f586a2
Merge branch 'dev' into dev-graphics
2013-01-04 00:05:28 +01:00
c9335534d6
Fix for #113
2013-01-04 00:02:13 +01:00
1b4208cdc5
Implement language Char for level files
...
This currently lacks fallback to an existing entry for non-translated entries
2012-12-28 23:06:12 +01:00
3e4c1a1ad8
Replaced malloc/free with new/delete
...
- now new/delete used everywhere except for CBotStack, which
has to be fixed in other way
- some segfaults should be fixed with this
2012-12-28 13:37:08 +01:00
2ebe1fbcb6
Fixed spider and worm model loading
2012-12-28 13:23:49 +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
1fa5f7a96f
* Changed log level in sound module
...
* Fixed warnings in sound module
* Fixed problem with map loading when locale with different number separator
2012-12-25 17:46:48 +01:00
0305e0ba17
Restext rewrite to runtime initialized arrays
2012-10-17 23:16:19 +02:00
f6e27099b2
Doxygen/comment fixes and some #include refactoring
2012-10-17 21:55:45 +02:00
9738631e5e
Removed unnecessary dynamic_casts
2012-10-17 21:48:40 +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
97f44035f1
Changing and saving input bindings
2012-10-07 00:46:46 +02:00
7818d5d096
Setting speed now works. Added ability to set 4x and 8x using "speed4" and "speed8" cheat codes respectively.
2012-10-06 23:35:27 +02:00
0c6b6fccd9
Merge remote-tracking branch 'origin/dev' into dev-graphics
2012-10-05 20:39:23 +02:00
b5a7708f99
Refactoring: changed UNIT to g_unit in CRobotMain class
2012-10-05 20:37:20 +02:00
37302a2504
CLightning rewrite
2012-10-05 15:26:24 +02:00
858b1e35ae
Spot light angle fix
2012-10-03 00:29:59 +02:00
c36d0c8ed2
Fixed invradar cheat code.
...
Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar.
Changed logger level of "invalid m_motion" messages.
2012-09-30 01:51:37 +02:00
a8554cfae3
Texture coloring
2012-09-29 23:37:38 +02:00
1fa7053ac0
Fixed object selection by clicking
2012-09-29 19:29:51 +02:00
e9660c47c6
Merge branch 'dev' into dev-graphics
2012-09-29 12:19:00 +02:00
38ebf4c398
Merge branch 'master' of https://github.com/colobot/colobot into dev
2012-09-28 20:17:56 +02:00
099f6c4f0b
* Fixed Issue #54 : flags don't show in 3D view
2012-09-28 00:05:49 +02:00
6d0ed0d26a
Completely fixed light issues
...
Directional and spot lights are now set properly
2012-09-27 23:18:12 +02:00
a394c9efec
Updated docs and some Doxygen fixes
2012-09-27 20:43:20 +02:00
2ef1c8b6f8
Fixed blinking light problem
...
- temporarily commented out misbehaving code in CPhysics
- some fixes in CLightManager
- minor refactoring in CRobotMain
2012-09-27 20:36:52 +02:00
80d3a9bff1
Lighting fix (experimental)
...
- changed fixed light allocation to prioritized per-use basis
- minor refactoring in CPlanet and CWater
2012-09-26 23:18:57 +02:00
f6638a173e
Work in progress on opening files, and listing dirs
...
Fixed includes
profile changed from SimpleIni to boost::ptree -> not finished yet
2012-09-26 22:57:43 +02:00
b1edcc822f
Various fixes
...
- disabled UserDir() in path lookup
- fixed crashes on loading missions in CObject
- fixed texture bug in CTerrain
- changed mouse move event handling to avoid flooding event queue
- enabled all missions for testing
2012-09-22 17:36:10 +02:00
fd09071c29
Data dir paths
...
- changed access to paths in data directory in CApplication
- models now load from data directory
2012-09-22 14:40:13 +02:00
0ff419560d
Event fixes & refactoring
...
- added new state tracking to Event
- removed old fields from Event
- fixed some issues with Events and fps counter
2012-09-22 00:38:17 +02:00
60c37aac3a
robotmain, restext and engine fixes
2012-09-21 00:01:03 +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
bd36d76b31
Mouse pos setting, low cpu mode, stats display
2012-09-20 20:37:37 +02:00
10c9d92cd2
Mouse wheel events, motion vectors
...
- added mouse wheel events
- added motion vectors to CRobotMain
- other minor changes in event.h
2012-09-19 21:23:42 +02:00
51884cef8e
Input bindings rewrite
...
- moved input bindings to CRobotMain
- added virtual keymod and joystick button key presses
- fixed putenv error; other minor fixes
2012-09-19 18:32:18 +02:00
7bce8f073c
Merge branch 'dev' of https://github.com/adiblol/colobot into dev
...
Conflicts:
src/ui/slider.cpp
2012-09-18 22:39:10 +02:00
36ae984ac7
Warnings cleaned, left only those connected to commented out code.
2012-09-18 22:33:28 +02:00
a397922e8d
warnings fight in progress.
2012-09-18 00:01:00 +02:00
4b67386a69
Change of background image handling
...
- removed old 4 quarter backgrounds
- fixes in texture loading
- other minor fixes
2012-09-17 23:41:53 +02:00
844e11db4f
changes needeto to cimpile on windows.
2012-09-17 20:47:27 +02:00
2e21435f43
Some memory leaks fixed
2012-09-16 20:00:25 +02:00
6a0d150539
Interface works
...
- removed mock of CInterface and fixed event passing to CRobotMain
- changed texture names from tga and bmp to png
- UI now works but interaction is still broken
2012-09-16 10:38:08 +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
a1400f496b
CRobotMain rewrite
...
- rewritten CRobotMain
- won't compile yet because of dependencies to CMainDialog
2012-09-15 15:33:08 +02:00
8b9954fff4
brain.* mainmovie.* : Partially rewritten
...
The remaining part will be revised and rewritten after merge with dev and dev-ui branches
2012-09-13 22:14:40 +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
44e4bcef45
Merge branch 'dev-object' of github.com:adiblol/colobot into dev-object
2012-09-11 23:29:00 +02:00
1bb1eb7b87
half of task compile.
2012-09-11 23:11:34 +02:00
68d9c61e97
[src/object] motion.* motionant.* motionbee.* should compile
2012-09-11 22:45:48 +02:00
479a67a731
Merge with changes from Zaba999 fork.
2012-09-10 23:29:38 +02:00
6892d37a4f
[src/object/auto] Folder rewritten
2012-09-09 14:28:19 +02:00
f5a8a92050
Move ObjectType enum to a separate file
2012-08-25 13:47:48 +04:00
dc3cadd309
Merge pull request #37 from konopackim/dev
...
Fixes and console interpreter
2012-08-13 08:46:03 -07:00
f01296690e
Merge branch 'dev-opengl' into dev
2012-08-12 17:09:11 +02:00
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
a9186d1960
Changed GivAttrName() to GetAttrName()
2012-08-11 20:59:35 +02:00
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
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
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
af3057df7e
Merged changes from dev
...
Resolved conflicts & added fixes.
2012-07-04 19:56:22 +02:00
ca254d70b6
Deleted #include "ClassFILE.cpp" code.
2012-07-01 01:00:27 +02:00
1b83929487
Pulled changes from master branch
2012-06-28 22:54:53 +02:00
c2a7375788
Removed trailing whitespace
2012-06-26 23:01:17 +02:00
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
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
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
c0461add5f
Refactoring of #includes and forward declarations in object/
2012-06-20 17:00:16 +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
a8665d2042
Changed #defined constants to consts; typedef struct -> struct
2012-06-11 17:28:27 +02:00
697fbdabf1
BOOL -> bool; additional fixes in constructors/destructors
2012-06-10 15:28:12 +02:00
680af17819
Fixed include paths and CMakeLists.txt
...
Additionally, changed #ifndef to #pragma once everywhere
2012-06-10 00:18:08 +02:00
d6525b5661
Changes from master
2012-06-08 20:30:57 +02:00
449cc186d5
Source files split into modules
2012-04-28 17:53:17 +02:00
erihel