krzys-h
9a9cfc51c1
Merge pull request #112 from OdyX/dev-levels-fallback
...
In levels' lists, fallback to english
2013-01-09 04:33:47 -08:00
Piotr Dziwinski
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
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
erihel
fff9d235e4
* Fixed problem with freeing buffers while conneted to a source resulting with "Unable to unload buffer message"
...
* Fixed posible segfault while trying to play sound after not loading file properly
2013-01-04 21:44:16 +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 Dziwinski
c9335534d6
Fix for #113
2013-01-04 00:02:13 +01:00
Piotr Dziwinski
2c0c5ddda1
Fixed stupid debug code
...
Terrain VBOs should work now
2013-01-03 23:50:17 +01:00
Didier Raboud
ba0679a1d7
Add categories to Desktop Entry file
...
As per the "Desktop Menu Specification" 1.0, especially Appendix A.
2013-01-02 19:00:38 +01:00
Didier Raboud
3fa5e9c9cc
In levels' lists, fallback to english
...
- Implemented in a naive way: Take the English version if found, but
continue until the translated version is found. This has the drawback
of letting the loop reach its end if the level has no translation.
2013-01-02 12:24:51 +01:00
erihel
ea3e97b26d
* Fixed problem with scrolling down text fields with mouse scroll
...
* Fixed problem with scroll bar not updating position properly in text fields
2012-12-29 13:32:11 +01:00
erihel
03f232f0f6
Merge branch 'dev' of github:colobot/colobot into dev
2012-12-29 13:00:59 +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
erihel
c9ca8f2b62
* Fixed segault when could not set sound pitch (bad logger call)
...
* All 81 audio files should be loaded instead of 69 high quality
* Changed volume ajustment formula to proper one
2012-12-28 21:19:50 +01:00
Piotr Dziwinski
3e4c1a1ad8
Replaced malloc/free with new/delete
...
- now new/delete used everywhere except for CBotStack, which
has to be fixed in other way
- some segfaults should be fixed with this
2012-12-28 13:37:08 +01:00
Piotr Dziwinski
2ebe1fbcb6
Fixed spider and worm model loading
2012-12-28 13:23:49 +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
Piotr Dziwiński
b046c33206
Merge pull request #106 from OdyX/dev-fix-translations
...
Fix translations
2012-12-27 07:37:28 -08:00
Piotr Dziwiński
0a0e536d65
Merge pull request #105 from OdyX/dev-desktop-file-man
...
Add manpage for colobot
2012-12-27 07:36:58 -08:00
Piotr Dziwinski
45bee618f9
Fixed unicode rendering bug
2012-12-27 16:32:46 +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
3582f107a5
Fixes and refactoring
2012-12-27 14:18:16 +01:00
Didier Raboud
85283a76be
Update translations
...
In particular, update french
2012-12-27 14:09:19 +01:00
Didier Raboud
7a5e41e1ec
Update colobot.pot using update-pot
2012-12-27 13:54:40 +01:00
Didier Raboud
877774a226
Update translation pot-file and build-target
2012-12-27 13:52:47 +01:00
Didier Raboud
afea08d570
Always build manpages
...
solves #105
2012-12-27 13:13:16 +01:00
Didier Raboud
778ae32c12
Add manpage for colobot
...
- Translate it with po4a
- Use POD-format as source, and pod2man for building
2012-12-27 11:05:02 +01:00
Didier Raboud
c2ebd5551f
Add SVG colobot icon
...
- Refer to the icon in the desktop file
- Use rsvg-convert to get scaled PNG versions
- Add librsvg2-bin to travis
2012-12-27 10:02:18 +01:00
Didier Raboud
a75f02089c
Add translated freedesktop 'Desktop Entry' file
...
- Add po4a as build-dependency for travis
(but it fallsback to english-only if not found)
- Add (easy) french translation
2012-12-27 09:56:38 +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
erihel
a6ff654ae3
removing plugins for gold version (for mxe cross compiling)
2012-12-20 20:59:11 +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
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
Didier Raboud
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
Didier Raboud
c6c57c0e99
Fix RPath in installed colobot
2012-12-19 08:50:46 +01:00
Didier Raboud
a7d837460f
Minor cmake grammar fix
...
It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them.
2012-12-18 09:11:57 +01:00
Didier Raboud
e062b74a3a
Install libCBot to a private directory
...
closes #90
- Make it configurable;
- Move stanzas above the src directory inclusion, otherwise the value
doesn't propagate.
2012-12-17 10:15:14 +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
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
Piotr Dziwinski
72ce040054
Merge branch 'master' into dev
2012-12-15 20:23:58 +01:00
Piotr Dziwinski
4811defca2
Static objects using OpenGL VBOs and display lists
2012-12-14 21:30:35 +01:00
Michał Zieliński
3f79167323
Merge pull request #85 from OdyX/cmake_find_ltdl
...
Add FindLTDL cmake module
2012-12-14 10:10:07 -08:00
Didier Raboud
9b127fc0a3
Add FindLTDL cmake module
...
As mentionned in FindLTDL.cmake, this is code that is hereby relicensed
under GPLv3.
closes #68
2012-12-14 15:50:11 +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
Didier Raboud
4f9bd4bd77
Update translations with newer colobot.pot.
2012-12-13 22:14:54 +01:00
Didier Raboud
19b75e1743
Handle translations with CMakes.
...
closes #81
2012-12-13 22:10:49 +01:00
Didier Raboud
41cacbc654
Sort translation files.
...
This will ease future updates.
2012-12-13 21:05:49 +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
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
Piotr Dziwinski
728e7e405d
Transparent plant textures
2012-10-20 18:40:24 +02:00
Piotr Dziwinski
40e065aea9
Ground spot texture drawing
2012-10-20 16:34:22 +02:00
Piotr Dziwinski
6d06c9f722
Flare textures should work now
2012-10-19 23:05:41 +02:00
Piotr Dziwinski
be4654c63b
Fix track mapping and sphere particle position
2012-10-19 22:43:18 +02:00
Piotr Dziwinski
a90cd304ba
Track texture mapping
2012-10-19 22:37:11 +02:00
Piotr Dziwinski
0305e0ba17
Restext rewrite to runtime initialized arrays
2012-10-17 23:16:19 +02:00
Piotr Dziwinski
f6e27099b2
Doxygen/comment fixes and some #include refactoring
2012-10-17 21:55:45 +02:00
Piotr Dziwinski
9738631e5e
Removed unnecessary dynamic_casts
2012-10-17 21:48:40 +02:00
Zaba999
0ca089f4d0
Saving scripts on game save should work. Added stub for particle.
2012-10-11 23:30:37 +02:00
Zaba999
7575ffd49b
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2012-10-11 23:10:07 +02:00
Zaba999
8a932fed3e
Added saving user scripts on game save. Fixed bug in writing script to file.
2012-10-11 23:09:29 +02:00
Michał Zieliński
dfe21c5a9c
Removed Gfx:: from license notice (introduced in 8ad15c0e
)
2012-10-08 21:50:38 +02:00
Piotr Dziwinski
97f44035f1
Changing and saving input bindings
2012-10-07 00:46:46 +02:00
adiblol
f608828761
Fixed stupid coding mistake in CBotString.cpp
2012-10-07 00:10:20 +02:00
adiblol
70dae8796e
Fixed stupid coding mistake in CBotString.cpp
2012-10-07 00:09:50 +02:00
adiblol
7818d5d096
Setting speed now works. Added ability to set 4x and 8x using "speed4" and "speed8" cheat codes respectively.
2012-10-06 23:35:27 +02:00
Piotr Dziwinski
2414861175
Merge branch 'dev' of github.com:colobot/colobot into dev
2012-10-05 23:36:07 +02:00
Piotr Dziwinski
fbe19c49c5
Merge branch 'dev-graphics' into dev
2012-10-05 23:27:26 +02:00
Michał Zieliński
ec32b1df35
Commented out profile_test
2012-10-05 23:26:13 +02:00
Piotr Dziwinski
b68c903747
Disabled window resize
2012-10-05 22:34:22 +02:00
Michał Zieliński
b7667cef35
Added "make install" target.
2012-10-05 22:07:58 +02:00
adiblol
0c6b6fccd9
Merge remote-tracking branch 'origin/dev' into dev-graphics
2012-10-05 20:39:23 +02:00
adiblol
b5a7708f99
Refactoring: changed UNIT to g_unit in CRobotMain class
2012-10-05 20:37:20 +02:00
Piotr Dziwinski
6fdaf5de46
CParticle rewrite
2012-10-05 18:59:49 +02:00
Piotr Dziwinski
ff99b74b25
Some CPyro docs
2012-10-05 18:59:03 +02:00
Piotr Dziwinski
37302a2504
CLightning rewrite
2012-10-05 15:26:24 +02:00
Piotr Dziwinski
703f03f316
CPyro rewrite
2012-10-03 00:30:17 +02:00
Piotr Dziwinski
858b1e35ae
Spot light angle fix
2012-10-03 00:29:59 +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
adiblol
ba3dce3aed
Merge remote-tracking branch 'origin/dev' into dev-graphics
2012-09-30 17:10:40 +02:00
adiblol
ac1472621a
Fixed not working message(...) CBot function
2012-09-30 17:09:49 +02:00
adiblol
8f99efd861
Merge remote-tracking branch 'origin/dev' into dev-graphics
2012-09-30 16:01:39 +02:00
adiblol
cb634db2ec
Fixed segfault when using empty strings with CBotString::operator+
2012-09-30 16:00:34 +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
af4ff31b4e
Merge remote-tracking branch 'origin/dev' into dev-graphics
2012-09-30 03:20:52 +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
adiblol
dd8c2d8d92
Merge branch 'dev' of github.com:colobot/colobot into dev
2012-09-30 02:23:49 +02:00
adiblol
c36d0c8ed2
Fixed invradar cheat code.
...
Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar.
Changed logger level of "invalid m_motion" messages.
2012-09-30 01:51:37 +02:00
Piotr Dziwinski
b46dc3850f
Map texture painting
2012-09-30 00:23:26 +02:00
Zaba999
95e1d101c8
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2012-09-29 23:53:57 +02:00
Zaba999
aa9df8b1f0
#48 Adding new users works.
2012-09-29 23:52:30 +02:00
Piotr Dziwinski
a8554cfae3
Texture coloring
2012-09-29 23:37:38 +02:00
adiblol
4f097c10b3
Merge branch 'dev-graphics' of github.com:colobot/colobot into dev-graphics
2012-09-29 22:49:31 +02:00
Piotr Dziwinski
4193f8a3a9
Fix for transparent objects and fadeouts
2012-09-29 22:44:05 +02:00
Piotr Dziwinski
c8f39a4c96
Fixed CEdit delete[] issues
2012-09-29 22:04:39 +02:00
Piotr Dziwinski
86109a8c1e
CBotVar SetVal() fix
2012-09-29 21:46:34 +02:00
Piotr Dziwinski
caf8e08a8d
Enabled CBot (experimental)
2012-09-29 20:27:23 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
1fa7053ac0
Fixed object selection by clicking
2012-09-29 19:29:51 +02:00
Piotr Dziwinski
a38d60d191
Fixed CEdit cursor
2012-09-29 19:29:17 +02:00
Piotr Dziwinski
e7e8954384
MXE support and CMake files refactoring
...
- added support for cross-compiling with MXE (http://mxe.cc/ )
- refactored CMake files, adding some options and moving definitions
to more suitable places
2012-09-29 17:19:23 +02:00
Piotr Dziwinski
e9660c47c6
Merge branch 'dev' into dev-graphics
2012-09-29 12:19:00 +02:00
Piotr Dziwinski
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
Zaba999
df4e3dfb6e
Small fix in profile + profile_test rewritten to gtest.
2012-09-28 21:03:28 +02:00
unknown
38ebf4c398
Merge branch 'master' of https://github.com/colobot/colobot into dev
2012-09-28 20:17:56 +02:00
erihel
099f6c4f0b
* Fixed Issue #54 : flags don't show in 3D view
2012-09-28 00:05:49 +02:00
adiblol
77952a85e6
Merge remote-tracking branch 'origin/dev' into dev-graphics
2012-09-27 23:55:13 +02:00
erihel
9f4c1454dc
* Ingame help should now display correctly
2012-09-27 23:42:52 +02:00
Piotr Dziwinski
6d0ed0d26a
Completely fixed light issues
...
Directional and spot lights are now set properly
2012-09-27 23:18:12 +02:00
Piotr Dziwinski
a394c9efec
Updated docs and some Doxygen fixes
2012-09-27 20:43:20 +02:00
Piotr Dziwinski
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
Zaba999
cc9a507054
Profile rewritten to boost. Read/write to ini should work.
...
Load/Save should work.
2012-09-27 00:30:47 +02:00
Piotr Dziwinski
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
Zaba999
400869ff86
Merge branch 'master' of git://github.com/colobot/colobot
2012-09-26 22:59:37 +02:00
Zaba999
f6638a173e
Work in progress on opening files, and listing dirs
...
Fixed includes
profile changed from SimpleIni to boost::ptree -> not finished yet
2012-09-26 22:57:43 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
00acce25d1
Fixed CEdit text input and drawing issues
2012-09-26 17:45:15 +02:00
Piotr Dziwinski
6bdc1e8ac1
Merge master & dev
2012-09-26 16:40:27 +02:00
Piotr Dziwinski
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
Michał Zieliński
dad42df4c7
made graphics/engine/text cleaner, I hope
2012-09-25 18:44:43 +02:00
erihel
2db419a1e0
* Building should work now without 'ground not flat' message
2012-09-25 18:26:16 +02:00
Michał Zieliński
b06544871a
made graphics/engine/text cleaner, I hope
2012-09-24 23:55:52 +02:00
Piotr Dziwinski
6cce7ec6fd
Removed metafile editor and loader
2012-09-22 21:07:23 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
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
erihel
37e7c73f43
* Removed some warnings
2012-09-22 11:48:41 +02:00
Piotr Dziwinski
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
erihel
15ff1d512b
* Fixed audio problems
...
* Added colobot.ini to CApp in Create function
* Fixes to plugin manager
* Fixed CProfile segfault
2012-09-22 00:11:16 +02:00
Piotr Dziwinski
f5bc8e12d4
Alpha operation fix
2012-09-21 00:14:26 +02:00
Piotr Dziwinski
60c37aac3a
robotmain, restext and engine fixes
2012-09-21 00:01:03 +02:00
Zaba999
34a11021da
changed paths for models and levels. Now it's possible to load level. Merged with latest trunk
2012-09-20 23:04:37 +02:00
Zaba999
191fdc614e
changed paths for models and levels. Now it's possible to load level.
2012-09-20 22:58:00 +02:00
Piotr Dziwinski
e25823f984
Checkbox fix; main dialog buttons
2012-09-20 21:47:53 +02:00
Piotr Dziwinski
e896b83bcf
Whitespace fix
2012-09-20 20:38:14 +02:00
Piotr Dziwinski
bd36d76b31
Mouse pos setting, low cpu mode, stats display
2012-09-20 20:37:37 +02:00
Piotr Dziwinski
7b6bbf79c4
Namespace and styling fix
2012-09-19 23:50:28 +02:00
Piotr Dziwinski
7479f486b6
Forgotten fix in dev-graphics
2012-09-19 22:53:06 +02:00
Michał Konopacki
57d33d79ea
Changes in Ui, solves part of #47
2012-09-19 22:17:28 +02:00
Piotr Dziwinski
1a79137e90
Mouse wheel fixes
2012-09-19 21:45:41 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
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
Zaba999
4a639cf543
Fixed includes in ui.
2012-09-19 00:04:21 +02:00
Zaba999
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
Zaba999
36ae984ac7
Warnings cleaned, left only those connected to commented out code.
2012-09-18 22:33:28 +02:00
Piotr Dziwinski
da5d4edeb3
Fixed invalid text alignment
2012-09-18 17:52:36 +02:00
Zaba999
a397922e8d
warnings fight in progress.
2012-09-18 00:01:00 +02:00
Piotr Dziwinski
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
Zaba999
844e11db4f
changes needeto to cimpile on windows.
2012-09-17 20:47:27 +02:00
Piotr Dziwinski
050f9d2542
Fix max lights error
2012-09-16 20:39:32 +02:00
Piotr Dziwinski
2e21435f43
Some memory leaks fixed
2012-09-16 20:00:25 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
af9af56bb0
Successful compilation & running
...
- temporarily mocked CSoundInterface and CPluginInterface
- added CRobotMain to application
- successfully compiles & runs, but doesn't display correctly at the
moment
2012-09-15 22:19:32 +02:00
Michał Konopacki
2847aad51f
Merge branch 'dev' of github.com:adiblol/colobot into dev
2012-09-15 22:07:14 +02:00
Michał Konopacki
c439964d28
[src/ui] CStudio compiles
2012-09-15 22:06:10 +02:00
Piotr Dziwinski
8ad15c0ef7
CMainDialog rewrite
...
- rewritten CMainDialog and updated CRobotMain
2012-09-15 21:47:19 +02:00
Piotr Dziwinski
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
Michał Konopacki
95d2f8da2c
Merge branch 'dev-object' into dev
...
Conflicts:
src/object/robotmain.cpp
src/object/robotmain.h
2012-09-15 16:54:35 +02:00
Michał Konopacki
d439f4fa93
Merge branch 'dev-ui' into dev
...
Conflicts:
src/CMakeLists.txt
src/common/misc.cpp
src/common/misc.h
src/object/robotmain.cpp
src/object/robotmain.h
src/script/cbottoken.cpp
src/script/cbottoken.h
src/ui/button.cpp
src/ui/button.h
src/ui/check.cpp
src/ui/check.h
src/ui/color.cpp
src/ui/color.h
src/ui/compass.cpp
src/ui/compass.h
src/ui/control.cpp
src/ui/control.h
src/ui/displayinfo.cpp
src/ui/displayinfo.h
src/ui/displaytext.cpp
src/ui/displaytext.h
src/ui/edit.cpp
src/ui/edit.h
src/ui/gauge.cpp
src/ui/gauge.h
src/ui/interface.cpp
src/ui/interface.h
src/ui/key.cpp
src/ui/map.h
src/ui/shortcut.h
src/ui/slider.h
src/ui/target.cpp
src/ui/target.h
src/ui/window.cpp
src/ui/window.h
2012-09-15 16:35:48 +02:00
Piotr Dziwinski
a1400f496b
CRobotMain rewrite
...
- rewritten CRobotMain
- won't compile yet because of dependencies to CMainDialog
2012-09-15 15:33:08 +02:00
Piotr Dziwinski
94e7fd9203
Locale settings and translation fixes
...
- added locale setting
- removed unused translations
- updated .po files
2012-09-13 23:28:06 +02:00
Michał Konopacki
8b9954fff4
brain.* mainmovie.* : Partially rewritten
...
The remaining part will be revised and rewritten after merge with dev and dev-ui branches
2012-09-13 22:14:40 +02:00
Piotr Dziwinski
87c87c2c06
Image pixel read/write
2012-09-13 20:40:07 +02:00
Michał Konopacki
9bfdcacc52
Fixes in [object/auto]
2012-09-13 18:28:50 +02:00
Michał Konopacki
8f285465e8
[object/motion] Folder compiles
2012-09-13 17:40:39 +02:00
Piotr Dziwinski
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
Zaba999
8b223eb096
all tasks compile.
2012-09-12 22:34:40 +02:00
Michał Konopacki
44e4bcef45
Merge branch 'dev-object' of github.com:adiblol/colobot into dev-object
2012-09-11 23:29:00 +02:00
Zaba999
064fedb814
commented part of tasks that does not compile.
2012-09-11 23:14:55 +02:00
Zaba999
1bb1eb7b87
half of task compile.
2012-09-11 23:11:34 +02:00
Michał Konopacki
68d9c61e97
[src/object] motion.* motionant.* motionbee.* should compile
2012-09-11 22:45:48 +02:00
Piotr Dziwinski
6c21dceb35
Tests rewrite and Doxygen in src/math
...
- rewritten tests to use new framework
- updated/reformatted Doxygen
- removed legacy conversions
2012-09-11 21:14:32 +02:00
erihel
01cc0fbc49
* latest changes
...
* all files except studio, map and maindialog should compile
* did some code cleanup
2012-09-11 12:49:41 +02:00
Zaba999
e57be247c2
commented new part in cmakelist and reverted stubs in camera.cpp. Will be commited later after implementation is finished in dev-object branch.
2012-09-10 23:39:22 +02:00
Zaba999
479a67a731
Merge with changes from Zaba999 fork.
2012-09-10 23:29:38 +02:00
Piotr Dziwinski
901f10b2ba
Fixed old model format bugs
2012-09-09 23:34:52 +02:00
Piotr Dziwinski
cf2295d08d
Commenting out src/object/auto temporarily
2012-09-09 17:58:09 +02:00
Piotr Dziwinski
efe4f0badd
Refactoring in src/common
...
- refactored CInstanceManager and some headers
- removed old headers
2012-09-09 17:51:10 +02:00
Michał Konopacki
6892d37a4f
[src/object/auto] Folder rewritten
2012-09-09 14:28:19 +02:00
Piotr Dziwinski
b3d5491af4
Merge branch 'dev' into dev-graphics
2012-09-09 13:05:41 +02:00
Piotr Dziwinski
c6673b9aee
Texture format detection; minor fixes
...
- detection of texture format
- fixed depth mask bug
- minor refactoring
2012-09-09 12:56:09 +02:00
Piotr Dziwinski
c2c1294ec9
CTerrain refactoring & fixes
...
- refactored CTerrain code
- fixed some minor bugs
2012-09-08 23:44:14 +02:00
Piotr Dziwinski
31c29ea482
CModelFile fixes; test framework
...
- fixes in CModelFile IO
- added Google Test framework for automatic testing
- rewrote modelfile_test in the new framework
2012-09-08 03:05:12 +02:00
Piotr Dziwinski
08f1b68ffd
Fix
2012-09-03 22:37:28 +02:00
Piotr Dziwinski
09fd0e205e
Fix
2012-09-03 19:21:37 +02:00
erihel
5903e400d4
Merge branch 'dev' of https://github.com/adiblol/colobot into dev-ui
...
Conflicts:
src/common/restext.cpp
src/common/restext.h
2012-09-03 18:26:51 +02:00
erihel
6ba0f42f22
latest changes; few more classes should compile now
2012-08-31 22:28:07 +02:00
Piotr Dziwinski
01fd19d2cd
Fix
2012-08-31 21:51:28 +02:00
Piotr Dziwinski
e94e26ae1e
New model file format
...
- added new binary and text formats for models
- fixes and improvements in CModelFile
- tool for converting model files
- minor additions and fixes
2012-08-31 20:55:16 +02:00
Piotr Dziwinski
7f277c9ab9
Whitespace fix
2012-08-27 01:05:59 +02:00
Piotr Dziwinski
3e52ae4ca9
Fixes in terrain rendering
2012-08-27 01:02:25 +02:00
Alexander Monakov
896291b769
Add translation files
2012-08-25 14:37:51 +04:00
Alexander Monakov
9b4628fd02
Move strings out of restext. Add i18n via gettext
2012-08-25 14:37:51 +04:00
Alexander Monakov
5ff4ce146a
Move ResTextType enum to a separate file
2012-08-25 13:51:17 +04:00
Alexander Monakov
f5a8a92050
Move ObjectType enum to a separate file
2012-08-25 13:47:48 +04:00
Alexander Monakov
43f7b384e9
Move Error enum to a separate file
2012-08-25 13:46:49 +04:00
Alexander Monakov
5b2bc48986
Move EventType enum to a separate file
2012-08-25 13:45:40 +04:00
erihel
5408fe9252
* added nullptr
...
* changed Ret to Get function names
* minor changes
2012-08-21 21:38:13 +02:00
erihel
4faa1b9c44
merged changes from michkon
2012-08-21 20:55:03 +02:00
erihel
75a76e8252
latest changes
2012-08-21 20:53:39 +02:00
Michał Konopacki
1997682808
added ui/shortcut.*
2012-08-21 15:23:59 +02:00
Michał Konopacki
60950ce66b
Typo fix
2012-08-20 21:45:17 +02:00
Michał Konopacki
af45bc399f
added ui/scroll.*
2012-08-20 21:42:07 +02:00
Michał Konopacki
59ec83c409
added ui/slider.*
2012-08-20 21:35:11 +02:00
Michał Konopacki
02dc368a38
added ui/target.*
2012-08-20 21:31:16 +02:00
Michał Konopacki
bd9c581ced
added ui/window.* -- not fully ported
2012-08-20 21:22:24 +02:00
Michał Konopacki
7a4ec2adc4
Merge remote-tracking branch 'erihel/dev-ui' into dev-ui
...
Conflicts:
src/ui/button.h
src/ui/color.h
src/ui/compass.h
src/ui/control.h
src/ui/displayinfo.h
src/ui/displaytext.h
src/ui/edit.h
src/ui/editvalue.h
src/ui/gauge.h
src/ui/group.h
src/ui/image.h
src/ui/slider.h
2012-08-20 15:12:26 +02:00
Michał Konopacki
8666d35f7c
UI porting
2012-08-20 14:05:36 +02:00
Michał Konopacki
574c07e388
Further improvements in UI porting
2012-08-18 22:56:42 +02:00
erihel
8d4a3ed579
* wrong enum used for text alignment
...
* wrong event function used
2012-08-18 21:04:51 +02:00
erihel
48ad79a03c
* minor changes to control.cpp to compile it without errors
2012-08-18 11:30:29 +02:00
erihel
c02ac93379
* list.cpp compiles
2012-08-17 23:56:29 +02:00
erihel
a00032d075
* ui/label.cpp compiles
2012-08-17 23:05:59 +02:00
erihel
ea6269c411
* ui/key.cpp compiles
...
* csoundinterface to ccontrol
2012-08-17 23:03:52 +02:00
erihel
6ff8706d04
* last commit should not include sound changes
2012-08-17 22:49:16 +02:00
erihel
c2464d4c71
* changes to ui classes
2012-08-17 22:43:07 +02:00
Michał Konopacki
10b2c562fb
First approach to port 2D UI Interface
...
- changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs
- necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile
2012-08-15 01:48:49 +02:00
Piotr Dziwinski
8b2bca72dd
Merge branch 'dev-graphics' into dev
...
Documentation, rendering functions & fixes
2012-08-13 23:13:10 +02:00
Piotr Dziwinski
5b45911856
Improved error messages
...
Added some logging and improved error messages displayed to user
2012-08-13 23:09:30 +02:00
Piotr Dziwinski
a2dd39960b
Fix
2012-08-13 18:17:54 +02:00
Piotr Dziwinski
b68dfcd155
Test fix
2012-08-13 18:03:12 +02:00
Piotr Dziwiński
dc3cadd309
Merge pull request #37 from konopackim/dev
...
Fixes and console interpreter
2012-08-13 08:46:03 -07:00
Michał Konopacki
e154e654f1
Reduced amount of warnings in CBot library
...
Changed most of C-style casting to C++ casting
Commented unused variables
2012-08-13 01:45:35 +02:00
Piotr Dziwinski
712154bc4f
Rendering functions, documentation
...
- rewrote the render functions for CEngine, CCloud and CWater
- added documentation
2012-08-13 00:14:42 +02:00
Piotr Dziwinski
146ad47e4a
Merge branch 'dev-graphics' into dev
...
CEngine object handling
2012-08-12 19:30:31 +02:00
Piotr Dziwinski
45a5e1e865
Object handling in CEngine
...
- finished rewriting CEngine object, shadow, etc. handling
- refactored texture code
- added new log levels
2012-08-12 19:28:22 +02:00
erihel
62b545128f
* Final changes to plugin interface
...
* Added doxygen comments to plugin manager and plugin loader
2012-08-12 18:37:11 +02:00
erihel
f01296690e
Merge branch 'dev-opengl' into dev
2012-08-12 17:09:11 +02:00
erihel
5e271e550d
* New CPluginManager class for managing plugins based on colobot.ini
...
* Moved sound plugin into sound dir
* Minor changes in logger and profile
2012-08-12 15:00:37 +02:00
Piotr Dziwinski
b4b74c30e9
Fixes & testing in CEngine
...
- fixed bugs in settings modes, etc.
- some additions and minor refactoring
2012-08-12 10:45:04 +02:00
Michał Konopacki
a9186d1960
Changed GivAttrName() to GetAttrName()
2012-08-11 20:59:35 +02:00
Piotr Dziwinski
1996507fd3
Documentation update
...
- updated Doxyfile
- added/changed file, dir and namespace descriptions
- fixed some errors in doxygen tags
2012-08-11 18:39:16 +02:00
Piotr Dziwinski
7f80ca2971
Render mode setting, refactoring
...
- finished SetState in CEngine
- refactored Size and IntSize back to Point and IntPoint
- other minor changes in CEngine
2012-08-11 17:17:04 +02:00
Piotr Dziwinski
63257034c9
Partial CEngine implementation
...
- added rewritten implementation for basic modesetting in CEngine
- started rewriting proper rendering and object handling in CEngine
2012-08-10 23:31:42 +02:00
erihel
9946459c0c
* changed 0, NULL to nullptr
...
* changed profile.cpp to use SimpleIni to load config files
* added new CProfile singleton class for loading config
* added SimpleIni to lib/ dir
* added config loading tests
2012-08-09 23:04:29 +02:00
Piotr Dziwinski
c3ab23ac9d
Graphics stubs
...
- added stubs for functions in CLightning, CParticle and CPyro
- cleaned object.h and physics.h headers
- created temporary stubs to compile CCamera
- other necessary changes to compile successfully
2012-08-09 22:50:04 +02:00
Piotr Dziwinski
acff306cc1
CPlanet implementation
...
Added rewritten CPlanet implementation
2012-08-09 22:49:13 +02:00
Michał Konopacki
7b03a6a2ac
CBot console interpreter
...
Based on program found in sources
2012-08-09 22:13:10 +02:00
Michał Konopacki
ef7e297efe
CBotString.cpp Bug resolve
2012-08-09 22:05:42 +02:00
erihel
f1d1cdceee
Changes after merge
2012-08-09 21:21:14 +02:00
erihel
611680a72e
Merge branch 'dev' of https://github.com/adiblol/colobot into dev
...
Conflicts:
src/sound/sound.h
2012-08-09 20:20:47 +02:00
Piotr Dziwinski
c1936514c0
CWater and CCloud basic implementation
...
Added rewritten implementation for CWater and CCloud
Won't link yet because of missing functions
2012-08-08 23:51:19 +02:00
Piotr Dziwinski
bc24b9f9e5
Whitespace fix
2012-08-08 22:35:17 +02:00
Piotr Dziwinski
878eec8eea
CTerrain implementation
...
Added rewritten CTerrain implementation
Compiles OK, but functions are missing from other classes
Also needs testing
2012-08-08 21:32:44 +02:00
Michał Konopacki
a760e8a749
Cleanups
2012-08-08 02:23:38 +02:00
Michał Konopacki
0919796df7
Transation of comments complete
2012-08-08 02:01:06 +02:00
Michał Konopacki
0844a0f7bd
Further CBot translations
2012-08-07 15:46:04 +02:00
Michał Konopacki
a1c83c7d0a
CBot library comments further translations
2012-08-07 12:46:19 +02:00
Piotr Dziwinski
f7e78b21e9
Font rendering
...
- implemented rest of CText interface excluding some minor features
2012-08-06 20:20:50 +02:00
Piotr Dziwinski
61bfb22f27
Basic font rendering
...
- added basic font rendering
- minor refactoring & fixes
2012-08-03 23:23:13 +02:00
Michał Konopacki
bf3f9e1860
Commentary translation
2012-08-03 00:50:25 +02:00
Michał Konopacki
d00a283519
Comments translation
2012-08-02 19:41:13 +02:00
Piotr Dziwinski
5e637ca028
Switched to new style casts
...
- rewrote old C-style casts to new ..._cast<>
- corrected some dangerous casts
- added -Wold-style-cast to compile flags
2012-07-30 22:59:18 +02:00
Piotr Dziwinski
d8a0c8d32e
Lines and line strip primitives
...
Will probably be useful
2012-07-30 22:32:28 +02:00
Piotr Dziwinski
220ff9fe52
CCamera rewrite
...
Rewritten old code; doesn't compile yet because changes in other
modules are needed.
2012-07-29 18:42:56 +02:00
Piotr Dziwinski
7c5a3514dd
Video mode changing
...
- added video mode querying & changing
- added joystick querying & changing
- cleaned up CApplication interface
2012-07-29 15:09:53 +02:00
Piotr Dziwinski
72c0188ec3
GLEW
...
Added GLEW for loading OpenGL extensions
2012-07-28 23:36:12 +02:00
Piotr Dziwinski
db0b880674
Updated Doxygen main page
2012-07-27 18:50:29 +02:00
Piotr Dziwinski
851300d61d
Whitespace fix
2012-07-27 18:44:43 +02:00
Piotr Dziwinski
ab8e55a651
Merge branch 'dev' into dev-opengl
...
Pulled changes & resolved conflicts
2012-07-27 18:09:50 +02:00
Piotr Dziwinski
4ddcd9f810
Change of paths in src/graphics
...
- moved abstract core to src/graphics/core
- moved proper graphics engine to src/graphics/engine
2012-07-26 22:26:19 +02:00
Piotr Dziwinski
045f17a274
Dynamic light manager
...
- rewrote old CLight as CLightManager
2012-07-26 21:35:04 +02:00
Piotr Dziwinski
d1fe0d2dcc
Lighting
...
- fixed problems with lighting
- added light_test
2012-07-26 19:05:09 +02:00
Piotr Dziwinski
6b846aa629
Compile fixes
...
Fixed some compiling issues
2012-07-26 00:18:02 +02:00
Piotr Dziwiński
92bcec10c5
Merge pull request #33 from Zaba999/dev
...
Changes in CBot
2012-07-25 15:09:09 -07:00
Piotr Dziwinski
bc1c9b5284
Fixed bug in texturing
2012-07-25 20:27:13 +02:00
Piotr Dziwinski
9cd28e26e9
Fix in CMakeLists.txt
2012-07-25 00:28:56 +02:00
Piotr Dziwinski
42963b341f
Refactoring of texture code
...
- refactored texture structs & functions
- added note about OpenGL extensions
- removed device.cpp as unnecessary
- minor changes in CEngine
2012-07-25 00:27:01 +02:00
Piotr Dziwinski
9d59204531
Cursor drawing
...
- fixed cursor drawing in CEngine
- changed event loop to generate more events
2012-07-23 21:41:27 +02:00
Piotr Dziwinski
8797569d33
Texture & mouse functions; refactoring & fixes
...
- cleaned up and added documentation to engine.h
- refactored CEngine interface and associated structs
- added mouse handling functions in CApplication & CEngine
- fixed bugs in projection matrix setting
- changed texture loading & handling
- added const-values in CDevice & CGLDevice
- changed event management in CApplication
- other minor changes & bugfixes
2012-07-22 22:05:12 +02:00
Zaba999
26f9149947
Further translations and doxygen comments.
2012-07-20 23:13:02 +02:00
erihel
d56db5f4e4
* Chaned plugin interface
...
* Added plugin class for plugin loading
* Added plugin loading test
2012-07-19 19:19:21 +02:00
Piotr Dziwinski
86ea086790
ComputeSphereVisibility function
...
- borrowed implementation of ComputeSphereVisibility from libwine
- added -lrt to Linux libs
2012-07-18 21:47:47 +02:00
Piotr Dziwinski
f364f378cf
Fixed OpenGL transformations
...
- fixed wrong order of transformations
- added transform_test
2012-07-18 19:08:34 +02:00
Piotr Dziwinski
68a7bafe37
Fixes in texture loading
...
- added other texture formats: BGR and BGRA
- fixed texture loading in model viewer
- moved code from texture.cpp module to texture.h
2012-07-16 19:17:26 +02:00
Piotr Dziwinski
54f4da8792
Fix in model loading; simple model viewer
...
- fixed model loading code
- added simple model viewer (model_test) in src/graphics/opengl/test
- added system time stamp code
- split the code in app/system modules to separate headers
- added debug messages in model loading
- minor fixes in OpenGL engine
2012-07-15 19:17:49 +02:00
Piotr Dziwinski
eca6d26459
Minor changes
...
- moved mainpage src/doc/docmain.doc.txt to src/app/main.cpp
- removed old modfile modules from src/common
- removed Snd namespace in engine.h
2012-07-11 20:56:09 +02:00
Piotr Dziwinski
2383a42347
Rewritten model loading
...
- written new implementation of CModelFile (old CModFile)
- added stringutils and ioutils in src/common
- removed old CModel (model viewer)
2012-07-11 20:50:42 +02:00
Zaba999
1910219518
Dependency on WINAPI completely removed.
2012-07-10 22:58:52 +02:00
Piotr Dziwinski
3204360515
Refactoring in math & texture modules
...
- moved texture-related structs to texture.h & code to texture.cpp
- cleaned up texture test code
- added Math:: namespace qualifiers to math modules for clarity
2012-07-06 19:00:22 +02:00
Piotr Dziwinski
e8c9945e13
Fixed bug with texturing
...
- moved creation-time tex params to Gfx::TextureCreateParams
- fixed bug with texture creation
- added simple test for multitexturing
2012-07-05 23:47:29 +02:00
Zaba999
dbd62c96aa
Fixed code compilation without fpermissive flag.
...
Removed Winapi, but now library don't work - work in progress.
Some translations.
2012-07-04 22:14:28 +02:00
erihel
0e4b070b5f
just some fixes
2012-07-04 20:03:17 +02:00
Piotr Dziwinski
af3057df7e
Merged changes from dev
...
Resolved conflicts & added fixes.
2012-07-04 19:56:22 +02:00
erihel
ecab9761d4
* Added OpenAL sound plugin
...
Plugin needs some more work and tests. It doesn't support playing music
yet as sound interface is propably going to change a bit.
2012-07-04 19:38:18 +02:00
Piotr Dziwinski
092e4ae75e
Enabled logging & minor fixes
...
- added logger to main()
- removed reference to Snd namespace and renamed back to sound.h
- fixed minor issues
2012-07-04 19:20:22 +02:00
erihel
4a839d8734
* Added CLogger class for loggin info to console or file
...
* Added CSoundInterface
* Added basic plugin interface
2012-07-04 18:04:34 +02:00