86f473ac16
Finished support for up to 999 chapters and levels
2015-07-18 19:48:25 +02:00
ea9361fbb4
LevelCategory enum
2015-07-18 19:45:40 +02:00
b3b6435039
Use MakeUnique with level parser classes
2015-07-17 20:38:21 +02:00
c8f6e8124e
Replaced CLogger::GetInstancePointer() calls with GetLogger()
2015-07-16 22:12:44 +02:00
8a72f0a849
Addressed commit comments on a0e0ee3631
2015-07-16 20:09:06 +02:00
a0e0ee3631
Separate shortcut bars for teams
2015-07-16 13:46:40 +02:00
83f3cfa6e0
Fix some memory problems reported by valgrind
...
Also remove some manual memory management
2015-07-15 20:23:21 +02:00
31bc740f4b
Fix focusing issues with controls and cheat console
2015-07-15 19:11:48 +02:00
d5da68d59a
Refactor old Get/SetAngle/Zoom -> Get/SetPartRotation/Scale
2015-07-14 21:35:43 +02:00
e1223ff881
Fixed shortcuts behavior
...
It was kinda broken after implementing code battles
Also, fixed overlap of shortcuts bar with cheat console
2015-07-14 21:32:08 +02:00
20dbb8320b
Remove unused reset code
2015-07-13 22:46:51 +02:00
38a0849e10
Added system mouse option
...
This reverts commit e21853d632
2015-07-13 12:11:11 +02:00
394f911d7b
Remove unnecessary #include "object/object.h"
2015-07-12 14:23:18 +02:00
9a7c1961a4
GetPostion(), GetRotation() and GetScale() in CObject interface
...
Also replace old calls like GetPosition(0) to GetPosition()
2015-07-12 11:05:50 +02:00
03717e11d4
Added aspect ratio in resolution list ( #501 )
2015-07-11 23:53:25 +02:00
36d08e852c
Better splashscreen scaling on widescreen resolutions
2015-07-11 12:57:18 +02:00
93479af188
CTransportableObject interface
2015-07-10 19:51:49 +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
7e41e9fe23
Refactored keybindings storage
2015-07-10 10:11:40 +02:00
5a68558f4c
Implemented basic joystick selection
...
You can select joystick in the config file, there is still no GUI. By default, the first available joystick is used.
issue #171
2015-07-10 00:05:43 +02:00
9b232ee3f5
Sound enum refactoring
...
* rename Sound -> SoundType
* add parsing string to SoundType
2015-07-09 21:32:25 +02:00
f1684f85be
Introduce new CObject base class and mixin class framework
2015-07-02 23:50:50 +02:00
f6bc8f94bf
Rename fret/truck to cargo/transporter
2015-06-29 23:11:02 +02:00
78e09c757d
Basic support for teams and code battle missions
2015-06-26 22:07:55 +02:00
88ec9aaae3
Drop GCC 4.6 support
2015-06-26 00:24:32 +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
90bf51ba54
Possible fix for #458
2015-06-22 22:53:55 +02:00
8806d1708d
Proper CAuto, CBrain, CMotion, CPhysics, CPyro lifetime management
...
* change manual memory manament to std::unique_ptr
* create CPyroManager
* finally get rid of CInstanceManager
2015-06-22 21:58:58 +02:00
02ffdcfe23
Refactor level parser code
...
* replace manual memory management with std::unique_ptr
* remove unnecessary dynamic allocations
* make coding style consistent
2015-06-21 20:59:23 +02:00
5f1d3c21d4
Fix some more warnings reported by Clang
2015-06-21 19:46:01 +02:00
304542afe2
Some syntax sugar for iterating through all objects
2015-06-21 16:22:09 +02:00
0c9a9bce98
Proper CObject lifetime management
...
CObjectManager is now the only class responsible for storing CObjects
2015-06-21 15:13:55 +02:00
fed67e6640
Rename objman.h/cpp -> object_manger.h/cpp
2015-06-20 20:02:40 +02:00
74a31c9fb4
Corrected compilation errors on Linux builds
2015-06-16 19:30:35 +02:00
a880210b3d
Added ShadowRange option
2015-06-15 18:41:31 +02:00
1e3c2cc2df
Increased the height of text area for displaying authors.txt (should fix #465 )
2015-05-09 20:36:32 +02:00
6c87144ae8
Merge branch 'ManuelBlanc-dev-osx' into dev
2015-04-28 15:18:37 -07:00
4c8127c6ec
Fix two bugs uncovered by MSVC
2015-04-27 20:04:01 +02:00
3dce58c0fa
Replace override and noexcept with macros
2015-04-27 18:07:42 +02:00
d23170aaf1
Fixed monospace CBot editor font ( closes #464 )
2015-04-23 21:01:04 +02:00
df4cb110b5
Made example programs not directly runnable ( #450 )
2015-04-17 22:39:57 +02:00
45edb29de4
Fixed event management in settings, again
2015-04-17 22:02:10 +02:00
e21853d632
Removed old, unused mouse shadow option
2015-04-17 21:54:03 +02:00
c32e552368
Fixed event management in settings phases, fixes #452
2015-04-17 21:47:03 +02:00
efe04be1c2
Implemented button rendering in SatCom ( #232 )
...
Finally!
2015-04-07 12:06:43 +02:00
2f5d4e3b2f
Fixed cheat console in main menu
2015-04-06 17:23:18 +02:00
1dd3a4d57e
Fixed loading challenge solutions and made them read-only
2015-04-06 17:00:22 +02:00
58016c6c69
Made programs from SatCom read-only; added program cloning
2015-04-06 16:07:49 +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
23c734c3c1
Implemented shortcuts for starting programs ( #391 )
2015-03-22 15:49:33 +01:00
8cc74002cf
Added CLevelParser in one more place
...
Not sure how I missed that earlier
2015-03-22 14:29:03 +01:00
d2d0886b76
Implemented %cat%
...
and renamed BuildSceneName to BuildScenePath
2015-03-22 13:51:14 +01:00
f43acaa943
Store resolution as value instead of id on the list, closes #417
...
Also fixed a bug where after starting the game for the first time the "Apply changes" button would behave like you selected highest resolution possible (while the game is running at 800x600)
2015-03-19 19:46:37 +01:00
f0d32125e9
Don't crash when there are too many images in SatCom
...
This limit will be removed during UI refactoring in the future.
Also, I've increased the limit to 100 lines.
issue #411
2015-03-18 21:39:35 +01:00
e179847358
Fixed remapping virtual keys, closes #415
2015-03-18 21:29:33 +01:00
92ea770121
Better fix for numerical enter (issue #427 )
...
Should now work everywhere, not only in the editor.
2015-03-18 21:10:47 +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
cb95f9947c
Corrected the problem where every key acted as Enter
2015-01-27 18:18:27 +01:00
dfda70af07
Numerical Enter key should now act the same as normal Enter ( #427 )
2015-01-18 12:47:37 +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
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
7356f67b78
Shortcuts now use the meta key on OSX
2014-12-12 01:17:05 +01:00
5948a9e9d8
Show game version in logs, closes #413
2014-12-11 19:59:24 +01:00
601a58ea31
Nicer formatting of key names
2014-12-11 19:48:06 +01:00
eec6041104
Refactoring of input and input bindings, CInput class
2014-12-11 19:14:33 +01:00
f8fe681dc5
Issue #396
2014-11-18 20:07:00 +01:00
0ce8f7ad90
Fix #395 issue and fix read function
2014-11-15 13:45:05 +01:00
ec8b2cfd81
Fix issue #394
2014-11-14 20:23:52 +01:00
54098bcd55
Fixed updating "Apply" button after changing fullscreen, closes #392
2014-11-12 17:06:29 +01:00
675ec3a222
Fixed bug in saving list of finished missions, closes #390
2014-11-12 15:11:42 +01:00
80c9b35ce2
Close CBot editor by CTRL+Action key (default ENTER), closes #383
2014-11-11 17:42:19 +01:00
490e6fe2d6
Always show CBot documentation in SatCom, fixes #382
2014-11-11 17:22:21 +01:00
a50da4f5de
Loading texturesfrom objects/ subdirectory
...
Closes #381
2014-11-11 15:52:08 +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
97e76e6303
Better handling of filenames longer than maximum allowed
...
#354
2014-11-10 22:07:51 +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
fc5fcc7e61
Loading/saving apperance via PHYSFS
2014-11-10 19:02:43 +01:00
4994965201
Removed CRobotMain::GetPHYSFSSavegameDir()
...
Everything in CRobotMain uses PHYSFS now
2014-11-10 19:02:07 +01:00
c330bcac6d
PHYSFS in CStudio
2014-11-10 18:17:13 +01:00
5bb740696f
Fixed screenshot saving
2014-11-10 17:50:36 +01:00
fc16c36a45
Use PHYSFS in listing save files
...
Revert "Don't use physfs in saving code for now"
This reverts commit 3b1cfdbfb4
2014-11-10 17:37:34 +01:00
3dade17f89
Level saving through CLevelParser
2014-11-10 14:27:42 +01:00
6d152d5aee
Fixed console spam when music files are not installed
...
Closes #359
2014-11-02 13:35:00 +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
71577b7b0a
Fixed #335 and #348
2014-10-31 20:40:19 +01:00
c1f931c8ee
Added some debug stuff, possible fix for #348 and #335
2014-10-30 22:18:33 +01:00
066344dde3
Fixed screenshoot loading again
...
issue #335
2014-10-29 21:15:45 +01:00
d6d08797ca
I forgot to remove some debug stuff
2014-10-29 21:13:12 +01:00
f68e7df8d6
Fixed program saving ( #352 )
2014-10-29 21:06:59 +01:00
ca3a1cb02b
Changed splashscreens filenames in maindialog.cpp
2014-10-28 10:37:05 +01:00
f679b5c84c
Sorry, I didn't mean to remove that
2014-10-27 22:09:57 +01:00
d75efcc5b2
Fixed problems with loading save screenshots (issue #335 )
2014-10-27 22:08:49 +01:00
475f222276
Fixed "Device" tab opening if it was opened in main menu earlier
2014-10-25 19:11:24 +02:00
0d873ad43a
Added warning about restarting game in order to apply changes
...
issue #339
2014-10-25 18:43:02 +02:00
26376c652d
Nothing else works, so restart the game on resolution change
...
Fixes #339 for now, but we'll need alternative solution later
2014-10-25 18:34:29 +02:00
fdbc4080c7
But do 182d5206a8 only on Windows, since it works correctly on Linux
2014-10-25 17:28:30 +02:00
182d5206a8
Disable resolution settings in simulation
2014-10-25 17:23:09 +02:00
ef1edba307
Fixed #340 again
2014-10-25 17:09:14 +02:00
78d7cc9eef
Change userlevels button text via text file
2014-10-25 12:21:13 +02:00
db7ab65354
Fixed #344
2014-10-25 12:10:29 +02:00
7d28b9a6da
Fixed #340
2014-10-25 12:01:21 +02:00
2d043d46bb
Merge branch 'vieux-blood_mode' into dev
...
Conflicts:
src/common/restext.cpp
src/ui/maindialog.cpp
2014-10-22 17:52:17 +02:00
d019a4990f
add option to disable blood
2014-10-21 21:44:17 -07: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
0245fdc6c3
Merge branch 'dev-physfs' into dev
...
Conflicts:
src/app/app.cpp
2014-10-19 16:18:36 +02:00
d7ef0a1a5f
Implemented "Apply changes" button (issue #141 )
2014-10-19 15:45:59 +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
83abb8ca8e
Fixed program saving
2014-10-19 13:18:31 +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
5274acd624
Merge with dev
2014-10-07 22:15:40 +02:00
c29ef4ec41
Fixed some warnings
...
Removed unused variables and fixed signed/unsigned comparation warnings
2014-09-27 16:49:00 +02:00
d3eaf2e1ce
Merge branch 'dev-physfs' into dev-physfs-levels
2014-09-26 21:05:55 +02:00
71f84d1e16
Fixed human.png texture
2014-09-26 21:02:54 +02:00
de375548ad
Userlevel listing
2014-09-26 20:53:11 +02:00
3b1cfdbfb4
Don't use physfs in saving code for now
...
This requires too much refactoring and we want to release 0.1.5 soon.
We'll need to rewrite saving/loading code to fully implement new level parser anyway.
2014-09-26 19:50:27 +02:00
2b86e6e9d9
Rewrite CMainDialog to use physfs
2014-09-21 12:29:06 +02:00
e4d52d9afb
CProfile refactoring
2014-08-12 21:24:33 +02:00
9de086390b
Remove some more delete checks ( #318 )
2014-08-10 17:51:47 +02:00
ac019c263d
Remove unnecessary delete checks ( #318 )
2014-08-09 22:45:07 +02:00
ea0615ee05
Fixed #315
2014-08-08 14:03:43 +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
5223ef1fb1
Fixed mission description loading
2014-07-10 16:36:00 +02:00
106ec014b8
Fixed texture and script loading
2014-07-10 16:25:40 +02:00
7b04f67358
Fixed music loading
2014-07-10 15:38:37 +02:00
1ee0c0e8fe
Fixed level list
2014-07-10 15:27:43 +02:00
aa190bb59b
Last changes
2014-06-30 17:40:40 +02:00
1835d2ae58
Removed old code based on #ifs (issue #55 )
2014-06-27 19:52:09 +02:00
b7125a5b24
formatting and enhancements for savefile screenshot feature
2014-06-24 20:27:31 +03:00
613e1d74c4
implemented savefile screenshot feature
2014-06-24 01:35:05 +03:00
754154341d
More work on PhysFS support
...
* added output stream
* fixed music loading
2014-06-22 15:01:06 +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
0ff7e55b33
Fix for #177 - save list sorting
2013-12-27 22:28:25 +01:00
1b73893678
Temporary fix for #232 - don't try to show the buttons
...
This makes SatCom usable for now
2013-12-27 21:46:16 +01:00
246b7e107e
Removed prototypes support
2013-12-27 20:36:11 +01:00
9a741a66a4
Changed version display in bottom-right corner to be actually version number instead of date
2013-12-27 11:15:36 +01:00
8b5b2eeaa1
Added error message when CEdit is unable to read a file
2013-12-27 10:50:52 +01:00
fcda183b96
Hide userlevels menu in release version
...
Userlevels aren't working right now (issue #219 )
2013-12-26 21:05:58 +01:00
5661f5a413
Fixed "default controls" button ( #263 )
2013-12-25 19:41:15 +01:00
3966e3fce0
Merge branch 'dev-string-in-restext' into dev
...
Merging branches after code review
This should fix buffer overflow problems with translation strings
2013-12-20 20:22:51 +01:00
95661918ce
Some further refactoring and test corrections
2013-12-20 20:18:30 +01:00
fe3f9ea38c
Sound support changes
...
* removed 2d sound
* fixed listener orientation (propably issue #235 )
* removed unused code and minor refactoring
2013-12-19 22:46:29 +01:00
8deb130572
Changed char[] to std::string in restext
...
Experimental changes
2013-12-04 00:15:39 +01:00
f4355b8b8e
Fix tooltip to display as white and not transparent
2013-11-19 17:12:16 +01:00
418f57f8be
Buffer overflow fix
2013-11-13 18:51:52 +01:00
2acc338c3a
Drop now-useless display of licenses.txt in PHASE_GENERIC
...
The content of licenses.txt in data has gotten useless as the
restrictions got waived, displaying it is useless.
2013-10-30 21:51:05 +01: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
d70d31acc1
Fix for #232 - Images in SatCom
...
Only images, icons still don't work
2013-09-28 11:13:45 +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
b22d852b4c
Fixed variable shadowing warnings
...
* fixed -Wshadow warnings
* refactored some constructors
2013-05-27 22:29:42 +02:00
12313fecf5
Fixed some memory issues
...
* invalid pointer, uninitialized buffer
2013-05-27 20:59:50 +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
c25b6ab472
Fix for #192
2013-05-12 15:23:26 +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
9549359b46
Fix for saving wrong Fullscreen value
2013-05-04 20:13:27 +02:00
6333d2d38e
Removed most of "No such node" messages
2013-05-04 11:56:03 +02:00
56709f0e56
Small changes to looping main menu music
2013-05-02 10:58:38 +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
07374db2a3
Increased maximum font size
2013-05-01 21:32:40 +02:00
23e3e552f3
Made colobot.ini & savegame dir location depended on build type
...
For Debug, it's current dir
For Release it's like it was before
Made on @CoLoRaptor's request :)
2013-05-01 19:44:55 +02:00
9e1870f6bd
Removed some warnings
...
+ fix for previous commit
2013-05-01 13:19:10 +02:00
c2932f4ee3
Added new Intro music (by PiXeL)
2013-04-29 15:33:28 +02:00
eb37da86ce
Merge pull request #187 from xiendev/Programs-list-size
...
Fixes size of a programs list control
2013-04-26 04:56:58 -07:00
02cb9a6993
Fixes programs list size
2013-04-25 22:11:36 +03:00
b8d2ce2e4e
Welcome screen blinking fix
2013-04-25 22:05:27 +03:00
593be3b776
* Fix for bad file listing (issue #60 )
2013-04-11 21:37:19 +02:00
01309c8bd0
* Added clipboard support (issue #60 )
...
* Fixed keyboard shortcuts while code editing in game
2013-04-11 13:37:15 +02:00
a66abd4990
* Loading 3D sound settings from profile
2013-04-09 12:20:40 +02:00
7146cf8ee6
* Issue #60 : Fix for "(null)" instead of time on windows platform
2013-04-08 12:58:00 +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
8777c126de
Added SatCom translations
2013-03-29 10:03:35 +01:00
991dbd1e37
Add profile and savegame fetchers in SystemUtils
...
This breaks the tests compilation. :/
2013-03-27 10:20:06 +01:00
5eb4e10c2b
Reverted "Fix for issue #149"
...
because it was broken again after commit 7ebba6abaa
2013-03-24 16:05:21 +01:00
7ebba6abaa
* Changed ending screen (issue #129 )
2013-03-23 21:22:44 +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
64be7a5df6
* Fix for mxe with boost path
2013-03-20 20:27:19 +01:00
4abcaae0f7
* Changes std::stoi to atoi as gcc does not support it on windows platform
2013-03-17 23:16:26 +01:00
0cd64113aa
* Implemented CStudio::UpdateDialogList() function for listing saved files
2013-03-17 20:23:57 +01:00
e5aadfdaac
Merge branch 'dev' of github:colobot/colobot into dev
2013-03-17 19:05:29 +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
f88e74f887
Fix for issue #129
...
Text on exit screen is improperly placed
2013-03-17 15:05:53 +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
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
ba2df2cb42
* Fix for satcom freeze
2013-02-24 01:40:55 +01:00
c42515927e
Music restarting on PHASE_WELCOME2
2013-02-17 13:28:04 +01:00
c79c176e46
Show compilation date in main menu
2013-02-17 13:20:18 +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
c7371da676
* Fixed crash when inputing cheats
2013-02-11 20:17:43 +01:00
3f6a6a9eef
* Syntax highlighting in cbot editor (needs to be tested)
2013-02-09 23:49:38 +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
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
4421430bae
Fixed edit_test linking issue
2013-01-17 20:54:23 +01:00
01c39c88f6
* Cleaning player list before getting new one (entering user menu several times appended user to existing list)
2013-01-15 22:52:37 +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
9a9cfc51c1
Merge pull request #112 from OdyX/dev-levels-fallback
...
In levels' lists, fallback to english
2013-01-09 04:33:47 -08:00
ff5c890854
Small fix in detecting language. Fixes needed to compile code using clang
2013-01-05 23:03:26 +01:00
3fa5e9c9cc
In levels' lists, fallback to english
...
- Implemented in a naive way: Take the English version if found, but
continue until the translated version is found. This has the drawback
of letting the loop reach its end if the level has no translation.
2013-01-02 12:24:51 +01:00
ea3e97b26d
* Fixed problem with scrolling down text fields with mouse scroll
...
* Fixed problem with scroll bar not updating position properly in text fields
2012-12-29 13:32:11 +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
c793d2d4c6
* Changed Ret to Get methods in sound module
...
* Added video settings to profile
* Resolution change is now posibble but restart is required
2012-12-25 21:36:50 +01:00
7e9ef0c042
Put common CXX flags in common variables
...
CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific
flags are appended to it.
2012-12-19 16:55:00 +01:00
3c976c040b
Don't enforce CMake build type on users.
...
Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
2012-12-19 16:52:17 +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
9738631e5e
Removed unnecessary dynamic_casts
2012-10-17 21:48:40 +02:00
0ca089f4d0
Saving scripts on game save should work. Added stub for particle.
2012-10-11 23:30:37 +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
dfe21c5a9c
Removed Gfx:: from license notice (introduced in 8ad15c0e)
2012-10-08 21:50:38 +02:00
97f44035f1
Changing and saving input bindings
2012-10-07 00:46:46 +02:00
3f7f013168
Merge branch 'dev' into dev-graphics
2012-10-02 22:17:30 +02:00
4b7ca3f262
Further work on saving profile and directory listing.
2012-10-02 21:44:14 +02:00
af4ff31b4e
Merge remote-tracking branch 'origin/dev' into dev-graphics
2012-09-30 03:20:52 +02:00
923616ccac
Dirty hack to allow window resizing or even full screen.
...
Currently makes text buggy!
(full screen must be initiated by window manager, for example Alt+F11 in Fluxbox)
2012-09-30 03:18:11 +02:00
dd8c2d8d92
Merge branch 'dev' of github.com:colobot/colobot into dev
2012-09-30 02:23:49 +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
b46dc3850f
Map texture painting
2012-09-30 00:23:26 +02:00
95e1d101c8
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2012-09-29 23:53:57 +02:00
aa9df8b1f0
#48 Adding new users works.
2012-09-29 23:52:30 +02:00
c8f39a4c96
Fixed CEdit delete[] issues
2012-09-29 22:04:39 +02:00
a38d60d191
Fixed CEdit cursor
2012-09-29 19:29:17 +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
77952a85e6
Merge remote-tracking branch 'origin/dev' into dev-graphics
2012-09-27 23:55:13 +02:00
9f4c1454dc
* Ingame help should now display correctly
2012-09-27 23:42:52 +02:00
a394c9efec
Updated docs and some Doxygen fixes
2012-09-27 20:43:20 +02:00
400869ff86
Merge branch 'master' of git://github.com/colobot/colobot
2012-09-26 22:59:37 +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
00acce25d1
Fixed CEdit text input and drawing issues
2012-09-26 17:45:15 +02:00
45fd8aad33
Fog color fix; refactoring
...
- fixed fog color setting
- removed unused glSecondaryColor and altered struct VertexCol
- minor refactoring in CText
2012-09-26 16:31:04 +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
37e7c73f43
* Removed some warnings
2012-09-22 11:48:41 +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
krzys-h