1dd3a4d57e
Fixed loading challenge solutions and made them read-only
2015-04-06 17:00:22 +02:00
66ea5fd92b
Fixed NewScript
2015-04-06 16:41:05 +02:00
1a8bb9c0fb
Marked programs from SatCom with a star
2015-04-06 16:21:19 +02:00
58016c6c69
Made programs from SatCom read-only; added program cloning
2015-04-06 16:07:49 +02:00
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
6844b2170f
Fixed occasional crash in CRobotMain::DeleteAllObjects
2015-03-29 15:50:47 +02:00
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
30f7075f4e
Fixed program selection shortcuts
2015-03-29 14:31:43 +02:00
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
72196b252c
Made powermin and powermax work with cells that are not in bot's power slot
2015-03-28 12:21:56 +01:00
14068ce54b
Don't count transported items by default ( #412 )
2015-03-28 12:19:40 +01:00
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
498a5ca4cd
Reapplied temporary fix for #94
2015-03-22 17:40:08 +01:00
a0097a0e53
Copying info about selected object to clipboard ( #391 )
2015-03-22 16:32:21 +01:00
56d66b3417
Added bots/buildings switch shortcut ( #391 )
2015-03-22 16:02:05 +01:00
23c734c3c1
Implemented shortcuts for starting programs ( #391 )
2015-03-22 15:49:33 +01:00
7e3e1c00d2
Made sniffer flatground button available only with EnableBuild
2015-03-22 14:56:35 +01:00
7578f3c118
Made bf55691e44 work with new CObjectManager
2015-03-22 14:50:54 +01:00
bf55691e44
Issue #399 : Sniffer can delete mark and probe ground
2015-03-22 14:40:19 +01:00
33fcdbbef5
Removed unused CRobotMain::BuildScenePath
2015-03-22 14:12:41 +01:00
d2d0886b76
Implemented %cat%
...
and renamed BuildSceneName to BuildScenePath
2015-03-22 13:51:14 +01:00
c3b9c3ce4d
Changed std::vector default value, should fix compilation errors on GCC 4.6
...
Fixes #393
2015-03-21 17:21:26 +01:00
3c2b0a8206
Probably fixed null CObject* instances in object list, should fix #440 , #441 , #442 and #443
2015-03-08 16:14:45 +01:00
6d85db5314
Fixed weird Converter behaviour, closes #431
2015-03-08 16:05:14 +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
61b186343f
Fixed #424 , #423 and probably #421
2015-01-08 18:56:26 +01:00
986cf98aaf
CController - entry point into CRobotMain and CMainDialog
2014-12-22 10:36:36 +01:00
4fef3af9ef
Moved all CObject management from CInstanceManager to CObjectManager
2014-12-21 19:04:31 +01:00
e8a0dc8ddb
CObjectManager::Radar
2014-12-20 20:36:09 +01:00
c5b6faea05
Refactored CObjectManager to std::map
2014-12-20 19:09:53 +01:00
07c651bd0a
Moved all CBot functions into a separate class
2014-12-20 18:45:46 +01:00
af9960d41e
Fixed saving files from CBot
2014-12-20 18:20:59 +01:00
ce27a80caa
Moved "file" CBot class (CRobotMain -> CScript)
2014-12-20 18:03:49 +01:00
fb07691790
New speed keybindings
2014-12-14 17:05:28 +01:00
be0f4c2ffe
Refactored keybindings UI and added some keybindings
2014-12-14 16:54:32 +01:00
eec6041104
Refactoring of input and input bindings, CInput class
2014-12-11 19:14:33 +01:00
f30592bf56
Better fix for #94
2014-11-22 13:30:50 +01:00
e0448825a8
Fixed reading cmdline=, closes #388
2014-11-12 17:01:31 +01:00
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
c509bc1709
Fixed PowerCell/Tracked animations ( closes #389 )
2014-11-12 15:05:02 +01:00
a50da4f5de
Loading texturesfrom objects/ subdirectory
...
Closes #381
2014-11-11 15:52:08 +01:00
fa4c70d1fe
Resetting fields in scene to defaults
...
Fixes #218
2014-11-11 15:38:11 +01:00
fa2bd7901a
Translations for autosave
2014-11-11 14:56:19 +01:00
a1fe9c8d7f
Implemented autosave ( #292 )
2014-11-11 14:50:44 +01:00
b8103963c3
Sorting saved games list ( #380 )
2014-11-11 12:08:19 +01:00
afa0061364
Reset save filename if exception is thrown while loading
2014-11-10 22:50:00 +01:00
5cd45fbe17
Fixed saving aParamString in CAutoEgg
2014-11-10 22:45:06 +01:00
462f0ce9d7
Removed unused PHYSFS conversions
2014-11-10 22:19:52 +01:00
76ca4fc6ae
Fixed isnan() on MXE
2014-11-10 22:17:41 +01:00
b698c40abf
Fixed saving Shielder's shield ( #365 )
2014-11-10 21:26:02 +01:00
ef35a3a2ef
Custom path to SecondTexture, closes #370
2014-11-10 20:46:39 +01:00
643d1ec46a
Fixed scenetest mode
2014-11-10 20:23:18 +01:00
fca746fdb4
Merge branch 'dev-physfs-save' into dev
2014-11-10 19:39:56 +01:00
a952e0ec54
Fixed DefenseTower empty cell detection ( #378 )
2014-11-10 19:38:49 +01:00
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
aeaea87d0d
Saving/loading list of finished missions via PHYSFS
2014-11-10 19:23:51 +01:00
4994965201
Removed CRobotMain::GetPHYSFSSavegameDir()
...
Everything in CRobotMain uses PHYSFS now
2014-11-10 19:02:07 +01:00
025419324b
Research saving (for free game) in PHYSFS
2014-11-10 18:49:00 +01:00
169e860240
Removed PHYSFS hacks from Load/SaveFileScript as they are no longer necessary
2014-11-10 18:36:16 +01:00
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
c861e67cc0
Fixed proxyDistance saving
2014-11-10 17:50:50 +01:00
8c84f012c6
Level state loading via CLevelParser
2014-11-10 17:15:34 +01:00
3dade17f89
Level saving through CLevelParser
2014-11-10 14:27:42 +01:00
1477e72ab4
Saving code for CLevelParser
2014-11-10 12:05:57 +01:00
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
bfdc577547
Removed m_checkEndTime
...
It was disabled some time ago
2014-11-09 19:19:14 +01:00
894d4173f6
Activate console by "~", closes #366
2014-11-09 18:58:13 +01:00
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
25d5d105fd
Fallback to English files if translated ones are not available
2014-10-31 21:23:10 +01:00
501cd7026b
Fixed m_exitAfterMission
2014-10-31 20:49:40 +01:00
71577b7b0a
Fixed #335 and #348
2014-10-31 20:40:19 +01:00
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
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
6d2fd18b41
Implemented mission timer
2014-10-29 17:53:46 +01:00
61e06149c6
Fixed position updating
2014-10-29 16:08:55 +01:00
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
11854dc89e
Fixed script saving (issue #348 )
2014-10-27 21:49:03 +01:00
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
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
c12ebb1c7b
Fixed NewScript ( #341 )
2014-10-25 17:17:59 +02:00
7d28b9a6da
Fixed #340
2014-10-25 12:01:21 +02:00
4c865322f0
Fixed #341
2014-10-25 11:30:38 +02:00
97b7c0cab1
Fixed map turning gray after resizing window
2014-10-20 21:54:52 +02:00
c0ac60e4fa
Fixed save directories in things not yet refactored to use PHYSFS
2014-10-20 21:15:39 +02:00
cf7be276dc
Possibly fixed goto() by changing safety margin
...
TODO: More testing
Closes #326
2014-10-20 20:48:03 +02:00
0245fdc6c3
Merge branch 'dev-physfs' into dev
...
Conflicts:
src/app/app.cpp
2014-10-19 16:18:36 +02:00
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
47ea8a1175
Updated some more license headers
2014-10-15 21:16:06 +02:00
f65b00089a
Merge branch 'dev' into dev-physfs
...
Conflicts:
data
2014-10-14 15:42:19 +02:00
9fd6cf5449
Changed all occurences of PPC in the code to TerranovaTeam
2014-10-14 15:26:18 +02:00
342210b062
GCC 4.6 compilation fixes
2014-10-07 23:25:37 +02:00
5274acd624
Merge with dev
2014-10-07 22:15:40 +02:00
2770ee8927
Fixed issue #324
2014-10-07 21:40:51 +02:00
3ef2f976df
Added %chap% for current chapter directory
2014-09-29 21:53:21 +02:00
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
ad79babbc1
Made proxyDistance optional
2014-09-27 18:34:08 +02:00
b3fa72c007
Moved effect??.png textures and made pos= in GroundSpot optional
2014-09-27 18:26:29 +02:00
32504be8a9
Fixed TerrainLevel bug
2014-09-27 17:46:52 +02:00
8fab044bcd
Removed more unused variables
2014-09-27 17:16:58 +02:00
c29ef4ec41
Fixed some warnings
...
Removed unused variables and fixed signed/unsigned comparation warnings
2014-09-27 16:49:00 +02:00
de375548ad
Userlevel listing
2014-09-26 20:53:11 +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
e4d52d9afb
CProfile refactoring
2014-08-12 21:24:33 +02:00
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
a56e69883f
Removed some unused code
2014-08-06 16:58:36 +02:00
7131abd385
Fixed SatCom image loading
...
Now LoadTexture/SetTexture functions require full path with "textures/" directory
2014-07-24 22:17:49 +02:00
02ba358a89
Help file loading
2014-07-11 16:40:07 +02:00
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
9a6c06665c
Removed some old stuff related to Ceebot-Teen
2014-07-10 17:39:45 +02:00
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
106ec014b8
Fixed texture and script loading
2014-07-10 16:25:40 +02:00
1835d2ae58
Removed old code based on #ifs (issue #55 )
2014-06-27 19:52:09 +02:00
3aca1de731
More work on levels
2014-06-22 21:30:23 +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
f71658e38d
Random relief generator
2014-04-10 21:50:26 +02:00
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
e569fd6c39
Fix for #294
2014-03-16 15:25:49 +01:00
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
a806d4257c
Check if pause music is defined in scene before trying to play it
2014-03-02 16:10:02 +01:00
14709427c4
Fixed compile warning
2014-02-21 14:33:56 +01:00
bb2a9bcfd3
Added option to set pause audio in Scene
2014-02-21 14:19:58 +01:00
181a404930
Fixed warnings about unknown commands in scene files
2014-01-18 19:24:08 +01:00
652dc6081d
Removed some unused objects
2014-01-11 23:43:10 +01:00
59935b4706
Changed comments in ObjectType to be object categories; removed unused SEAWEED
2014-01-01 17:33:19 +01:00
90437d1765
Fixed two bugs in dc81cda4b1
...
* win/end scene animations
* produce() was producing empty cells
2014-01-01 16:45:08 +01:00
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
4a237f5925
CPauseManager
2013-12-31 13:24:09 +01:00
3536f1c7cc
Added CObjectManager::Flush()
...
Possible fix for #275
2013-12-30 10:51:29 +01:00
a36450a6da
Added tool= i drive=
2013-12-29 15:03:21 +01:00
dc81cda4b1
Cleaned up creating objects
2013-12-29 12:08:59 +01:00
e9addb5a5e
Added smooth transition in music - issue #205
2013-12-28 12:30:46 +01:00
246b7e107e
Removed prototypes support
2013-12-27 20:36:11 +01:00
555c486fc6
Disable immediat SatCom when scene test is enabled
2013-12-26 22:33:17 +01:00
0f57809f51
Added scene test mode
...
... and fixed a "small" bug in previous commit ;)
2013-12-26 22:13:04 +01:00
3a78d587bd
Exit the game after finishing the mission while using -runscene
2013-12-26 21:54:05 +01:00
8b121910c1
Indentation fixes
2013-12-26 19:39:32 +01:00
46a7aa98b0
Added error message when unable to load script from file specified in CreateObject
2013-12-26 19:36:17 +01:00
0d31f59b12
.takeoff() for SpaceShip ( #265 )
2013-12-26 18:50:05 +01:00
c8ec3f2020
Added "E" as a secondary action button
...
As requested by @Emxx52 on IRC
2013-12-25 19:43:11 +01:00
55fd03ade3
Added WSAD as secondary controls ( #231 )
2013-12-25 19:34:34 +01:00
d0285d6886
Fixed AudioChange
2013-12-25 18:53:32 +01:00
8deb130572
Changed char[] to std::string in restext
...
Experimental changes
2013-12-04 00:15:39 +01:00
3bcf80a82a
Tweak tooltip margin and correct french jargon comment
2013-11-19 17:22:25 +01:00
9017dbbbdb
Fixed CTerrain-related memory leaks
2013-10-13 14:44:12 +02:00
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
41fa8458c2
Some Ui refactoring
2013-06-24 22:09: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
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
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
7cf8811888
Fix for #195
...
* loading time now is not counted in elapsed time
2013-06-13 17:25:58 +02:00
e8e220085a
Fixed bug with showing wrong filename in Level Checker errors after using CacheAudio
2013-06-10 15:44:25 +02:00
b22d852b4c
Fixed variable shadowing warnings
...
* fixed -Wshadow warnings
* refactored some constructors
2013-05-27 22:29:42 +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
538745a731
Fixed some compilation warnings
...
* fixed warnings about hiding virtual functions and several others
2013-05-27 10:19:04 +02:00
b41957f2f9
Corrected some valgrind issues
...
* fixed several uninitialized variable issues
* fixed possible memory corruption in CEngine
2013-05-26 11:34:53 +02:00
f90a4b48f5
Added object.research(type)
2013-05-19 21:48:29 +02:00
b9d0ee034e
Running program in robots created using object.factory()
2013-05-19 16:27:33 +02:00
b65196c17f
Change in goto() for Destroyer
2013-05-18 18:22:18 +02:00
796cb92ffc
Added object.destroy()
2013-05-18 18:04:48 +02:00
8004e68948
Added object.busy()
2013-05-18 18:04:48 +02:00
47d7b80507
Added object.factory(cat)
2013-05-18 18:04:48 +02:00
06cf93f466
Better print fix
2013-05-12 13:05:32 +02:00
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
dcf4c8941f
Corrected print
2013-05-11 23:11:58 +02:00
40954038ab
Added error message for undefined command
2013-05-05 20:51:08 +02:00
4dcee0a4d1
Added continue at end of every Cmd() check
...
As mentioned in issue #173
2013-05-05 20:38:20 +02:00
dbcc2c61f9
Added Build and Research constants
2013-05-05 20:10:36 +02:00
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
6333d2d38e
Removed most of "No such node" messages
2013-05-04 11:56:03 +02:00
26c92d074d
Fixed "ptree is too deep"
2013-05-03 21:39:02 +02:00
f68581a3ae
Improved log levels of trace control
2013-05-03 12:26:26 +02:00
1250f889d9
Improved MissionController movement a little bit
2013-05-02 20:59:20 +02:00
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
8a1e4b1e5f
Added button for Destroyer
...
Issue #142
2013-05-02 17:55:53 +02:00
d9f1b4f69d
Added CacheAudio to level files
2013-05-02 10:53:18 +02:00
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
d815fbf09e
Saving information to profile ( #154 )
2013-05-01 21:02:43 +02:00
9e1870f6bd
Removed some warnings
...
+ fix for previous commit
2013-05-01 13:19:10 +02:00
f419293207
Minor refactoring
2013-05-01 12:12:32 +02:00
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
75950c55ba
MissionController improved
2013-04-29 17:26:32 +02:00
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
krzys-h