krzys-h
986cf98aaf
CController - entry point into CRobotMain and CMainDialog
2014-12-22 10:36:36 +01:00
krzys-h
4fef3af9ef
Moved all CObject management from CInstanceManager to CObjectManager
2014-12-21 19:04:31 +01:00
krzys-h
be0f4c2ffe
Refactored keybindings UI and added some keybindings
2014-12-14 16:54:32 +01:00
krzys-h
5948a9e9d8
Show game version in logs, closes #413
2014-12-11 19:59:24 +01:00
krzys-h
eec6041104
Refactoring of input and input bindings, CInput class
2014-12-11 19:14:33 +01:00
krzys-h
3dade17f89
Level saving through CLevelParser
2014-11-10 14:27:42 +01:00
krzys-h
750f0f0810
COLOBOT: Gold Edition -> Colobot: Gold Edition
2014-11-01 19:46:06 +01:00
krzys-h
f8841f96f2
Added -headless
...
For automated stuff on devices without GPU
2014-10-31 20:40:13 +01:00
krzys-h
487e43ff4e
Changing resolution from commandline
...
Conflicts:
src/app/app.cpp
2014-10-31 20:40:09 +01:00
krzys-h
c1f931c8ee
Added some debug stuff, possible fix for #348 and #335
2014-10-30 22:18:33 +01:00
krzys-h
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
CoLoRaptor
1ab5746ca7
Disabled active window resizing that crashes in some software/hardware configurations
2014-10-21 22:22:32 +02:00
krzys-h
97b7c0cab1
Fixed map turning gray after resizing window
2014-10-20 21:54:52 +02:00
krzys-h
0245fdc6c3
Merge branch 'dev-physfs' into dev
...
Conflicts:
src/app/app.cpp
2014-10-19 16:18:36 +02:00
krzys-h
d7ef0a1a5f
Implemented "Apply changes" button (issue #141 )
2014-10-19 15:45:59 +02:00
krzys-h
7af92cc4ce
Added portable build flag
2014-10-18 20:00:30 +02:00
krzys-h
f65b00089a
Merge branch 'dev' into dev-physfs
...
Conflicts:
data
2014-10-14 15:42:19 +02:00
krzys-h
9fd6cf5449
Changed all occurences of PPC in the code to TerranovaTeam
2014-10-14 15:26:18 +02:00
Piotr Dziwinski
5274acd624
Merge with dev
2014-10-07 22:15:40 +02:00
krzys-h
c2b8787453
On development builds store savegame data in current directory
2014-09-29 21:39:21 +02:00
Piotr Dziwinski
6a1ceba8c0
Some cleaning up
2014-09-21 12:29:06 +02:00
krzys-h
f0b38721e0
Loading all mods found in "mods" directory
2014-09-21 12:29:01 +02:00
Piotr Dziwinski
e4d52d9afb
CProfile refactoring
2014-08-12 21:24:33 +02:00
Piotr Dziwinski
9de086390b
Remove some more delete checks ( #318 )
2014-08-10 17:51:47 +02:00
krzys-h
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
krzys-h
17041e718b
Added -mod commandline argument to add additional locations to physfs
2014-07-24 22:46:47 +02:00
krzys-h
fd8ea13cbb
Fixed not destroying CGameData
...
This also fixed failing assertion in tests
2014-06-26 21:38:02 +02:00
Krzysztof Dermont
754154341d
More work on PhysFS support
...
* added output stream
* fixed music loading
2014-06-22 15:01:06 +02:00
Krzysztof Dermont
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
Piotr Dziwinski
ba62e6f8be
Remove dead code
2014-06-01 13:02:08 +02:00
krzys-h
f0d97bfdb9
Better datadir mod support
2014-05-18 12:12:47 +02:00
MrSimbax
a61da7404b
Added fall damage
...
+ changed window title
2014-03-08 22:36:35 +01:00
Piotr Dziwinski
70b18cc4c0
Move engine frame update after game state update
...
This should finally fix #225
2014-01-18 21:35:32 +01:00
krzys-h
130c4fd941
Fixed log level in 8d30791595
2014-01-01 16:46:28 +01:00
krzys-h
8d30791595
Ability to set language via ini file
...
If language autodetection doesn't work, someone might want to manually force the game to use correct language without using -language parameter every time
2013-12-31 17:20:03 +01:00
krzys-h
246b7e107e
Removed prototypes support
2013-12-27 20:36:11 +01:00
krzys-h
01cbc4177e
Whoops
2013-12-26 22:14:53 +01:00
krzys-h
0f57809f51
Added scene test mode
...
... and fixed a "small" bug in previous commit ;)
2013-12-26 22:13:04 +01:00
erihel
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
Didier 'OdyX' Raboud
114cbec8a9
Never cache Data, Sound and Music paths
...
Let them always be either auto-detected, defined on the command-line
or written in the configuration file
2013-12-09 17:39:39 +01:00
Piotr Dziwinski
fdd7c22591
Updated README and INSTALL files
2013-11-26 00:38:32 +01:00
Didier 'OdyX' Raboud
b32f87bac7
Abstract the definition of LangPath to CSystemUtils
2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud
93727a3fdf
On MacOSX, don't cache the Data, Sound and Music paths
...
As users can potentially move the bundle around, it doesn't make sense to cache these
(It would probably make sense to drop this caching on all architectures, but it's only on MacOSX where it hurts most)
2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud
17ad3e5a90
Abstract the definition of DataPath to CSystemUtils
2013-11-13 09:35:31 +01:00
Didier 'OdyX' Raboud
8b65e9b56f
Add russian language support
2013-11-07 14:44:12 +01:00
krzys-h
39866db502
Fixed @Emxx52 's fail :P
...
Merge branch 'master' into dev
Conflicts:
src/app/app.cpp
2013-09-08 17:55:48 +02:00
Emxx52
2891c2ea4c
Added '-game' launch option
2013-09-08 17:05:11 +02:00
erihel
b5e87aa91f
Datadir in command line didn't work with config.
...
Values from config file overwrote datadir
2013-07-16 16:00:06 +02:00
Piotr Dziwinski
3e989c96df
Fixed auto-detecting locale on Windows
...
* localename library is now used to determine the actual locale used
* added patched version of FindGettext.cmake to fix
installation path of translation files
2013-06-24 14:16:39 +02:00
krzys-h
868b592706
Added -proto to options[]
2013-06-17 16:26:25 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
7cf8811888
Fix for #195
...
* loading time now is not counted in elapsed time
2013-06-13 17:25:58 +02:00
Piotr Dziwinski
8f6fd2a131
Changes in texture code & refactoring
...
* refactored and altered slightly the texture pack code
* added flushing of texture cache
* some refactoring and const-correctness in CApplication methods
2013-05-26 14:50:23 +02:00
Piotr Dziwinski
ff101c6973
Fix for #213
...
Was caused by invalid options for getopt
2013-05-26 10:24:35 +02:00
krzys-h
04f747b00b
Added simple texturepack support ( #208 )
2013-05-12 14:55:41 +02:00
Piotr Dziwinski
cc8ed2979b
Fixed deleting of CObjectManager
...
* fix in CApplication destructor
* re-enabled unit tests
2013-05-11 21:22:03 +02:00
krzys-h
6333d2d38e
Removed most of "No such node" messages
2013-05-04 11:56:03 +02:00
krzys-h
c3e95d40a2
Added relative install paths for MXE build
2013-05-03 22:23:36 +02:00
krzys-h
64ebda0ab9
Added creating ini file with default values
2013-05-03 21:35:33 +02:00
erihel
af24aba899
* Key repeating in edit fields
2013-04-18 21:02:25 +02:00
krzys-h
9485e1a95f
Improved log levels
2013-04-01 12:58:55 +02:00
krzys-h
a6d68d58e5
And it compiled and worked? o.O
2013-03-31 10:26:37 +02:00
krzys-h
90301e24c0
Added field "item" to class "object" in CBot
2013-03-31 10:21:22 +02:00
krzys-h
8777c126de
Added SatCom translations
2013-03-29 10:03:35 +01:00
krzys-h
b284fd74f3
Changes to fix multilanguage on Windows
...
Issue #118
2013-03-28 15:59:13 +01:00
Piotr Dziwinski
195d6cded0
Fixed timer functions on win32
...
* changed win32 implementation to QueryPerformaceTimer system function
* refactored system utils code
* proper tests for time utils and update event creation in application
* should fix issue #134
2013-03-24 12:00:12 +01:00
Piotr Dziwinski
4a30800cf1
Fixes for compiling on MSYS
...
* fixed SDL_main() and putenv() issues
* disabled desktop subdir for MSYS
* disabled building CBot_console for now
2013-03-22 19:17:08 +01:00
Piotr Dziwinski
bc859c4c59
VBO override option; argv parsing using getopt
...
* added -vbo option to override autodetection of OpenGL VBO extension
* refactored argument parsing to use getopt()
* fixed failing UTs
2013-03-10 15:44:21 +01:00
Piotr Dziwiński
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
erihel
58f35e44ae
* Removed alut
...
* Using libsndfile to load sounds and music
* Added support for playing music files
2013-01-14 22:55:16 +01:00
Piotr Dziwinski
5a6b3f005a
Merge dev and dev-graphics
2013-01-07 19:43:04 +01:00
Piotr Dziwinski
edb1c0cbd6
GLEW fix for some graphics drivers
2013-01-06 23:13:05 +01:00
Marcin Zawadzki
ff5c890854
Small fix in detecting language. Fixes needed to compile code using clang
2013-01-05 23:03:26 +01:00
Piotr Dziwinski
8818a8e5db
Corrected OpenGL extension detection
...
- corrected multitexture and VBO detection
- GLEW is now a required library
- minor CMakeLists refactoring
2013-01-05 23:03:06 +01:00
Piotr Dziwinski
d1942e1216
Correct font scaling with resolution
2013-01-04 00:29:19 +01:00
Piotr Dziwinski
89a3f586a2
Merge branch 'dev' into dev-graphics
2013-01-04 00:05:28 +01:00
Piotr Dziwiński
e625665f02
Merge pull request #108 from OdyX/dev-central-cmake-version
...
Create a central version
2012-12-29 02:44:03 -08:00
Didier Raboud
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
Didier Raboud
f4c6f49b2f
Move language initialisation in SetLanguage
2012-12-28 22:31:47 +01:00
Piotr Dziwinski
4cbb63f5b7
Fixed path for loading sounds
2012-12-28 12:06:37 +01:00
Didier Raboud
e62996858b
Create a central version
...
Make it 0.1.0~pre-alpha for now.
- Add it to runtime program
- Add it to -help option
- Add it to manpage
- Update translations
2012-12-27 17:12:42 +01:00
Didier Raboud
0d825ed613
Fix locale's loading
...
- Always inherit LC_ALL from environment;
- Enforce environment only if the runtime options require it;
2012-12-27 16:13:26 +01:00
Piotr Dziwinski
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
erihel
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
erihel
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
erihel
6d607e3ae8
latest changes
2012-12-21 17:31:55 +01:00
erihel
f0e76ad446
sound fix
2012-12-20 21:57:57 +01:00
Piotr Dziwinski
f77734e01c
Installation path fixes and CMakeLists refactoring
...
make && make install should now give a working installation.
2012-12-20 00:23:12 +01:00
Didier Raboud
4827440e73
Merge branch 'dev' into dev-use-installed-i18n
...
Conflicts:
src/common/config.h.cmake
2012-12-16 22:26:29 +01:00
Didier Raboud
a266692615
Use default installation paths for i18n.
...
This finishes the work started in
19b75e1743
by actually using the
translation where they are installed.
2012-12-16 21:56:55 +01:00
Didier Raboud
c190c3efae
Set a default datadir, in sync with the data installation path.
2012-12-16 21:53:48 +01:00
Piotr Dziwinski
4811defca2
Static objects using OpenGL VBOs and display lists
2012-12-14 21:30:35 +01:00
Didier Raboud
6946155a56
Inherit translation setting from environment.
...
This ensures that users with a correctly-defined locale don't need to
explicitely set the locale.
- By dropping the setlocale content, it fixes the loading of translations.
- Add a Debug log message to check what is put in the environment.
2012-12-14 15:17:23 +01:00
Piotr Dziwinski
3ce488307f
Performance counters
2012-10-25 23:29:49 +02:00
Piotr Dziwinski
3845efbbff
Main loop enhancement
...
Frame updates were posted one frame behind in event queue
2012-10-25 20:27:40 +02:00
Piotr Dziwinski
3f7f013168
Merge branch 'dev' into dev-graphics
2012-10-02 22:17:30 +02:00
Zaba999
4b7ca3f262
Further work on saving profile and directory listing.
2012-10-02 21:44:14 +02:00
Piotr Dziwinski
85d253b094
Fixed bugs in texture coloring
2012-09-30 11:26:59 +02:00
Piotr Dziwinski
8ea4736a46
Font coloring; fix for resize hack
...
- added font coloring and changed default color to black
- fixed resize hack incorrectly changing video config,
but font resizing will not work for now
2012-09-30 10:56:35 +02:00
adiblol
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