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
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
9d68868f8e
Possible fix for #339 (?)
2014-10-25 18:00:39 +02:00
81062e5e87
Fixed linking convert_model ( #332 )
2014-10-25 12:44:52 +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
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
b3fa72c007
Moved effect??.png textures and made pos= in GroundSpot optional
2014-09-27 18:26:29 +02:00
4a202a086f
Fixed #314
2014-08-06 17:18:52 +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
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
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
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
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
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
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
a181ba9bbf
Fixes #271
2014-03-25 22:56:40 +02:00
e9960f5373
GetStringWidth fix
2014-03-02 04:15:59 +04:00
4a237f5925
CPauseManager
2013-12-31 13:24:09 +01:00
cd97feabb0
Revert back "Merge pull request #243 from OdyX/dev-fix-textures-loading"
...
False alarm, was caused probably by faulty build bot.
This definately should work on all platforms.
2013-10-29 22:04:12 +01:00
70af33e45d
Revert "Merge pull request #243 from OdyX/dev-fix-textures-loading"
...
Looks like it doesn't work on all platforms
2013-10-28 19:36:43 +01:00
c2a717d5c9
Let mouse.png's format be detected
...
Fixes the mouse cursor on Mac OS X
2013-10-28 15:25:14 +01:00
9017dbbbdb
Fixed CTerrain-related memory leaks
2013-10-13 14:44:12 +02:00
ccb63bd29e
Fixed memory leaks in CText
2013-10-12 21:14:33 +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
f8a6c6750a
Fix for #228
...
* "empty" objects were wrongly handled in CPyro
2013-06-26 20:44:17 +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
1377e48910
Reverted enum values to fix UT regression
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
4c33172e17
Fixed string formats in light debug prints
2013-06-17 20:52:56 +02:00
366d3a551e
Added debug aids for lighting
...
* displaying positions of current lights (F11)
* dumping info to console (F10)
* added assert() in suspicious place in CPyro
2013-06-17 18:17:21 +02:00
b4700e3bed
Fix for #133
...
* objects are now copied and textures are updated correctly
* also added function to debug objects
2013-06-17 11:48:57 +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
18b27d258e
Fixed bug with white map
...
I'm not sure when it was introduced, probably in 8f6fd2a131
2013-06-10 15:38:55 +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
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
b41957f2f9
Corrected some valgrind issues
...
* fixed several uninitialized variable issues
* fixed possible memory corruption in CEngine
2013-05-26 11:34:53 +02:00
07839a561f
Unicode symbols for special characters
...
* added support for special characters from original text bitmaps
2013-05-12 18:38:01 +02:00
04f747b00b
Added simple texturepack support ( #208 )
2013-05-12 14:55:41 +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
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
658ebe015f
Fix for shadows (bugs #176 and #132 )
2013-04-29 13:51:37 +03:00
5669053de0
Some code refactoring
...
Changed vehicule (french) to vehicle (english) in enums and variables
2013-04-27 17:50:30 +02:00
9485e1a95f
Improved log levels
2013-04-01 12:58:55 +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
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
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
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
b0d86ebe5a
Better light sorting
...
Should fix lighting issue (#62 )
2013-02-25 21:58:01 +01:00
ba2df2cb42
* Fix for satcom freeze
2013-02-24 01:40:55 +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
34e758a9da
Additional parameter for function aim(x, y)
2013-02-13 02:44:43 +01:00
d3106c73ff
More camera distance from AlienQueen
2013-02-11 22:59:51 +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
a937a7b6ec
Changed model min/max to LOD levels
2013-01-27 11:43:53 +01:00
1285712aa2
CMakeLists enhancements
...
- compiler detection (clang and gcc version check)
- compile flags only for src/ subdir
- system and local include paths
- fix for clang compilation
2013-01-08 22:12:09 +01:00
5a6b3f005a
Merge dev and dev-graphics
2013-01-07 19:43:04 +01:00
ff5c890854
Small fix in detecting language. Fixes needed to compile code using clang
2013-01-05 23:03:26 +01:00
d1942e1216
Correct font scaling with resolution
2013-01-04 00:29:19 +01:00
89a3f586a2
Merge branch 'dev' into dev-graphics
2013-01-04 00:05:28 +01:00
2ebe1fbcb6
Fixed spider and worm model loading
2012-12-28 13:23:49 +01:00
45bee618f9
Fixed unicode rendering bug
2012-12-27 16:32:46 +01:00
3582f107a5
Fixes and refactoring
2012-12-27 14:18:16 +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
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
4811defca2
Static objects using OpenGL VBOs and display lists
2012-12-14 21:30:35 +01:00
3ce488307f
Performance counters
2012-10-25 23:29:49 +02:00
688315ab76
ComputeSphereVisibility and fixes in CEngine TODOs
...
- view frustum culling with ComputeSphereVisibility - game should run
faster now
- resolved/removed most TODOs from CEngine
- fixed OpenGL tests
2012-10-20 23:06:56 +02:00
728e7e405d
Transparent plant textures
2012-10-20 18:40:24 +02:00
40e065aea9
Ground spot texture drawing
2012-10-20 16:34:22 +02:00
6d06c9f722
Flare textures should work now
2012-10-19 23:05:41 +02:00
be4654c63b
Fix track mapping and sphere particle position
2012-10-19 22:43:18 +02:00
a90cd304ba
Track texture mapping
2012-10-19 22:37:11 +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
6fdaf5de46
CParticle rewrite
2012-10-05 18:59:49 +02:00
ff99b74b25
Some CPyro docs
2012-10-05 18:59:03 +02:00
37302a2504
CLightning rewrite
2012-10-05 15:26:24 +02:00
703f03f316
CPyro rewrite
2012-10-03 00:30:17 +02:00
85d253b094
Fixed bugs in texture coloring
2012-09-30 11:26:59 +02:00
krzys-h