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
krzys-h