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
c29ef4ec41
Fixed some warnings
...
Removed unused variables and fixed signed/unsigned comparation warnings
2014-09-27 16:49:00 +02:00
krzys-h
d3eaf2e1ce
Merge branch 'dev-physfs' into dev-physfs-levels
2014-09-26 21:05:55 +02:00
krzys-h
71f84d1e16
Fixed human.png texture
2014-09-26 21:02:54 +02:00
krzys-h
de375548ad
Userlevel listing
2014-09-26 20:53:11 +02:00
krzys-h
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
Piotr Dziwinski
2b86e6e9d9
Rewrite CMainDialog to use physfs
2014-09-21 12:29:06 +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
Piotr Dziwinski
ac019c263d
Remove unnecessary delete checks ( #318 )
2014-08-09 22:45:07 +02:00
krzys-h
ea0615ee05
Fixed #315
2014-08-08 14:03:43 +02:00
krzys-h
7131abd385
Fixed SatCom image loading
...
Now LoadTexture/SetTexture functions require full path with "textures/" directory
2014-07-24 22:17:49 +02:00
krzys-h
02ba358a89
Help file loading
2014-07-11 16:40:07 +02:00
krzys-h
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
krzys-h
9a6c06665c
Removed some old stuff related to Ceebot-Teen
2014-07-10 17:39:45 +02:00
krzys-h
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
krzys-h
5223ef1fb1
Fixed mission description loading
2014-07-10 16:36:00 +02:00
krzys-h
106ec014b8
Fixed texture and script loading
2014-07-10 16:25:40 +02:00
krzys-h
7b04f67358
Fixed music loading
2014-07-10 15:38:37 +02:00
krzys-h
1ee0c0e8fe
Fixed level list
2014-07-10 15:27:43 +02:00
Krzysztof Dermont
aa190bb59b
Last changes
2014-06-30 17:40:40 +02:00
krzys-h
1835d2ae58
Removed old code based on #ifs (issue #55 )
2014-06-27 19:52:09 +02:00
Mohamed Waheed
b7125a5b24
formatting and enhancements for savefile screenshot feature
2014-06-24 20:27:31 +03:00
Mohamed Waheed
613e1d74c4
implemented savefile screenshot feature
2014-06-24 01:35:05 +03: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
krzys-h
f0d97bfdb9
Better datadir mod support
2014-05-18 12:12:47 +02:00
krzys-h
4a237f5925
CPauseManager
2013-12-31 13:24:09 +01:00
krzys-h
0ff7e55b33
Fix for #177 - save list sorting
2013-12-27 22:28:25 +01:00
krzys-h
1b73893678
Temporary fix for #232 - don't try to show the buttons
...
This makes SatCom usable for now
2013-12-27 21:46:16 +01:00
krzys-h
246b7e107e
Removed prototypes support
2013-12-27 20:36:11 +01:00
krzys-h
9a741a66a4
Changed version display in bottom-right corner to be actually version number instead of date
2013-12-27 11:15:36 +01:00
krzys-h
8b5b2eeaa1
Added error message when CEdit is unable to read a file
2013-12-27 10:50:52 +01:00
krzys-h
fcda183b96
Hide userlevels menu in release version
...
Userlevels aren't working right now (issue #219 )
2013-12-26 21:05:58 +01:00
krzys-h
5661f5a413
Fixed "default controls" button ( #263 )
2013-12-25 19:41:15 +01:00
Piotr Dziwinski
3966e3fce0
Merge branch 'dev-string-in-restext' into dev
...
Merging branches after code review
This should fix buffer overflow problems with translation strings
2013-12-20 20:22:51 +01:00
Piotr Dziwinski
95661918ce
Some further refactoring and test corrections
2013-12-20 20:18:30 +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
Piotr Dziwinski
8deb130572
Changed char[] to std::string in restext
...
Experimental changes
2013-12-04 00:15:39 +01:00
Didier Raboud
f4355b8b8e
Fix tooltip to display as white and not transparent
2013-11-19 17:12:16 +01:00
Piotr Dziwinski
418f57f8be
Buffer overflow fix
2013-11-13 18:51:52 +01:00
Didier Raboud
2acc338c3a
Drop now-useless display of licenses.txt in PHASE_GENERIC
...
The content of licenses.txt in data has gotten useless as the
restrictions got waived, displaying it is useless.
2013-10-30 21:51:05 +01:00
Piotr Dziwinski
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
krzys-h
d70d31acc1
Fix for #232 - Images in SatCom
...
Only images, icons still don't work
2013-09-28 11:13:45 +02:00
Piotr Dziwinski
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
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
b22d852b4c
Fixed variable shadowing warnings
...
* fixed -Wshadow warnings
* refactored some constructors
2013-05-27 22:29:42 +02:00
Piotr Dziwinski
12313fecf5
Fixed some memory issues
...
* invalid pointer, uninitialized buffer
2013-05-27 20:59:50 +02:00
Piotr Dziwinski
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
Piotr Dziwinski
538745a731
Fixed some compilation warnings
...
* fixed warnings about hiding virtual functions and several others
2013-05-27 10:19:04 +02:00
Piotr Dziwinski
b41957f2f9
Corrected some valgrind issues
...
* fixed several uninitialized variable issues
* fixed possible memory corruption in CEngine
2013-05-26 11:34:53 +02:00
krzys-h
c25b6ab472
Fix for #192
2013-05-12 15:23:26 +02:00
Piotr Dziwinski
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
krzys-h
9549359b46
Fix for saving wrong Fullscreen value
2013-05-04 20:13:27 +02:00
krzys-h
6333d2d38e
Removed most of "No such node" messages
2013-05-04 11:56:03 +02:00
krzys-h
56709f0e56
Small changes to looping main menu music
2013-05-02 10:58:38 +02:00
krzys-h
c1db140ad3
Updated Main Mnu music
...
For now only code - we need to wait for PiXeL to give us new music :)
2013-05-02 10:44:07 +02:00
krzys-h
07374db2a3
Increased maximum font size
2013-05-01 21:32:40 +02:00
krzys-h
23e3e552f3
Made colobot.ini & savegame dir location depended on build type
...
For Debug, it's current dir
For Release it's like it was before
Made on @CoLoRaptor's request :)
2013-05-01 19:44:55 +02:00
krzys-h
9e1870f6bd
Removed some warnings
...
+ fix for previous commit
2013-05-01 13:19:10 +02:00
krzys-h
c2932f4ee3
Added new Intro music (by PiXeL)
2013-04-29 15:33:28 +02:00
Erihel
eb37da86ce
Merge pull request #187 from xiendev/Programs-list-size
...
Fixes size of a programs list control
2013-04-26 04:56:58 -07:00
XienDev
02cb9a6993
Fixes programs list size
2013-04-25 22:11:36 +03:00
XienDev
b8d2ce2e4e
Welcome screen blinking fix
2013-04-25 22:05:27 +03:00
erihel
593be3b776
* Fix for bad file listing (issue #60 )
2013-04-11 21:37:19 +02:00
erihel
01309c8bd0
* Added clipboard support (issue #60 )
...
* Fixed keyboard shortcuts while code editing in game
2013-04-11 13:37:15 +02:00
erihel
a66abd4990
* Loading 3D sound settings from profile
2013-04-09 12:20:40 +02:00
erihel
7146cf8ee6
* Issue #60 : Fix for "(null)" instead of time on windows platform
2013-04-08 12:58:00 +02:00
erihel
926126d5ad
* Changed loading of scene and player info (there's problem with locales using , as comma separator). Issue #137
...
* Changed way of saving files. Now it's not based on slot (from 000 to 999) but it uses save name as a base.
* Changed way of displaying saved games. Listing directory instead of checking from 000 to 999. Issue #138
2013-04-01 18:24:12 +02:00
krzys-h
8777c126de
Added SatCom translations
2013-03-29 10:03:35 +01:00
Didier Raboud
991dbd1e37
Add profile and savegame fetchers in SystemUtils
...
This breaks the tests compilation. :/
2013-03-27 10:20:06 +01:00
krzys-h
5eb4e10c2b
Reverted "Fix for issue #149"
...
because it was broken again after commit 7ebba6abaa
2013-03-24 16:05:21 +01:00
erihel
7ebba6abaa
* Changed ending screen (issue #129 )
2013-03-23 21:22:44 +01:00
erihel
1406464f0c
* Changed Set/Get HilateCap to Set/Get HighlightCap
...
* Changes ReadText in CEdit to fix problem with SatCom links
* Filenames when loading/saving scripts should be fixed on mxe
2013-03-20 21:50:44 +01:00
erihel
64be7a5df6
* Fix for mxe with boost path
2013-03-20 20:27:19 +01:00
erihel
4abcaae0f7
* Changes std::stoi to atoi as gcc does not support it on windows platform
2013-03-17 23:16:26 +01:00
erihel
0cd64113aa
* Implemented CStudio::UpdateDialogList() function for listing saved files
2013-03-17 20:23:57 +01:00
erihel
e5aadfdaac
Merge branch 'dev' of github:colobot/colobot into dev
2013-03-17 19:05:29 +01:00
erihel
d6bbc99c90
* Changed file loading to fix issue #73
...
* Moved few functions from misc.cpp to profile.cpp (used to set/get user dir)
* Removed some warnings
* More work to change const char* to std::string
* Some work on file path to fix issue #60 with bad slashes on POSIX platform
2013-03-17 19:01:32 +01:00
krzys-h
f88e74f887
Fix for issue #129
...
Text on exit screen is improperly placed
2013-03-17 15:05:53 +01:00
erihel
6c783b9033
* Fix for issue #122 with sound not being played in menu after playing mission
2013-03-14 21:30:32 +01:00
Piotr Dziwinski
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
erihel
ba2df2cb42
* Fix for satcom freeze
2013-02-24 01:40:55 +01:00
krzys-h
c42515927e
Music restarting on PHASE_WELCOME2
2013-02-17 13:28:04 +01:00
krzys-h
c79c176e46
Show compilation date in main menu
2013-02-17 13:20:18 +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
c7371da676
* Fixed crash when inputing cheats
2013-02-11 20:17:43 +01:00
erihel
3f6a6a9eef
* Syntax highlighting in cbot editor (needs to be tested)
2013-02-09 23:49:38 +01:00
erihel
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
Piotr Dziwinski
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
Piotr Dziwinski
4421430bae
Fixed edit_test linking issue
2013-01-17 20:54:23 +01:00
erihel
01c39c88f6
* Cleaning player list before getting new one (entering user menu several times appended user to existing list)
2013-01-15 22:52:37 +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
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
Marcin Zawadzki
ff5c890854
Small fix in detecting language. Fixes needed to compile code using clang
2013-01-05 23:03:26 +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
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
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
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
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
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
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
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
c8f39a4c96
Fixed CEdit delete[] issues
2012-09-29 22:04:39 +02:00
Piotr Dziwinski
a38d60d191
Fixed CEdit cursor
2012-09-29 19:29:17 +02:00
Piotr Dziwinski
e9660c47c6
Merge branch 'dev' into dev-graphics
2012-09-29 12:19:00 +02:00
unknown
38ebf4c398
Merge branch 'master' of https://github.com/colobot/colobot into dev
2012-09-28 20:17:56 +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
a394c9efec
Updated docs and some Doxygen fixes
2012-09-27 20:43:20 +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
00acce25d1
Fixed CEdit text input and drawing issues
2012-09-26 17:45:15 +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
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
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
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
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
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
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
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
erihel
6ba0f42f22
latest changes; few more classes should compile now
2012-08-31 22:28:07 +02: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
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
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
af3057df7e
Merged changes from dev
...
Resolved conflicts & added fixes.
2012-07-04 19:56:22 +02:00
Piotr Dziwinski
c2a7375788
Removed trailing whitespace
2012-06-26 23:01:17 +02:00
Piotr Dziwinski
ebed57aa22
Whitespace and language change
...
- changed tabs to spaces and DOS line endings to Unix
(except in CBot and metafile)
- changed language to English
- fixed #include <d3d.h> in d3dengine.h
2012-06-26 22:23:05 +02:00
Piotr Dziwinski
b08a63790c
SDL project
...
- added (very basic) SDL template in CApplication and CEngine
- split project into two targets: colobot_old (dependent on DirectX and WinAPI)
and colobot_new (dependent on SDL and OpenGL)
- moved sound.h/cpp to old/ and created new template in Snd namespace
- added platform-independent dialog boxes in app/system.h/cpp
2012-06-25 19:59:17 +02:00
Piotr Dziwinski
8bb223e679
Templates for new implementation
...
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
2012-06-22 16:31:55 +02:00
Piotr Dziwinski
9f784e81f8
Switched to new implementation of the rest of math module
...
- changed structs from D3DVECTOR to Math::Vector
and from D3DMATRIX to Math::Matrix
- changed functions to new Math namespace functions
- moved mainmovie module from graphics to object
- added Get and Set to Math::Matrix
2012-06-19 20:11:47 +02:00
Piotr Dziwinski
b735913deb
FPOINT -> Math::Point & other math functions
...
- changed FPOINT to Math::Point and some functions
from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options
2012-06-13 22:48:35 +02:00
Piotr Dziwinski
a8665d2042
Changed #defined constants to consts; typedef struct -> struct
2012-06-11 17:28:27 +02:00
Piotr Dziwinski
697fbdabf1
BOOL -> bool; additional fixes in constructors/destructors
2012-06-10 15:28:12 +02:00
Piotr Dziwinski
680af17819
Fixed include paths and CMakeLists.txt
...
Additionally, changed #ifndef to #pragma once everywhere
2012-06-10 00:18:08 +02:00
Piotr Dziwinski
d6525b5661
Changes from master
2012-06-08 20:30:57 +02:00
Piotr Dziwinski
449cc186d5
Source files split into modules
2012-04-28 17:53:17 +02:00