7e21d3bd79
Get rid of some more manual memory management
2015-06-26 00:24:05 +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
7814c0c7bd
Remove unused field "material" from CObject class in CBot
2015-06-25 18:07:48 +02:00
37e2f24fbc
Corrected small rendering problem
2015-06-25 11:47:42 +02:00
3cc2857372
Small corrections in MSAA implementation
2015-06-22 23:42:01 +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
7ae308cc75
Fix saving addresses instead of data in user profile
2015-06-22 21:25:00 +02:00
f2318803e5
Added Multisample anti-aliasing (MSAA)
2015-06-22 00:56:47 +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
2d623b4427
Fix introduced compilation warnings
2015-06-21 19:38:07 +02:00
dabfdf1ea0
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2015-06-21 18:51:24 +02:00
7d57ec634e
Refactored framebuffer implementations
2015-06-21 18:48:31 +02:00
2513052260
Fix setting position of power cells
2015-06-21 16:29:46 +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
94851c2694
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2015-06-20 20:02:11 +02:00
ec3069eea7
Defaulted shadow color value to 0.5
2015-06-20 20:02:06 +02:00
f9b09d08f0
Create CObjectFactory
...
* move functions creating objects to new class CObjectFactory
* replace calls to CObject::Create*() with CObjectManager::Create()
* move creation/deletion of some objects to better places
* make CModelManager non-singleton
* clean up some code in changed functions
2015-06-20 19:37:25 +02:00
74a31c9fb4
Corrected compilation errors on Linux builds
2015-06-16 19:30:35 +02:00
ff44637d49
Removed VBO override switch and some unnecessary code
2015-06-16 18:00:42 +02:00
26ec927b37
Corrected compilation errors and warning
2015-06-15 20:27:44 +02:00
012eb10e19
Added automatic graphics detection (-graphics auto)
2015-06-15 20:20:03 +02:00
a880210b3d
Added ShadowRange option
2015-06-15 18:41:31 +02:00
6434ff55dd
Ending splashscreen enhancement ( fixes #472 )
2015-06-05 20:20:06 +02:00
ae29ebead3
Defaulted shadow color to 0.5 in OpenGL 2.1 engine
2015-06-05 19:48:28 +02:00
66d865942c
Added OpenGL 2.1 shaders for per-pixel lighting
2015-06-02 16:55:03 +02:00
d477caed3e
Second attempt at correcting compilation error
2015-06-01 18:41:14 +02:00
7acca9feb8
Corrected compilation error and unsigned comparison warnings
2015-06-01 17:45:51 +02:00
d112971c3e
Corrected shadow mapping and added experimental self-shadowing
2015-06-01 17:22:49 +02:00
a0c56f54cb
Shader and buffer optimizations
2015-06-01 17:21:10 +02:00
d33ddae15a
Added warnings and information what shader files are not available
2015-05-29 12:39:14 +02:00
f69dfe3421
shield() rejects incorrect robots that try to invoke it (should fix #475 )
2015-05-28 14:03:05 +02:00
e1a0f5b1c7
Added OpenGL 2.1 engine
2015-05-27 22:12:02 +02:00
08bf066f78
Added shadow color setting
2015-05-27 21:58:32 +02:00
55b4e73a7a
Corrected a problem with strmid()
2015-05-22 20:34:35 +02:00
fa67e815b8
Implemented per-vertex lighting and set it as default in OpenGL 3.3 engine
2015-05-22 18:53:51 +02:00
8abdd4b740
Improved shadow mapping
2015-05-21 18:18:46 +02:00
f67c01e5e7
Added proper render to texture support
2015-05-21 18:03:17 +02:00
a045bf3830
Added shadow ambient support
2015-05-21 16:47:24 +02:00
b1e8341475
Move OpenGL 3.3 shaders to main repository
2015-05-20 23:30:46 +02:00
619ac3cf8d
Fixed glew linking problem on MXE
2015-05-19 23:03:32 +02:00
35ce6c228a
Fix gcc warning
2015-05-19 23:03:32 +02:00
361a8c4ddd
Another fix to warning
2015-05-19 17:24:07 +02:00
3a1dffd8df
Fixing some warnings
2015-05-19 17:15:08 +02:00
df8223700b
Corrected compilation error
2015-05-19 16:26:41 +02:00
933609967a
Added OpenGL 3.3 graphics implementation
2015-05-19 14:29:31 +02:00
d210dcf70e
Implemented graceful degradation of shadow quality when not enough texture units are available
2015-05-15 10:12:35 +02:00
e747443312
Increased quality of dynamic shadows
2015-05-14 15:31:57 +02:00
0ddfdebab3
Remove unused system utils functions
2015-05-13 20:52:19 +02:00
ccaac2c544
Rewrite unit tests to use HippoMocks
2015-05-13 00:52:18 +02:00
03244ecdfd
Corrected assertion error when changing offscreen rendering
2015-05-12 20:20:57 +02:00
2665847c41
Added support for offscreen rendering and high resolution shadow maps
2015-05-12 13:09:31 +02:00
b033e35385
Transparent textures no longer cast shadows in transparent parts
2015-05-11 18:00:02 +02:00
0b2f00530b
Added experimental support for dynamic shadows (shadow mapping)
2015-05-11 15:21:17 +02:00
1e3c2cc2df
Increased the height of text area for displaying authors.txt (should fix #465 )
2015-05-09 20:36:32 +02:00
c945afafc8
Added bounds checking to CBotString type methods (should fix issue #429 )
2015-05-07 13:53:53 +02:00
619b3f2e45
Fixes recent mistake (- instead of +)
2015-05-07 13:05:20 +02:00
3164e7256e
Changed terrain UV mapping ( fixes #306 for OpenGL engine, will cause similar problem on Direct3D)
2015-05-07 12:58:05 +02:00
c28e1f6150
Added CBot functions for rounding: floor(), ceil(), round(), and trunc()
2015-05-06 23:29:55 +02:00
1c655aeda0
Corrected the problem with pendown() hanging the game ( fixes #203 )
2015-05-06 21:59:29 +02:00
1db9d8bdca
Changed CBot file handling, potentially solved problems with 64-bit executables
2015-05-06 20:39:09 +02:00
d3b052f19b
Implemented trilinear filtering, mipmap level setting and anisotropic filtering
2015-05-06 17:55:10 +02:00
05bf5be6f4
Added atan2() function to CBot
2015-05-06 13:02:44 +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
bca9a019ae
Suppress some MSVC warnings
2015-04-27 20:02:22 +02:00
d003247120
Provide usleep() in CSystemUtils interface
2015-04-27 20:02:22 +02:00
dec12fb977
Use wingetopt library on MSVC
2015-04-27 18:17:03 +02:00
544e513148
Minor MSVC compilation fixes
2015-04-27 18:17:03 +02:00
fcd904faf7
Fix non-integer expressions in #if
2015-04-27 18:17:03 +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
87ccb759e6
Allow Tech to use build(), closes #461
2015-04-18 11:40:42 +02:00
c481906242
Added nullptr checks in CPyro, should fix #462
2015-04-18 11:33:39 +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
be74b61ad3
Fixed Vault not unlocking vehicle ( #459 )
2015-04-17 21:28:30 +02:00
6d88dd5957
Allow autosave only in missions, free game and userlevels ( fixes #457 )
2015-04-17 21:11:07 +02:00
802aaad1a4
Should fix issue #456
2015-04-17 21:02:26 +02:00
9bc7c47d77
Fixed saving readonly attribute ( #454 )
2015-04-07 13:27:11 +02:00
a4bf622053
Fixed starting programs from saved games ( #455 )
2015-04-07 13:18:34 +02:00
ed0850ddb6
Fixed buttons "eating" other characters in SatCom
2015-04-07 12:27:31 +02:00
efe04be1c2
Implemented button rendering in SatCom ( #232 )
...
Finally!
2015-04-07 12:06:43 +02:00
73a12ea7db
Changed default autosave interval from 15 to 5 minutes ( #451 )
2015-04-06 22:04:23 +02:00
fa13d2bb72
Fixed compilation on old versions of GCC
...
It's the first time I saw gcc complain about something being not implemented IN THE COMPILER ITSELF o.O
In file included from /home/travis/build/colobot/colobot/src/object/auto/autoegg.cpp:25:0:
/home/travis/build/colobot/colobot/src/object/brain.h:81:28: sorry, unimplemented: non-static data member initializers
/home/travis/build/colobot/colobot/src/object/brain.h:81:28: error: ISO C++ forbids in-class initialization of non-const static member ‘readOnly’
2015-04-06 19:22:26 +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
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
78795c4b44
Alt+tab minimize to taskbar ( #391 , fixes #329 )
2015-03-22 16:10:32 +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
8cc74002cf
Added CLevelParser in one more place
...
Not sure how I missed that earlier
2015-03-22 14:29:03 +01:00
33fcdbbef5
Removed unused CRobotMain::BuildScenePath
2015-03-22 14:12:41 +01:00
f9bdd32812
Fixed USERPROFILE encoding, final fix to #414
2015-03-22 14:07:38 +01:00
d2d0886b76
Implemented %cat%
...
and renamed BuildSceneName to BuildScenePath
2015-03-22 13:51:14 +01:00
47ed73247b
Use std::wstring in boost::filesystem calls on Windows, fixes #414
2015-03-22 13:36:23 +01:00
83599238d1
Added workaround for argv encoding on Windows
...
First part of fixing #414
2015-03-22 13:11:00 +01:00
bb16c6d97c
Fixed updating C locale after exception in C++ locale, should finish fixing #445
2015-03-21 20:14:41 +01:00
9c20f275a0
Fixed MXE builds after 87cf056158
...
On MXE, setlocale is a macro...
2015-03-21 17:34:18 +01:00
2b21f5f40c
Fixed another Travis problem ( #393 )
2015-03-21 17:29:17 +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
87cf056158
Modified locale setting code
...
I'm doing my best to fix #445 . At least shouldn't crash anymore.
Needs more testing.
2015-03-21 17:12:05 +01:00
a60a4590b2
Better error logging in CResourceManager for further debugging #414
2015-03-19 19:55:22 +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
bb9e490316
Removed unused Copy function
...
It's not used by the game and causes incombatibility with some version of Boost.
Should fix Travis build, see issue #393
2015-03-18 21:45:28 +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
8f78dc81e7
Whoops, the file didn't save
2015-03-18 21:12:49 +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
f582b58c2e
Fixed "files" directory creation
...
Related to #444
2015-03-08 16:21:09 +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
03bb000e82
Revert "Potential fix to Travis build fails"
...
This reverts commit ed0e5dfef5
2015-01-31 11:55:37 +01:00
ed0e5dfef5
Potential fix to Travis build fails
2015-01-30 22:13:07 +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
0ee86c3d15
Fixed loading scripts in produce() ( #418 )
2015-01-08 19:21:02 +01:00
0231c2359a
Fixed #425
2015-01-08 19:01:56 +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
58bc01c82c
Removed unused script/dd.cpp
2014-12-20 18:48:44 +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
56393f4278
Modified CMake to search the path for libintl headers
...
Conflicts:
src/CMakeLists.txt
2014-12-12 01:17:10 +01:00
7356f67b78
Shortcuts now use the meta key on OSX
2014-12-12 01:17:05 +01:00
7bb12511d9
Implemented the OSX clipboard using the AppKit API
...
The X11 dependency is no longer needed on OSX, and has been removed
2014-12-11 23:31:41 +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
e3e551de22
Fixed loading sound 0
2014-12-11 19:00:02 +01:00
40428bb89b
Merge pull request #409 from piotrwalkusz1/dev
...
Issue #396
2014-12-10 20:35:23 +01:00
f30592bf56
Better fix for #94
2014-11-22 13:30:50 +01:00
7c8a31c074
#257 Destructor is parsed and (by some magic) already used
2014-11-19 10:02:27 +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
d3df4a157a
Undo
2014-11-12 23:32:26 +01:00
3201bcd8f4
Delete unnecessary info in documentation
2014-11-12 23:21:47 +01:00
54098bcd55
Fixed updating "Apply" button after changing fullscreen, closes #392
2014-11-12 17:06:29 +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
675ec3a222
Fixed bug in saving list of finished missions, closes #390
2014-11-12 15:11:42 +01:00
c509bc1709
Fixed PowerCell/Tracked animations ( closes #389 )
2014-11-12 15:05:02 +01:00
7b03479a85
Fixed #386
2014-11-12 10:07:25 +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
fa4c70d1fe
Resetting fields in scene to defaults
...
Fixes #218
2014-11-11 15:38:11 +01:00
dbdaecd1e8
Fixed texture recoloring reset
...
Partially fixes #218
2014-11-11 15:32:38 +01:00
48ca5b5663
Removed info about CD in background music tooltip; removed unused 3D sound translation
2014-11-11 14:59:56 +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
abcbaa1902
Fixed running programs with long names ( #379 )
2014-11-10 22:42:05 +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
97e76e6303
Better handling of filenames longer than maximum allowed
...
#354
2014-11-10 22:07:51 +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
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
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
c330bcac6d
PHYSFS in CStudio
2014-11-10 18:17:13 +01:00
c861e67cc0
Fixed proxyDistance saving
2014-11-10 17:50:50 +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
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
81a02220ee
Depth of field to Render distance in EN & PL translations, close issue #369
2014-11-05 23:01:33 +01:00
c1043837a5
Allow PHYSFS to follow symlinks, fixes the launch on Debian systems which fonts' are symlinks to the system fonts
2014-11-02 17:18:53 +01:00
6d152d5aee
Fixed console spam when music files are not installed
...
Closes #359
2014-11-02 13:35:00 +01:00
3ffc08a7f9
Fixed amount of fireball damage done to allies, close issue #356
...
In the original game the whole series did damage 0.02 (0.10 * 0.2) to human. In Gold, one particle do such damage, so 51 particles do 51 * 0.02 = 1.02 damage to human! I changed the multiplier for allies from 0.2 to 0.004 (approx. 0.2 / 51), but this problem probably occured somewhere else during rewriting the engine from DirectX to OpenGL and SDL.
2014-11-02 13:34:59 +01:00
ccdbce8cd7
Fixed icon on Windows; updated properties in .rc file
2014-11-01 19:57:23 +01:00
750f0f0810
COLOBOT: Gold Edition -> Colobot: Gold Edition
2014-11-01 19:46:06 +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
d0a2d66270
Removed duplicate license header
2014-10-31 21:10:55 +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
f8841f96f2
Added -headless
...
For automated stuff on devices without GPU
2014-10-31 20:40:13 +01:00
487e43ff4e
Changing resolution from commandline
...
Conflicts:
src/app/app.cpp
2014-10-31 20:40:09 +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
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
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
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
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
990ecf7290
Corrected clamping mode in textures
2014-10-26 22:24:12 +01:00
569dd8ed25
Fixed regex in CResourceManager::CleanPath
2014-10-26 20:43:51 +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
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
c9eb3ce5c5
Another possible (and more likely correct) fix for #339
2014-10-25 18:17:03 +02:00
9d68868f8e
Possible fix for #339 (?)
2014-10-25 18:00:39 +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
c12ebb1c7b
Fixed NewScript ( #341 )
2014-10-25 17:17:59 +02:00
ef1edba307
Fixed #340 again
2014-10-25 17:09:14 +02:00
81062e5e87
Fixed linking convert_model ( #332 )
2014-10-25 12:44:52 +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
4c865322f0
Fixed #341
2014-10-25 11:30:38 +02:00
1aebe8af03
Added support for VBO in OpenGL older than 1.5 if ARB extension is present
2014-10-24 00:29:26 +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
d3a722a0c5
Improved VBO support detection
2014-10-22 00:53:35 +02:00
1ab5746ca7
Disabled active window resizing that crashes in some software/hardware configurations
2014-10-21 22:22:32 +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
d7ef0a1a5f
Implemented "Apply changes" button (issue #141 )
2014-10-19 15:45:59 +02:00
c001c46cb5
Small fix to 72b4228abe
2014-10-19 15:27:00 +02:00
9ea0b37408
Possible fix for #331
2014-10-19 14:21:55 +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
7af92cc4ce
Added portable build flag
2014-10-18 20:00:30 +02:00
b85a41b42a
Also fixed the same thing in file writing code
2014-10-15 21:31:43 +02:00
63b6aa56b0
Fixed crash when colobot.ini doesn't exist
2014-10-15 21:28:40 +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
343504168f
Clean up translations
...
* translate only marked strings from restext.cpp
* update and clean pot and po files
* remove redundant POT-Creation-Data
2014-10-09 00:32:58 +02:00
342210b062
GCC 4.6 compilation fixes
2014-10-07 23:25:37 +02:00
72b4228abe
Fixed CBot debugger ( #325 )
2014-10-07 22:28:32 +02:00
12feb49098
Fixes in unit tests
2014-10-07 22:22:59 +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
c2b8787453
On development builds store savegame data in current directory
2014-09-29 21:39: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
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
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
9f2d544b27
Fix zenity version checking problems
2014-09-21 21:28:59 +02:00
2b86e6e9d9
Rewrite CMainDialog to use physfs
2014-09-21 12:29:06 +02:00
6a1ceba8c0
Some cleaning up
2014-09-21 12:29:06 +02:00
f0b38721e0
Loading all mods found in "mods" directory
2014-09-21 12:29:01 +02:00
e4d52d9afb
CProfile refactoring
2014-08-12 21:24:33 +02:00
74312b0405
Better CMake organization and unit test cleanups
...
* created a static library containing most source modules
to avoid compiling source modules twice in code and unit tests
* moved profile_test to main unit tests executable
* removed image_test and edit_test as not really useful
2014-08-12 20:58:55 +02:00
4bdfa0aa4e
Remove unused accessors from CDevice
2014-08-12 18:18:30 +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
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
4a202a086f
Fixed #314
2014-08-06 17:18:52 +02:00
a56e69883f
Removed some unused code
2014-08-06 16:58:36 +02:00
0b2f25a6e3
Restored -datadir and -langdir arguments, added -savedir
...
Also, fixed some crashes when unable to open file
2014-08-06 12:27:17 +02:00
9a3cd67c3b
Saving colobot.ini through physfs
2014-07-24 23:38:13 +02:00
17041e718b
Added -mod commandline argument to add additional locations to physfs
2014-07-24 22:46:47 +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
117a5289ea
fixed issue #223 about disabling shadows/ground textures
2014-07-12 19:37:34 +00: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
0fbc05b96c
Fix test compilation
2014-06-26 22:36:57 +02:00
092e7cc68d
Fixed tests
2014-06-26 22:14:30 +02:00
fd8ea13cbb
Fixed not destroying CGameData
...
This also fixed failing assertion in tests
2014-06-26 21:38:02 +02:00
bc3b7ef283
Fixed negative parameter in fire() (issue #305 )
...
Also fixed checking parameter count and type for ants, spiders and shooters
2014-06-26 21:06:53 +02:00
f5ba2a27d4
fixed savefile screenshot loading bug
2014-06-24 20:31:17 +03: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
68d41d3b21
More work on streams
2014-06-23 23:19:55 +02:00
3aca1de731
More work on levels
2014-06-22 21:30:23 +02:00
0556b5dfbc
Added Exist() to resource manager, updated model
2014-06-22 16:29:26 +02:00
754154341d
More work on PhysFS support
...
* added output stream
* fixed music loading
2014-06-22 15:01:06 +02:00
1630cf0ed2
Implemented libsndfile loader in PhysFS
2014-06-21 02:59:26 +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
ba62e6f8be
Remove dead code
2014-06-01 13:02:08 +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
a181ba9bbf
Fixes #271
2014-03-25 22:56:40 +02:00
a2a4eb75cb
Whitespace
2014-03-21 13:22:02 +02:00
119fce546a
Issue #295 - continue
...
Renamed the method, fixed typo in comments
2014-03-21 13:18:28 +02:00
4491f51839
Whitespace
2014-03-21 13:15:15 +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
2cf84ad214
Added spaces to align values
2014-03-21 09:34:52 +02:00
e569fd6c39
Fix for #294
2014-03-16 15:25:49 +01:00
244ca93cf7
Fixed bug with fall damage
...
If you change the height after overheat, you get damage like you didn't change it at all. For example: overheat when you are 10 meters above the ground, and you fall to place 20 meters deeper, but you get the damage like you fell from 10 meters instead of 30. This commit fix this.
2014-03-12 19:43:20 +01:00
2ee0702d69
Made some improvements to fall damage from a61da740
...
Fall damage on:
- no energy
- overheat
Fall damage off:
- underwater
2014-03-09 14:36:39 +01:00
3dd400810f
Fixed bug from a61da7404b
...
Moved ExploObject to CPhysics::EventFrame, it shouldn't crash anymore.
2014-03-08 23:20:39 +01:00
a61da7404b
Added fall damage
...
+ changed window title
2014-03-08 22:36:35 +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
1a0dcedf83
fixed m_oldMusic.push_back(nullptr) and segfault
2014-03-02 18:00:02 +04:00
e9960f5373
GetStringWidth fix
2014-03-02 04:15:59 +04:00
Piotr Dziwinski