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
Zaba999
aa9df8b1f0
#48 Adding new users works.
2012-09-29 23:52:30 +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
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
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
bd36d76b31
Mouse pos setting, low cpu mode, stats display
2012-09-20 20:37:37 +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
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
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
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
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
449cc186d5
Source files split into modules
2012-04-28 17:53:17 +02:00