b41957f2f9
Corrected some valgrind issues
...
* fixed several uninitialized variable issues
* fixed possible memory corruption in CEngine
2013-05-26 11:34:53 +02:00
1cd0bc3152
Resizing is fully functional so it can be enabled by default.
2013-05-25 23:18:27 +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
f7f6e10c70
Added check and warning about non-power-of-2 textures
2013-05-11 21:40:09 +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
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
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
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
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
edb1c0cbd6
GLEW fix for some graphics drivers
2013-01-06 23:13:05 +01:00
ff5c890854
Small fix in detecting language. Fixes needed to compile code using clang
2013-01-05 23:03:26 +01:00
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
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
2c0c5ddda1
Fixed stupid debug code
...
Terrain VBOs should work now
2013-01-03 23:50:17 +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
fbe19c49c5
Merge branch 'dev-graphics' into dev
2012-10-05 23:27:26 +02:00
b68c903747
Disabled window resize
2012-10-05 22:34:22 +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
858b1e35ae
Spot light angle fix
2012-10-03 00:29:59 +02:00
85d253b094
Fixed bugs in texture coloring
2012-09-30 11:26:59 +02:00
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
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
b46dc3850f
Map texture painting
2012-09-30 00:23:26 +02:00
a8554cfae3
Texture coloring
2012-09-29 23:37:38 +02:00
4193f8a3a9
Fix for transparent objects and fadeouts
2012-09-29 22:44:05 +02:00
5a751d9c0d
Fixed texture regression
...
There was a bug in texture modesetting but only visible after certain
mode changes.
2012-09-29 19:35:14 +02:00
677ce3960c
Some fixes and optimizations
...
- fixed 2nd texture setting
- added padding to some structs for faster access
- changed rendering primitives to glDrawArrays()
- optimized texture modesetting calls
- fixed some valgrind errors
2012-09-29 10:40:11 +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
6d0ed0d26a
Completely fixed light issues
...
Directional and spot lights are now set properly
2012-09-27 23:18:12 +02:00
a394c9efec
Updated docs and some Doxygen fixes
2012-09-27 20:43:20 +02:00
2ef1c8b6f8
Fixed blinking light problem
...
- temporarily commented out misbehaving code in CPhysics
- some fixes in CLightManager
- minor refactoring in CRobotMain
2012-09-27 20:36:52 +02:00
80d3a9bff1
Lighting fix (experimental)
...
- changed fixed light allocation to prioritized per-use basis
- minor refactoring in CPlanet and CWater
2012-09-26 23:18:57 +02:00
2fa4d7b0db
Refactored resource and relief loading
...
- now loading can be from any image format
- added IntColor struct for precise pixel operations
2012-09-26 19:18:33 +02:00
6bdc1e8ac1
Merge master & dev
2012-09-26 16:40:27 +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
dad42df4c7
made graphics/engine/text cleaner, I hope
2012-09-25 18:44:43 +02:00
2db419a1e0
* Building should work now without 'ground not flat' message
2012-09-25 18:26:16 +02:00
b06544871a
made graphics/engine/text cleaner, I hope
2012-09-24 23:55:52 +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
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
f5bc8e12d4
Alpha operation fix
2012-09-21 00:14:26 +02:00
60c37aac3a
robotmain, restext and engine fixes
2012-09-21 00:01:03 +02:00
bd36d76b31
Mouse pos setting, low cpu mode, stats display
2012-09-20 20:37:37 +02:00
7b6bbf79c4
Namespace and styling fix
2012-09-19 23:50:28 +02:00
7479f486b6
Forgotten fix in dev-graphics
2012-09-19 22:53:06 +02:00
10c9d92cd2
Mouse wheel events, motion vectors
...
- added mouse wheel events
- added motion vectors to CRobotMain
- other minor changes in event.h
2012-09-19 21:23:42 +02:00
51884cef8e
Input bindings rewrite
...
- moved input bindings to CRobotMain
- added virtual keymod and joystick button key presses
- fixed putenv error; other minor fixes
2012-09-19 18:32:18 +02:00
7bce8f073c
Merge branch 'dev' of https://github.com/adiblol/colobot into dev
...
Conflicts:
src/ui/slider.cpp
2012-09-18 22:39:10 +02:00
a397922e8d
warnings fight in progress.
2012-09-18 00:01:00 +02:00
4b67386a69
Change of background image handling
...
- removed old 4 quarter backgrounds
- fixes in texture loading
- other minor fixes
2012-09-17 23:41:53 +02:00
844e11db4f
changes needeto to cimpile on windows.
2012-09-17 20:47:27 +02:00
050f9d2542
Fix max lights error
2012-09-16 20:39:32 +02:00
2e21435f43
Some memory leaks fixed
2012-09-16 20:00:25 +02:00
6a0d150539
Interface works
...
- removed mock of CInterface and fixed event passing to CRobotMain
- changed texture names from tga and bmp to png
- UI now works but interaction is still broken
2012-09-16 10:38:08 +02:00
ad6bc13dc2
Merge dev-common and various fixes to achieve compilation
...
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
2012-09-15 18:50:51 +02:00
34d7dcf3be
Simulation timestamps and input bindings
...
- added new simulation time calculations in CApplication
- added simulation frame updates
- rewritten old input binding code and input state tracking
2012-09-12 23:43:04 +02:00
1bb1eb7b87
half of task compile.
2012-09-11 23:11:34 +02:00
Piotr Dziwinski