c9e0249008
Better CBot class destructor parsing ( #257 )
...
The previous one broke the NOT (~) operation parsing
This reverts commit 7c8a31c074
2015-12-23 13:04:46 +01:00
45a433525f
CBotClass usage examples
2015-12-22 16:32:51 +01:00
214e95c0b9
Fixed ** CBot operator
2015-12-22 16:06:55 +01:00
33ac246297
Documentation for CBotVar and all subclasses
2015-12-22 15:59:57 +01:00
2519825104
CBotVar::ProtectionLevel enum
2015-12-21 23:07:40 +01:00
c8498740f2
Minor changes to CBotProgram docs
2015-12-21 21:46:50 +01:00
eedf8dacea
Documentation for CBotProgram; some CBotError refactoring
2015-12-21 21:35:20 +01:00
6fee1ee12b
Docs for CBotTypResult.h and CBotEnums.h
2015-12-21 17:54:55 +01:00
76c04e10d5
Removed some unused CBot code
2015-12-21 16:46:44 +01:00
73f8bd5490
Made CBot errors an enum
2015-12-20 19:16:01 +01:00
5db1254dd8
Unified CBot error naming
2015-12-20 19:01:03 +01:00
51644369cb
Moved standard math and file functions into CBot library
2015-12-20 18:36:20 +01:00
22e963e2c4
Added information about graphics card to error message
2015-12-20 17:34:55 +01:00
9ec61d93e5
Refactored CBotString and const char* to std::string in CBot engine
...
A lot of changes, so it needs lots of testing
2015-12-20 16:19:10 +01:00
87a34ba1ff
Refactor CBotString::LoadString
2015-12-20 15:06:35 +01:00
3eeab0f9b7
Removed CBotStringArray
2015-12-20 14:49:30 +01:00
6832c91496
Fixed #695
2015-12-20 14:28:38 +01:00
5e23426b53
Refactored CBotString to use std::string and CBotStringArray to use std::vector
2015-12-20 14:24:49 +01:00
52a18de5c0
Fixed failed assertion when damaging LRV or Scribbler, closes #665
2015-12-19 22:19:13 +01:00
2e17712b5d
Added official build info in crash screen
2015-12-19 22:10:15 +01:00
e20f5f6983
Allow on-crash save during in-simulation config, closes #685
2015-12-19 22:06:16 +01:00
1dd230aaaf
Fixed incombatibility with old save files, closes #686
2015-12-19 22:02:24 +01:00
964d3574fd
Fixed treating 'bool' as 'int' in CBot engine
...
Appears to fix #199 - further testing required
2015-12-19 21:20:41 +01:00
95eee3a340
Merge pull request #690 from Grunaka/dev
...
Clean CBot Interface
2015-12-19 14:14:41 +01:00
aa2e14219e
Added warnings and error messages to graphics devices regarding unsupported OpenGL version
2015-12-18 21:04:16 +01:00
30c3d03141
Remove header files from to the list of .cpp files in CBot CMakeLists.txt.
2015-12-06 16:30:13 +01:00
f45d657ab0
Add comments delete by commit 1a6b5ded64.
2015-12-06 15:42:09 +01:00
aa3f8c0cd1
Add missing include in CBot.h.
2015-12-06 15:37:18 +01:00
0f491ce433
Add commments in CBot.h
2015-12-06 15:05:22 +01:00
f9ab37fd14
Add comment deleted by commit 573e1152e3.
2015-12-06 14:49:27 +01:00
17704c4d54
Delete resource.h.
2015-12-06 14:46:38 +01:00
2048ecb148
Delete CBot.cpp.
2015-12-06 14:45:31 +01:00
de5a57f793
Change CBot default include directory. Make all include directive absolute.
2015-12-01 23:25:36 +01:00
fa9dc0dace
Start cleaning of files CBotFileUtils.h and CBotFileUtils.cpp. Pass CBotTypResult parameter as reference.
2015-12-01 23:25:36 +01:00
5c7a665639
Add CBot.h, CBotEnums.h and CBotDefines.h in CMakeLists.txt.
2015-12-01 23:25:36 +01:00
4a9afdc525
Move enum from resource.h to CBotEnums.h. Delete file resource.h.
2015-12-01 23:25:36 +01:00
922082b360
Move define from resource.h to CBotDefines.h.
2015-12-01 23:25:36 +01:00
ece0666954
Create new file CBot.h. Included only useful interfaces.
2015-12-01 23:25:36 +01:00
575ff47c82
Cleaning the CBot.h file.
2015-12-01 23:25:36 +01:00
cedaaad459
Deleted file CBot.cpp.
2015-12-01 23:25:36 +01:00
b28e2aec01
Moving some define from CBot.h to CBotDefines.h.
2015-12-01 23:25:36 +01:00
751999064b
Moving global files function from CBotProgram.cpp to CBotFileUtils.cpp.
2015-12-01 23:25:36 +01:00
889c0fbe8e
Split file StringFunctions.cpp into two files StringFunctions.h and StringFunctions.cpp.
2015-12-01 23:25:36 +01:00
1a6b5ded64
Delete CBotDll.h
2015-12-01 23:25:36 +01:00
2f7932ff69
Moving defines from CBotDll.h to CBotDefines.h.
2015-12-01 23:25:36 +01:00
43ac0e35f2
Moving global files function from CBot.cpp to CBotFileUtils.cpp
2015-12-01 23:25:36 +01:00
7b200a0922
Moving global CompileParams, TypeCompatible and TypesCompatibles from CBot.cpp to CBotInstrUtils.cpp.
2015-12-01 23:25:36 +01:00
51f0675e41
Moving macro MAX from CBot.h to CBotTwoOpExpr.cpp.
2015-12-01 23:25:36 +01:00
3b0561056a
Moving CBotTypResult class in its own header and source files.
2015-12-01 23:25:36 +01:00
942d7195e4
Moving CBotString class in its own header and source files.
2015-12-01 23:25:36 +01:00
67dff4ef65
Moving CBotStringArray class in its own header and source files.
2015-12-01 23:25:36 +01:00
ef4e2f08a3
Moving CBotInstr class in its own header and source files.
2015-12-01 23:25:36 +01:00
013be673ce
Moving CBotCStack class in its own header and source files.
2015-12-01 23:25:36 +01:00
660f17454a
Moving CBotVar class in its own header and source files.
2015-12-01 23:25:36 +01:00
2eeab6d4d0
Moving CBotVarClass function from CBotVar.cpp to CBotVarClass.cpp.
2015-12-01 23:25:36 +01:00
a4f14650c6
Moving CBotVarInt class in its own header and source files.
2015-12-01 23:25:36 +01:00
44021e91f7
Moving CBotVarFloat class in its own header and source files.
2015-12-01 23:25:36 +01:00
1b3b2ea5a1
Moving CBotVarString class in its own header and source files.
2015-12-01 23:25:35 +01:00
ade4aefb0e
Moving CBotVarBoolean class in its own header and source files.
2015-12-01 23:25:35 +01:00
c624d65649
Moving CBotVarClass class in its own header and source files.
2015-12-01 23:25:35 +01:00
bd20f6303c
Moving CBotVarPointer class in its own header and source files.
2015-12-01 23:25:35 +01:00
143eecd791
Moving CBotCallMethode class in its own header and source files.
2015-12-01 23:25:35 +01:00
6d340e80ab
Moving CBotDefParam class in its own header and source files.
2015-12-01 23:25:35 +01:00
0a1b7da2a8
Moving CBotClass functions into CBotClass.cpp. Moving gloable function used by CBotClass and CBotFunction into CBotUtils.cpp.
2015-12-01 23:25:35 +01:00
4712e0ef6a
Moving CBotFunction class in its own header and source files.
2015-12-01 23:25:35 +01:00
70dc6785f2
Moving CBotProgram class in its own header and source files.
2015-12-01 23:25:35 +01:00
77d738634c
Moving CBotClass class in its own header and source files.
2015-12-01 23:25:35 +01:00
63ab9d7301
Moving CBotVarArray class in its own header and source files.
2015-12-01 23:25:35 +01:00
394a49f5aa
Moving CBotCall class in its own header and source files.
2015-12-01 23:25:35 +01:00
e54d8f1ebc
Moving CBotStack class in its own header and source files.
2015-12-01 23:25:35 +01:00
0373692ea1
Moving CBotInt class in its own header and source files.
2015-12-01 23:25:35 +01:00
b01e2180d8
Moving CBotInstArray class in its own header and source files.
2015-12-01 23:25:35 +01:00
ede0d03026
Moving CBotListArray class in its own header and source files.
2015-12-01 23:25:35 +01:00
8c04d7fc65
Moving CBotIf class in its own header and source files.
2015-12-01 23:25:35 +01:00
c0e2201c70
Moving CBotReturn class in its own header and source files.
2015-12-01 23:25:35 +01:00
14961dbc57
Moving CBotEmpty class in its own header and source files.
2015-12-01 23:25:35 +01:00
17cbae8e68
Moving CBotBoolean class in its own header and source files.
2015-12-01 23:25:35 +01:00
ff72d1a77f
Moving CBotFloat class in its own header and source files.
2015-12-01 23:25:35 +01:00
13b82b7e8e
Moving CBotIString class in its own header and source files.
2015-12-01 23:25:35 +01:00
bbf2e48802
Moving CBotClassInst class in its own header and source files.
2015-12-01 23:25:35 +01:00
dc8a6b3273
Moving CBotCondition class in its own header and source files.
2015-12-01 23:25:35 +01:00
d89fd629a2
Moving CBotLeftExpr class in its own header and source files.
2015-12-01 23:25:35 +01:00
4b10358df7
Moving CBotFieldExpr class in its own header and source files.
2015-12-01 23:25:35 +01:00
d0cfdfb998
Moving CBotIndexExpr class in its own header and source files.
2015-12-01 23:25:35 +01:00
3c1296b4b9
Moving CBotExpression class in its own header and source files.
2015-12-01 23:25:35 +01:00
d44df45d26
Moving CBotTwoOpExpr class in its own header and source files.
2015-12-01 23:25:35 +01:00
8ee0b7df56
Moving CBotLogicExpr class in its own header and source files.
2015-12-01 23:25:34 +01:00
4cd7a7a031
Moving CBotBoolExpr class in its own header and source files.
2015-12-01 23:25:34 +01:00
75f5126ddd
Moving CBotParExpr class in its own header and source files.
2015-12-01 23:25:34 +01:00
f6cc7d2c9c
Moving CBotExprUnaire class in its own header and source files.
2015-12-01 23:25:34 +01:00
8eff62a78c
Moving CBotBlock class in its own header and source files.
2015-12-01 23:25:34 +01:00
840da007a9
Moving CBotListInstr class in its own header and source files.
2015-12-01 23:25:34 +01:00
0216359445
Moving CBotInstrCall class in its own header and source files.
2015-12-01 23:25:34 +01:00
631621fb7e
Moving CBotInstrMethode class in its own header and source files.
2015-12-01 23:25:34 +01:00
d708be50e7
Moving CBotExprVar class in its own header and source files.
2015-12-01 23:25:34 +01:00
5343c15d60
Moving CBotPostIncExpr class in its own header and source files.
2015-12-01 23:25:34 +01:00
605b1b244a
Moving CBotPreIncExpr class in its own header and source files.
2015-12-01 23:25:34 +01:00
a878b0d252
Moving CBotLeftExprVar class in its own header and source files.
2015-12-01 23:25:34 +01:00
2f52520421
Moving CBotExprBool class in its own header and source files.
2015-12-01 23:25:34 +01:00
27a2c0b55a
Moving CBotExprNull class in its own header and source files.
2015-12-01 23:25:34 +01:00
85756b4da1
Moving CBotExprNan class in its own header and source files.
2015-12-01 23:25:34 +01:00
d70527db66
Moving CBotNew class in its own header and source files.
2015-12-01 23:25:34 +01:00
f8778e8c03
Moving CBotExprNum class in its own header and source files.
2015-12-01 23:25:34 +01:00
a0c2c90c9c
Moving CBotExprAlpha class in its own header and source files.
2015-12-01 23:25:34 +01:00
562752b653
Moving CBotWhile class in its own header and source files.
2015-12-01 23:25:34 +01:00
a80245b012
Moving CBotThrow class in its own header and source files.
2015-12-01 23:25:34 +01:00
18739d135b
Moving CBotCatch class in its own header and source files.
2015-12-01 23:25:34 +01:00
179ca18c58
Moving CBotTry class in its own header and source files.
2015-12-01 23:25:34 +01:00
8da5c675a4
Moving CBotBreak class in its own header and source files.
2015-12-01 23:25:34 +01:00
6d2fbf3ea4
Moving CBotCase class in its own header and source files.
2015-12-01 23:25:34 +01:00
5629bce950
Moving CBotSwitch class in its own header and source files.
2015-12-01 23:25:34 +01:00
dd6f6e29c2
Moving CBotListExpression class in its own header and source files.
2015-12-01 23:25:34 +01:00
981f41d8a3
Move CBotFor class in its own header and source files.
2015-12-01 23:25:34 +01:00
1694776ab6
Move CBotDo class in its own header and source files.
2015-12-01 23:25:34 +01:00
573e1152e3
Moving CBOT enumerated in a separate file called CBotEnum.h
2015-12-01 23:25:34 +01:00
b42c1376e5
Move CBotToken class in its own header and source files.
2015-12-01 23:25:25 +01:00
6492908cef
Added radarall() ( #624 )
2015-11-22 14:10:45 +01:00
8a160961fc
Removed STARTDEBUGDD
2015-11-21 17:33:48 +01:00
0c21631c9c
Updated constants for "catch"
...
* removed compile-time errors since they cannot be caught anyway
* added missing runtime errors
2015-11-21 17:26:56 +01:00
6f91442db1
Removed some more unused strings
2015-11-21 17:10:14 +01:00
9bea0355f0
Removed some unused strings
2015-11-21 16:54:21 +01:00
6590652d9e
Added commandline CBot interpreter (for testing purposes)
2015-11-21 16:31:22 +01:00
7b96ae65cd
Removed unused CBot files
...
Don't even ask what they were doing here. Just don't. :P
2015-11-21 14:52:56 +01:00
1838e7bfde
Removed unused "final" keyword
2015-11-21 14:44:48 +01:00
2ed1494574
Syntax highlighting for "super" keyword, closes #680
2015-11-21 14:00:38 +01:00
b0dbb11fac
Fixed class declaration change
...
see #540
2015-11-21 13:49:49 +01:00
2b03ed3a21
Fixed calling not overriden methods in CBot
...
see #540
2015-11-21 13:27:40 +01:00
1182dea692
Merge pull request #678
2015-11-10 21:36:29 +00:00
ce480c1720
Fix #670
2015-11-08 19:03:35 +01:00
13f0159705
Fix ambiguous overload resolution
...
One operator+ for CBotString is enough
2015-11-02 22:17:53 +00:00
eeea31408b
Fix operator+ semantics in CBotString
2015-11-02 22:11:02 +00:00
6a396e1522
Add unit tests for class CBotString.
...
Add comments in class CBotString.
Change existing comments in class CBotString to be compliant with doxygen.
Add function "const char* CBotString::CStr() const".
Add null pointer check in function "const CBotString& CBotString::operator+=(const CBotString& str)"
Remove functions "CBotString CBotString::Mid(int nFirst, int nCount) const" and "CBotString CBotString::Mid(int nFirst) const" because they were doublons of function "CBotString CBotString::Mid(int nFirst, int lg) const"
2015-11-01 17:03:30 +01:00
1b855f5dc3
Possible fix for issue #667
2015-10-15 17:40:15 +02:00
0aa97fe074
Restored Ceebot-Teen toy sound
2015-10-04 18:13:13 +02:00
d11ebc891c
Bring to zero some types of issues reported by colobot-lint
2015-10-04 00:09:10 +02:00
883e07ad6a
Fixed mouse scroll on lists going out of range, closes #660
2015-10-01 20:22:52 +02:00
2111c6d177
More CRobotMain cleanup
2015-10-01 20:10:52 +02:00
2c7deea6a9
Removed some unused functions from CRobotMain
2015-10-01 19:37:31 +02:00
b5e98dd6e9
Removed CSettings access through CRobotMain
2015-10-01 19:19:40 +02:00
3815ef0bd6
Refactored CPauseManager (again)
2015-10-01 18:55:41 +02:00
58035f3cd1
Fixed rendering camera overlay color, closes #157
2015-09-30 21:41:00 +02:00
d03ce19fbe
Fixed #639
2015-09-30 20:54:36 +02:00
95f1e3f19a
Fixed water/lava moving and waves ( #659 )
2015-09-30 20:31:09 +02:00
2f0ec3fe75
Fixed lava particle effects ( #659 )
2015-09-30 20:21:25 +02:00
3a7aa4ae9c
Restored CreateSpot code in Teen objects
2015-09-30 18:15:09 +02:00
6e1504d7a5
Further cleanup USE_SDL_MAIN
2015-09-29 22:39:34 +02:00
49ee00d90d
fix MacOSX install instruction and compilation
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-09-29 22:39:33 +02:00
61a3ba2800
Fix undefined function colobot-lint issues
2015-09-29 21:44:24 +02:00
94b3f82988
Fix colobot-lint issues in restored code
2015-09-29 20:55:51 +02:00
2cb2782c9d
Restored old Ceebot-Teen objects
...
In preparations for new programming course
2015-09-28 22:08:59 +02:00
7a6e669a37
Show detailed error info when opening haptic device fails
2015-09-27 18:54:02 +02:00
66ce745be0
Introduce forward declarations as suggested by colobot-lint
2015-09-27 16:28:14 +02:00
6a6025f557
Implemented force feedback
2015-09-27 00:34:03 +02:00
fd07589ebb
Separated config.h and version.h
...
This prevents unnecessary recompilation of some files when version number changes
2015-09-26 21:12:12 +02:00
4dc7a301eb
Always reverse forward/backward and up/down axes on a joypad
2015-09-26 21:03:17 +02:00
377a331e2a
Forgot to clean this up
2015-09-26 14:58:43 +02:00
f6823389cc
Fixed displaying joystick button 0 name, closes #646
2015-09-25 23:24:29 +02:00
07df35ca01
Refactored mouse wheel
2015-09-25 22:54:48 +02:00
0c64e62979
Fixed a minor error in event logging
2015-09-25 22:18:44 +02:00
a0034f8000
Finalized SDL2 migration
2015-09-25 21:26:49 +02:00
e965414d34
Rewritten text input to SDL2
2015-09-25 19:49:50 +02:00
7839dce624
Fixed duplicate resolutions appearing on the list
2015-09-25 11:16:09 +02:00
dfa06dafcf
Refactored window resize
2015-09-25 11:11:35 +02:00
53e4470dbf
Started SDL2 migration
2015-09-24 21:09:46 +02:00
4062d3d4ef
Fixed #633
2015-09-13 20:43:24 +02:00
7500ab4988
Added code battle spectator mode switch
2015-09-13 15:59:42 +02:00
389aaaf132
Fixed 'invui' disabling too much
2015-09-12 11:51:03 +02:00
21a7f1bced
Made 'invui' work in main menu
2015-09-12 10:35:31 +02:00
38a26e53a9
Possible fix to #628 crash
2015-09-11 18:40:41 +02:00
c9a1bbefbb
Fixed code battle start button becoming visible after closing file selection dialog
2015-09-11 18:38:25 +02:00
48f24fe6cc
Fixed CInterface::SetFocus not recursing into windows, this fixes highlighting of compilation errors in the editor
...
It's not really nice, but at least it works
2015-09-11 18:34:47 +02:00
2792fa2c6c
Fixed mouse cursor scaling (again)
...
How could I even miss the fact that my previous fix is not working at all? :P
2015-09-11 17:54:55 +02:00
e6e38eae7f
Fixed cheat console actiaving multiple times, closes #627
2015-09-10 21:32:25 +02:00
4d40bd6992
Hide completion marks in code battle level list
2015-09-10 20:42:48 +02:00
20105d09ec
Added code battles button to the main menu
2015-09-10 20:20:24 +02:00
74cee19c09
Fixed objects being deselected if not clicked on any object
2015-09-09 20:32:56 +02:00
060db9c069
Fixed save button being always unavailable
2015-09-09 20:24:44 +02:00
09ff821f2c
Fixed code battle start button not disappearing in the editor
2015-09-07 21:45:51 +02:00
0a59f0a907
Fixed a possible bug in CObjectManager::GetObjectByRank (might fix #611 )
2015-09-07 20:38:25 +02:00
b058a6986b
Minor improvments to plane camera
2015-09-06 20:33:04 +02:00
582e3c865f
Allow controlling plane camera with number keys
2015-09-06 20:15:56 +02:00
f6fdec1479
Allow controlling free camera with arrows when no object is selected
2015-09-06 20:09:47 +02:00
883348c6cf
Do not (auto)save code battles
2015-09-06 20:01:59 +02:00
d36fcf4187
New code battle camera behavior
2015-09-06 19:59:26 +02:00
51330dde5e
Added code battle start button; fixed bug with starting code battle
2015-09-06 19:12:00 +02:00
cf72693b25
Fix another issue in #621
2015-09-06 16:29:21 +02:00
a03911dde6
Compile fix
2015-09-06 16:08:10 +02:00
86678d4f7a
Fix for #621
2015-09-06 13:48:41 +02:00
44a1f85891
Refactor CRobotMain::DeleteObject -> DestroySelectedObject
2015-09-06 13:23:43 +02:00
b1e383f89e
Temporarily revert new tree0 model code
...
* create tree0 using the old model code
* don't install new model files yet in data submodule
2015-09-06 12:12:21 +02:00
5fd1735678
Added option to move camera lookat point in free cam
2015-09-05 20:59:11 +02:00
fb03a497d7
Added command to hide the UI
2015-09-04 19:16:21 +02:00
e956311626
Moved free camera controls to numpad; added 'camtype %d', 'camspeed %f', 'freecam'
2015-09-04 19:04:42 +02:00
658e2ff1be
Possible fix for issue #520
2015-09-02 21:35:43 +02:00
78e4e440b5
Removed cancel button from player selection screen
...
Not really needed, and it had a bug with removing players (it would still go back to the deleted player)
2015-09-01 16:30:05 +02:00
6f38ec1911
Clear player name text field on delete
2015-09-01 16:25:09 +02:00
ec9a38a681
Don't show level completion marks in free games
2015-09-01 16:22:57 +02:00
d97042e252
Fixed possible problems if another crash occurs while saving crash state
2015-09-01 16:17:23 +02:00
e015d9f1c3
Don't allow saving if crashed during loading
2015-09-01 16:15:59 +02:00
89c93c15cd
Fixed crash after removing last program from a robot
2015-09-01 16:10:12 +02:00
c3d7876a5c
Made CPauseManager not a singleton
2015-08-31 22:05:21 +02:00
75d18ced05
Fixed #596
2015-08-31 21:57:46 +02:00
ff17961584
Refactored CPauseManager
2015-08-31 21:47:55 +02:00
cc7e36968f
Fixed new text in editor not being monospace
2015-08-31 12:21:28 +02:00
2ec5e07080
Possible fix to #608
2015-08-31 12:06:14 +02:00
82e06bfd8e
Fixed wrong program being highlighted after loading ( closes #616 )
2015-08-31 11:37:02 +02:00
a47da3fd3f
Whitespace fixes
2015-08-30 22:18:49 +02:00
a1d2ca50a8
Fix #619
...
This fixes handling of status codes from PHYSFS functions and seems to
solve crashes like in #619
2015-08-30 22:14:14 +02:00
3335be42de
Fix MSVC compilation
...
Forgot to push this the last time
2015-08-30 22:11:30 +02:00
6711154762
Fixed produce() and NewScript not marking programs as loaded from level files ( closes #613 ); refactored NewScript to std::vector and std::string
2015-08-29 16:52:07 +02:00
bd9a56fe7b
Indentation! :/
2015-08-29 16:29:45 +02:00
21b9d5b8cc
Fixed saving object activity state ( #610 )
2015-08-29 16:28:10 +02:00
a8eb7499ac
Fix #607
2015-08-29 10:49:04 +02:00
934d97a801
Fixed #581 for aliens
2015-08-25 17:25:53 +02:00
43901aa62a
Fixed objects being able to move while executing tasks, closes #603
2015-08-25 17:21:25 +02:00
5eae234b83
Fixed EndMissionDelay win=-1 not working, closes #592
2015-08-25 17:17:11 +02:00
48481718e6
Restored astronaut damage multiplier, closes #578
2015-08-25 17:03:18 +02:00
fe44e617a8
Fixed selection markers not disappearing when moving gun away
2015-08-25 16:57:10 +02:00
8b7bd663b9
Fixed shooters detecting all objects as friendly, closes #581
2015-08-25 16:29:26 +02:00
d4b431adaa
Recalculate camera projection matrix after aspect ratio change
2015-08-25 16:18:01 +02:00
1519145c4c
Added information when no exception object is returned from std::current_exception
2015-08-25 14:01:10 +02:00
551710646b
Revert "Fix reporting unhandled exceptions in MSVC"
...
This reverts commit 4d3a0b6602
2015-08-25 13:32:58 +02:00
65d26733fa
Fixed Derrick output direction, closes #605
...
I won't even ask who designed it like that, okay?
2015-08-25 12:37:55 +02:00
d9c8a7ed9b
Fixed MXE builds, 2nd try
2015-08-25 12:18:15 +02:00
f206b49106
Fixed MXE builds
2015-08-25 12:01:22 +02:00
d287af159d
Support for #rrggbbaa syntax for colors (mentioned in #591 )
2015-08-25 11:53:56 +02:00
db099bade4
Legacy 0-255 color support in level files, closes #591
...
Thanks @attila123
2015-08-25 11:41:01 +02:00
00ae6c32f1
Fixed CBot scripts in SatCom not being sometimes colorized
...
This is because in some places \c; and \s; are reversed
2015-08-25 11:32:15 +02:00
06e10a515e
Fixed crash when loading SatCom files with both images and code, closes #587
2015-08-25 11:22:35 +02:00
d8372510b8
Don't allow buildings to work before they are built, closes #582
2015-08-25 10:57:36 +02:00
270c77da5b
Fixed memory corruption in produce(), closes #600
2015-08-25 10:49:59 +02:00
b9e7143734
Fixed PowerCaptor not recharging transported objects, closes #594
2015-08-25 10:32:50 +02:00
5a29bee3b4
Fixed RepairCenter repairing itself, closes #579 and #589
2015-08-25 10:27:14 +02:00
844e7343e0
Possible fix to #601
2015-08-24 23:19:02 +02:00
07141f6d90
Fixed wrong energy level in CBot (mentioned in #601 )
2015-08-24 21:14:19 +02:00
6ed83bb63f
Fixed Shielder not being destructible by OrgaMatter even when the shield is not active, closes #597
2015-08-24 21:12:06 +02:00
79d796754a
Fixed Shielder shutdown animation, closes #595
2015-08-24 20:55:21 +02:00
2722e72afb
Fixed Destroyer destroying itself, closes #599
2015-08-24 20:27:57 +02:00
f78f4854b4
Fixed failing assertion when turning objects into ruins, closes #598
2015-08-24 20:22:08 +02:00
39d2236be6
Fixed %lvl% in saved games, closes #586
2015-08-24 20:08:08 +02:00
8ff6fadb75
Unlocked free window resolution change
2015-08-24 19:56:50 +02:00
d9b680bdcf
Removed Windows restart on resolution change workaround
2015-08-24 19:47:48 +02:00
b5bd1b2d74
Destroy static buffers after resolution change
...
Under windows, changing the video mode causes SDL to destroy and recreate the OpenGL context, which invalidates all current static buffers.
It works on Linux because the actual SDL implementation here differs.
See http://sdl.beuc.net/sdl.wiki/SDL_SetVideoMode for details:
> Also note that, in Windows, setting the video mode resets the current OpenGL context. You must execute again the OpenGL initialization code (set the clear color or the shade model, or reload textures, for example) after calling SDL_SetVideoMode. In Linux, however, it works fine, and the initialization code only needs to be executed after the first call to SDL_SetVideoMode (although there is no harm in executing the initialization code after each call to SDL_SetVideoMode, for example for a multiplatform application).
2015-08-24 19:43:06 +02:00
60f0a7b45c
Get rid of "blacklisting shadowXX.png" logs
2015-08-22 18:17:57 +02:00
c3d4d46583
Fix missing empty line after license header
2015-08-22 17:52:07 +02:00
b93f610930
Fix license header in all files
2015-08-22 16:40:02 +02:00
e1f0c0f91f
Fixed #585
2015-08-19 20:56:04 +02:00
14396847d6
Added missing license headers again
2015-08-19 20:27:29 +02:00
d723295aad
Revert "Backported some thread classes cleanup from dev-threads (1ad8ff6e47fb9e249e6bcbc2f4a3a94933a1168a)"
...
This reverts commit 7cf73c94c4fixes #584
2015-08-19 20:25:17 +02:00
27bbc27948
Fixed object creation after loading save file
...
Looks like @piotrdz broke it when creating the ObjectCreateParams struct. I'm kinda suprised this remained unnoticed for so long ;)
Reported in issue #570
2015-08-19 20:06:55 +02:00
9d6543a947
Close game window on error (mentioned in #570 )
...
Otherwise, the error doesn't show up and the game appears to freeze in fullscreen mode
2015-08-19 11:14:25 +02:00
8421189716
Merge branch 'dev-cbot-syntax-highlighting' into dev ( #575 )
2015-08-18 23:01:02 +02:00
e91ecbbb01
Removed unused references to effect03.png from the code
2015-08-18 22:59:31 +02:00
d6a946618e
Syntax highlighting in SatCom
2015-08-18 22:35:38 +02:00
1c0fc21e2b
Made all colors a bit darker
2015-08-18 22:12:00 +02:00
3fe44be5d5
Fixed no monospace font in the editor
2015-08-18 22:12:00 +02:00
c5da68d516
New CBot syntax highlighting
2015-08-18 22:12:00 +02:00
371621ced4
Render trace colors in the code instead of using texture
2015-08-18 22:11:04 +02:00
b086c52b14
Render some things in code instead of using effect03.png texture (in CEdit)
2015-08-18 21:04:00 +02:00
eef76a9b29
Fixed not working Converter, closes #574
2015-08-18 19:38:58 +02:00
118ceaa099
Fixed music stopping during apperance phase, closes #573
2015-08-18 19:33:01 +02:00
28925106e4
Cleaned up some long lists of ifs
2015-08-18 12:29:41 +02:00
a5c84b9a1e
Removed unused OBJECT_FIX and OBJECT_FRET
2015-08-18 11:43:41 +02:00
a63a959dbe
Apply clang-modernize -use-nullptr
2015-08-17 22:40:52 +02:00
ba3284b8b8
Apply clang-modernize -add-override
2015-08-17 22:12:09 +02:00
2dbacc28b5
Fixed too small AlienAnt damage
2015-08-17 22:05:26 +02:00
63b4849275
Fixed #561
2015-08-17 21:57:53 +02:00
1717fe071e
Removed unused variables
2015-08-17 21:42:18 +02:00
6534978dea
Refactor Character::posPower
2015-08-17 21:28:30 +02:00
98748d757f
Fixed paths to RemoveDirectory
2015-08-17 21:03:40 +02:00
7e028977bd
Implemented emergency save on crash, closes #572
2015-08-17 20:56:42 +02:00
ee9457f156
Fixed failing assert in CMotionHuman with Tech
2015-08-17 19:32:17 +02:00
d5a468df46
Fixed regex in checking object.factory parameter
2015-08-17 19:30:27 +02:00
1185bd4c36
Fixed OrgaMatter destroying itself and the wasp
2015-08-17 19:12:58 +02:00
0bff05f095
Fixed problems with motor() + fire() in CBot while the robot was selected
2015-08-17 18:26:09 +02:00
1059ae37c1
Shielder subclass
2015-08-17 14:06:31 +02:00
63bee182d2
Moved SetFixed/GetFixed to CBaseAlien
2015-08-17 13:19:21 +02:00
304b0b20d8
Created base classes for aliens, robots and buildings
2015-08-17 12:49:54 +02:00
75de19f10e
COldObjectInterface::SetViewFromHere -> CControllableObject::AdjustCamera
2015-08-17 11:53:34 +02:00
9f19ee2263
Fixed ExchangePost interface not updating
2015-08-17 11:47:56 +02:00
ad84478c71
Removed Get/SetInfoReturn
2015-08-17 11:44:05 +02:00
303dd17d58
Improved documentation of new object interface; removed unused Get/SetSoluceName
2015-08-17 00:43:32 +02:00
0d9b3b907a
Moved GetActive and GetDetectable to CObject
2015-08-17 00:02:38 +02:00
e11d2ec33e
Refactor object dying status and GetActive
2015-08-16 20:24:48 +02:00
b2e7815001
Fixed AlienSpider explosion
...
#fail
2015-08-16 18:12:34 +02:00
92e2c217af
Fixed aliens not becoming controllable after "selectinsect"
2015-08-16 18:03:04 +02:00
b5cca39cc2
Prevent big simulation step after loading
2015-08-16 17:08:38 +02:00
3f303ea824
Removed some unneccessary includes
2015-08-16 16:35:39 +02:00
8c617badae
Fixed all portable objects being usable as energy cells
2015-08-16 16:06:51 +02:00
0986a200d7
Fixed CBot editor being inaccessible while running program
2015-08-16 16:03:36 +02:00
4182be3216
Never save copy of programs from level files when saving scene
...
Prevents some possible bugs related to changing level files. This might also slightly improve saving time (which is kinda important with one-threaded autosaves ;))
2015-08-16 15:27:41 +02:00
2289d69735
Replace NULL -> nullptr
2015-08-16 12:43:42 +02:00
4d3a0b6602
Fix reporting unhandled exceptions in MSVC
...
For some reason set_terminate() doesn't work with MSVC2013
2015-08-16 00:48:15 +02:00
0c670e7699
Don't demangle the exception class name on MSVC
2015-08-16 00:44:36 +02:00
f21025b526
User-friendly abort error messages
2015-08-16 00:44:36 +02:00
d703eb7165
Compile fixes for MSVC2013
2015-08-16 00:39:08 +02:00
db3596ace1
Removed Get/SetDefRank
2015-08-15 23:49:51 +02:00
ceae617949
Fixed user programs disappearing after swapping them with level programs
2015-08-15 23:47:51 +02:00
fe5a8c4629
Updated progress bar values
2015-08-15 23:37:30 +02:00
bc7d0c1c51
Rewritten program storage, closes #534
2015-08-15 23:29:21 +02:00
0eaf0d6f65
Split Programmable and ProgramStorage
2015-08-15 21:29:08 +02:00
d7800e03d1
Fixed tabs instead of spaces
2015-08-15 20:42:02 +02:00
6e2e7b5d06
Fixed another bug in CTaskShield
2015-08-15 20:38:25 +02:00
856c5baa0e
Removed CTaskManager
2015-08-15 20:30:15 +02:00
7fe8199c96
Compile fix
2015-08-15 19:54:06 +02:00
bd10f424ec
Better parsing of bool properties
2015-08-15 19:45:49 +02:00
f773d5714d
Fix implicit bool casts in CSettings
2015-08-15 19:17:15 +02:00
a082d21f95
Fix possibly incorrect code in OpenAL Buffer class
...
OpenAL doesn't specify 0 as invalid buffer, so we should use alGetError()
2015-08-15 19:17:15 +02:00
dd227f5fba
Fix some stupid mistakes connected with implicit bool casts
2015-08-15 19:17:15 +02:00
9a15db1bea
Split global.h
2015-08-15 14:02:07 +02:00
d5ddf3ac76
Addressed comments on commit efedb44
2015-08-15 00:16:50 +02:00
efedb44cce
Add proper initializations and remove manual memory management in remaining classes
...
Except CBot-related stuff of course
2015-08-14 23:44:00 +02:00
0ec3f29e68
Fixed win/lost scene music cached at startup not being ever used
2015-08-14 19:44:44 +02:00
870f89ac4a
Further fixes for GCC 4.7 build
2015-08-14 19:34:17 +02:00
f9abeb21ec
Fixed a bug in CTaskShield
2015-08-14 19:08:34 +02:00
9ad513550b
Add other missing #include <stdexcept>
2015-08-14 19:05:24 +02:00
5e929b2474
Add missing include
2015-08-14 18:52:11 +02:00
d92d9799d6
Changed amount of damage done by shooters, fixes #560
2015-08-14 18:36:02 +02:00
57646c0c7b
Refactored object creation
2015-08-14 18:20:44 +02:00
bde0261fe7
Fixed broken Damageable hack in COldObject, closes #559
2015-08-14 13:50:05 +02:00
9d8bef877d
Renamed old-style shadows to shadow spots in the code
2015-08-14 13:37:40 +02:00
78a279b479
Better shadow type selection UI
2015-08-14 13:37:27 +02:00
009b3abc03
Moved some interface controls
2015-08-14 13:14:57 +02:00
eda7435eb6
Removed a lot of useless settings ( #556 )
2015-08-14 13:04:05 +02:00
add93cb778
Fixed proxyActivate not working, closes #557
2015-08-14 12:10:27 +02:00
1d6c3cc748
Fixed CEngine trying to use unsupported values as defaults, closes #552
...
Also fixed the settings buttons not being disabled properly
2015-08-14 12:03:53 +02:00
222517a5e7
Don't assert a powered object unless asked to take a cell from youself in CTaskManip
2015-08-14 00:30:23 +02:00
5bef62f01a
Removed incorrect assert in CTaskTake
2015-08-14 00:24:08 +02:00
41c0ec0940
Fixed game save being always blocked
...
Also, prevent autosave if saving is blocked
2015-08-14 00:21:18 +02:00
02b76e5aba
Workaround for too fast calling of m_app->Render
2015-08-14 00:10:07 +02:00
92591c23b6
When flushing texture cache, also remove device textures
2015-08-13 23:49:01 +02:00
1c461ce1c8
Prevent reloading background if not needed
2015-08-13 23:44:08 +02:00
0258b63d39
Fix memory leak in creating textures
2015-08-13 23:42:27 +02:00
26e4ec0ae2
Add more missing includes and forward declarations
2015-08-13 22:49:05 +02:00
3f57aab406
Fixed Thumper crash
2015-08-13 22:41:24 +02:00
868dec4488
Fixed flying checkpoints activating multile times
2015-08-13 22:32:49 +02:00
74609d9bea
Fixed astronaut death bug
...
introduced in f7d2f501bb
2015-08-13 22:27:39 +02:00
b832200798
Add missing include
2015-08-13 21:46:19 +02:00
8bff64ae3e
Fixed OrgaShooter bug
2015-08-13 21:27:18 +02:00
c399e5e246
Somehow missed some more Scraps :/
2015-08-13 19:53:03 +02:00
a644fc107d
Use +infinity instead of -1 for immediate object destruction
2015-08-13 19:46:30 +02:00
275e792a81
Removed old Scrap objects; cleaned up some more if()'s
2015-08-13 19:41:21 +02:00
28d88347eb
Added some notes in function documentation
2015-08-13 19:06:18 +02:00
08afa4b134
Fixed falling OrgaMatter object destruction
2015-08-13 19:04:15 +02:00
bfd3a5b23c
Refactored ExplodeObject
2015-08-13 18:54:44 +02:00
bc05cda0e7
Removed image, link and marker limits in SatCom, closes #554
2015-08-13 14:14:11 +02:00
e5e1d4973f
CDestroyableObject, CFragileObject, CShieldedObject and CShieldedAutoRegenObject
2015-08-13 13:41:25 +02:00
ff957afefc
Moved files not directly related to CObject into src/level/ directory
2015-08-13 11:47:32 +02:00
e937db94c8
Moved GetPhysics() and GetMotion() to CMovableObject; moved trace drawing to CTraceDrawingObject
2015-08-13 10:49:45 +02:00
93a06c0c23
Remove manual memory management from graphics classes
2015-08-12 21:07:16 +02:00
5d52214737
CFlyingObject; CJetFlyingObject
2015-08-12 19:09:35 +02:00
1b73830f28
CRangedObject
2015-08-12 18:12:27 +02:00
15bf98da40
Removed SetShowLimitRadius
2015-08-12 17:48:58 +02:00
60797f72d3
Removed some old, unused code
2015-08-12 17:25:41 +02:00
f7d2f501bb
Moved common interface implementations to separate classes
...
Additionaly, merged all "inappropariate bot" errors into one and renamed ERR_GENERIC -> ERR_UNKNOWN
2015-08-12 16:54:44 +02:00
63d83185b5
Move GetTooltipText and Get/SetLock to CObject; remove Get/SetEnable
2015-08-12 00:16:57 +02:00
f37d2a338e
Moved SetHighlight to CControllableObject
2015-08-12 00:16:57 +02:00
00e9684e6d
Add missing include
2015-08-11 23:17:38 +02:00
571cc96523
Add proper initializers and remove manual memory management in ui classes
2015-08-11 23:15:32 +02:00
34e4fb4508
Add missing initializers to sound classes
2015-08-11 23:15:26 +02:00
a9673d5f72
Moved StartDetectEffect to CRobotMain
2015-08-11 23:13:57 +02:00
3f32b7c8a3
Removed SetCapacity()
2015-08-11 22:57:33 +02:00
364f87c49b
CPowerContainerObject interface
2015-08-11 22:51:16 +02:00
7e18757d29
CScript user pointer cleanup; moved some functions from COldObjectInterface to main CObject
...
* moved (Get|Set)Clip [renamed to (Get|Set)Collisions], (Get|Set)Team, (Get|Set)Proxy(Activate|Distance) and GetBotVar to main CObject class
* refactored scripting to pass CScript* as the user pointer, removing the need for GetRunScript()
* changed accessing of "object" class in CBot to use ->GetUserPtr()
* refactored object limits to remove (Start|Stop)ShowLimit from COldObject
* added notes on possible interfaces for most of the other COldObjectInterface functions
2015-08-11 17:51:39 +02:00
15c1c7ee03
CMovableObject, CControllableObject
2015-08-10 23:21:15 +02:00
8ad3b4e552
Fix Clang compilation
2015-08-10 22:40:37 +02:00
849a3f900c
Add missing includes
2015-08-10 22:33:42 +02:00
513a1129fa
Add proper initializers and remove manual memory management from common classes
2015-08-10 22:33:22 +02:00
abb272600e
Merged CBrain into CProgrammableObject
2015-08-10 18:16:00 +02:00
726cfbda77
Removed manual memory management in CBrain and CObjectInterface
2015-08-10 17:17:02 +02:00
a3fa3487b2
Fixed editor being unavailable after starting the program
2015-08-10 17:06:26 +02:00
a754b2ad06
Fixed manual control overriding tasks
2015-08-10 17:02:31 +02:00
78a51f0acb
Moved all UI code out of CBrain into Ui::CObjectInterface
2015-08-10 16:37:03 +02:00
2b44a7be3d
Removed m_event from script.h
2015-08-10 13:52:03 +02:00
3a5f618f65
CTaskExecutorObject interface; some general task and CBrain cleanup
2015-08-10 13:46:39 +02:00
73e0abc510
Fixed AlienQueen crash
2015-08-10 13:33:11 +02:00
39a4a4cd78
Removed some unused CBrain members
2015-08-10 11:24:02 +02:00
2f156f022e
Fixed screen_level_list.cpp warnings
2015-08-09 23:21:08 +02:00
4964e35625
Fixed gun targetting with mouse
2015-08-09 23:04:24 +02:00
115e18cc85
Fixed version display being invisible during loading
2015-08-09 22:53:59 +02:00
3358091b8c
Fixed too high BlackArrow density
2015-08-09 22:46:05 +02:00
a8707e2568
Added Anisotropy to configuration presets
2015-08-09 22:41:43 +02:00
903f4f144f
Fixed apperance interface ( #551 )
2015-08-09 22:32:28 +02:00
6b4610e808
Improved stats display
2015-08-09 15:20:38 +02:00
7cf73c94c4
Backported some thread classes cleanup from dev-threads (1ad8ff6e47fb9e249e6bcbc2f4a3a94933a1168a)
2015-08-09 13:52:15 +02:00
bb3fc63e03
More details on terrain loading
2015-08-07 23:40:38 +02:00
0ed11e0e7d
Fixed "unable to open shadow??.png texture" errors again
2015-08-07 22:48:26 +02:00
30589f3e79
Fixed -runscene
2015-08-07 22:37:56 +02:00
0468c3efdb
Fixed ULTRA LONG loading time bug introduced in 5593f427f6
...
Well... that escalated quickly :P
And it remained unnoticed for so long!
2015-08-07 22:36:50 +02:00
57469533b6
Implemented loading progress bar
2015-08-07 20:48:55 +02:00
f90bb63520
Hide some things in save screenshots
...
Save indicator, mouse cursor, CDisplayText and interface particles
2015-08-07 15:59:05 +02:00
6d363ba887
Fixed version being displayed during intro
2015-08-07 15:26:37 +02:00
d58d015edd
Fixed selection save when saving manually
2015-08-07 15:25:17 +02:00
7da6f1b704
More random virus particles
2015-08-07 15:18:04 +02:00
9bf53e48e8
Changed TAB character rendering to be red, like in the original game
2015-08-07 14:16:10 +02:00
4d5b4c47a2
Use CText for virus particle rendering
...
As suggested by @RaptorParkowsky on Trello - https://trello.com/c/56MszsWA/66-texture-remastering-checklist
2015-08-07 13:29:29 +02:00
e9e1c8d4dd
Add proper initializations and remove manual memory management in app classes
2015-08-07 10:16:46 +02:00
22415e183d
Remove unneeded empty map.png file
2015-08-06 23:06:36 +02:00
e5d652acef
Fixed a crash when trying to infect an empty program
2015-08-06 22:50:22 +02:00
0d00952b10
Rename text.png to effect03.png
2015-08-06 22:41:54 +02:00
1e97d41a2d
Fixed RedArrow and BlackArrow transparency ( #545 )
2015-08-06 22:39:06 +02:00
6e5e3c4822
Fixed crash in IntroduceVirus if robot doesn't have any programs
2015-08-06 22:34:46 +02:00
69e6ae2c5e
Added "saving in progress" indicator
2015-08-06 20:15:17 +02:00
8d34286b1d
Added "No userlevels installed" message
2015-08-06 19:37:18 +02:00
f95980456a
Replace anonymous union in Event with pointer to appropriate struct
2015-08-06 19:11:50 +02:00
e05fba22fd
Moved some interface controls around
2015-08-06 19:03:15 +02:00
ec3ded75b8
Removed unused LOD level setting
2015-08-06 18:35:56 +02:00
69c6e9d4be
Fixed level loading error message
2015-08-06 18:29:59 +02:00
7649731b49
Reimplemented hiding mouse during loading
2015-08-06 18:28:28 +02:00
dc9e2d2e8b
GUI loading error popup
...
Also added fireParticles option
2015-08-06 18:19:01 +02:00
b9bd075903
Drop (now unused) m_phase from CMainDialog
2015-08-06 16:20:29 +02:00
6e8266fd58
Always clear tooltip and highlighted object on phase change
2015-08-06 16:14:11 +02:00
50aaf04405
Don't rotate autosaves if not needed
2015-08-06 16:11:49 +02:00
711643b454
Refactored CMainDialog
2015-08-06 16:02:59 +02:00
f29a826ad2
Fix Clang warnings about use of abs()
2015-08-06 14:31:40 +02:00
654ef7ba59
Add proper initializers to common classes
2015-08-06 14:31:40 +02:00
2906451d06
Indent style fix
2015-08-06 14:31:40 +02:00
61ec101b11
Replace size_t with std::size_t
...
For some reason Clang's AST API doesn't like size_t
2015-08-06 14:31:40 +02:00
6ca0757fec
Fix for Clang compilation
2015-08-06 14:31:40 +02:00
0dbfa027b1
Fixed dialog opening animation and particles
2015-08-06 14:04:33 +02:00
02417363e4
Fixed version text disappearing during loading
2015-08-06 14:03:07 +02:00
f0cfc35356
Fixed mouse particles appearing in simulation
2015-08-06 13:54:59 +02:00
d538b65ace
Fixed saving of selected object in autosaves
2015-08-06 13:53:03 +02:00
b20d589c87
Check available texture units in shadow mapping settings
2015-08-06 13:47:42 +02:00
4faeffa77d
Fix for cursor particles in main menu
2015-08-06 13:25:56 +02:00
dc85aa2138
Moved all UI controls to a subdirectory
2015-08-06 13:25:24 +02:00
2b4210dcbc
Separated CMainUserInterface from CMainDialog
2015-08-06 12:59:09 +02:00
a322f46f00
Split CScreenSetup
2015-08-06 12:16:38 +02:00
0c9cf51d81
Address comments on commit d7bc28a
2015-08-06 11:17:54 +02:00
596bb49de0
Normalize static variables and functions
...
* get rid of some of them
* put the rest into anonymous namespaces
2015-08-06 10:12:20 +02:00
bdeeaf690b
Get rid of memsets
2015-08-06 09:37:25 +02:00
0c9e745213
Add proper initializations in remaining graphics classes
2015-08-06 09:33:27 +02:00
c339838cd2
Add proper initializations in CWater, CTerrain and CCloud
...
Also make associated structs private
2015-08-06 08:22:11 +02:00
d7bc28a595
Add proper initializations in CPlanet and refactor planet mode
2015-08-06 08:22:11 +02:00
111d279de5
Add proper initializations in OpenGL classes
2015-08-06 08:22:11 +02:00
91658c7df0
Add proper initializations in basic graphics structures
2015-08-06 08:22:11 +02:00
7097ec38e3
Fix very subtle memory access bug
...
Some CScreen classes have functions which call ChangePhase() on
CRobotMain, which in turn calls ChangePhase() on CMainDialog, which in
turn deletes current CScreen object :(.
So the fix is to keep all CScreen objects created all the time and only
keep pointer to the currently active object.
This also makes it easy to clean up dependencies between CScreen classes
and get rid of all these ugly static variables and functions.
2015-08-06 08:18:22 +02:00
c38ecd67ea
Fix crash in glDeleteTexture
2015-08-05 23:06:54 +02:00
95a438bcc6
Fixed cheat console and particles during loading
2015-08-05 22:54:13 +02:00
86caf4f098
Fixed a bug in 47d79c9977
2015-08-05 22:16:52 +02:00
9ccb39ce66
Fix Clang compilation
2015-08-05 22:02:59 +02:00
a9a643eea4
Add virtual destructor to CScreen to fix memory corruption issue
2015-08-05 20:59:49 +02:00
47d79c9977
Added #Include support in level files
2015-08-05 19:27:26 +02:00
c62e583c12
Fixed log message
2015-08-04 23:34:39 +02:00
5e0cff29dc
Removed GetChapPassed from maindialog.h
2015-08-04 23:32:44 +02:00
54254e2158
Split CMainDialog
2015-08-04 23:29:18 +02:00
c2387b4b56
Class naming fix
2015-08-04 20:58:03 +02:00
18f9bfb575
Make saving screenshot thread- and exception-safe
...
* introduce ResourceOwningThread wrapper for safely passing resources
to new threads
* make CEventQueue thread-safe
* start screenshot saving thread using ResourceOwningThread
* change direct call at end of writing screenshot to thread-safe
event communication
2015-08-04 20:37:15 +02:00
5005e760b9
Fix interrupting Me building when he's not selected ( fixes #548 )
2015-08-04 20:31:17 +02:00
3f48e4699d
Moved window position and font size storage from CRobotMain to CSettings
2015-08-04 13:09:34 +02:00
a4f12f1b11
Removed unused m_access* variables
2015-08-04 12:50:49 +02:00
4b271cee2d
Moved settings out of CMainDialog into a separate class
...
Also fixed some problems with resolution list selection after starting game
2015-08-04 12:46:54 +02:00
ea7bfdefda
Moved scene to load out of CMainDialog
2015-08-04 10:56:49 +02:00
fc8d8cb9d4
Moved saved scene loading to CPlayerProfile
2015-08-04 09:55:39 +02:00
72210d523f
Fixed this.orientation values outside of 0-360 range
2015-08-03 23:10:24 +02:00
13ef6e5498
Fixed position & direction when copying object from F12 menu
2015-08-03 22:26:22 +02:00
522c54afc3
Possible fix for MXE builds
2015-08-03 22:12:41 +02:00
6ea98ed995
Fixed screenshot image lag on old GPUs that have problems with not power-of-2 textures ( #546 )
2015-08-03 22:06:27 +02:00
04960035c1
Save screenshot image in a separate background thread ( #546 )
2015-08-03 21:40:30 +02:00
5e4a423bf0
Cleaned up "textures/"+something, fixed more possible occurences of #531
2015-08-03 20:55:33 +02:00
1e38edcec7
Fixed InterfaceGlint and InterfaceRain using the same config value name
2015-08-03 20:40:27 +02:00
45d6091a74
Fixed program from object.factory() being kept in BotFactory for every next manual operation
2015-08-03 20:33:45 +02:00
4bdadc8cc8
Updated help file paths
2015-08-03 20:23:35 +02:00
794d1f3cbe
Fixed "this" ( #547 )
2015-08-03 19:56:35 +02:00
11b0398c03
Include refactoring
...
* reordered includes according to correct style
* removed some unnecessary includes
2015-08-02 17:49:07 +02:00
7d8b56d9ab
More style fixes
2015-08-02 12:06:14 +02:00
3b585d9f51
Some style and whitespace fixes
2015-08-02 11:36:36 +02:00
60ae9b1959
Fixed ExchangePost info saving
2015-08-01 21:19:47 +02:00
a18d195cfd
Add an ability to cancel making a building ( fixes #509 )
2015-07-30 17:47:26 +02:00
119bc62a7c
Fixed #542
2015-07-29 22:46:52 +02:00
6818e32150
Fixed shadow mapping disable when not supported ( #522 )
2015-07-29 22:30:44 +02:00
ccd55a4319
Fixed reversed Arrow colors ( #537 )
...
A major derp during TraveColor refactoring :P I hope I didn't break anything else
2015-07-29 18:25:36 +02:00
1bc0c891b0
Fixed early profile creation ( #538 )
2015-07-29 18:17:28 +02:00
11b3615df6
Fixed #541
...
I broke it in 86f473ac16
2015-07-29 11:53:54 +02:00
62f75892ae
Merge pull request #544 from vieux/this_not_type
...
fix type highlighting in the CBOT editor
2015-07-29 09:53:34 +02:00
ab6a8eba2b
Possible fix to #482
2015-07-29 09:41:25 +02:00
7c421b7151
fix highlighting
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-29 00:37:56 -07:00
38c64940a5
this is not a type
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-29 00:37:29 -07:00
d7cdcab2c5
Fix flatspace editor hint
2015-07-27 18:49:02 +02:00
a5d579fc31
Add filter parameter to radar editor hint
2015-07-27 18:12:38 +02:00
a5ff361bcc
Replace std::regex with boost::regex
...
std::regex doesn't work in older GCC version (#532 )
2015-07-25 09:13:17 +02:00
4e836fa1d8
Remove unneeded LoadTexture calls
...
This caused reading of directory instead of file and caused crash on MacOSX (#531 )
2015-07-25 08:49:14 +02:00
7e289e7927
Add missing forward declaration in CBotToken.h
2015-07-23 20:48:35 +02:00
dfd73118a6
Added flatspace()
...
Works like space(), but makes sure there is enough flat space for building
2015-07-22 18:26:05 +02:00
59d5545eca
Fixed code pause editor bug ( #527 )
2015-07-22 18:01:24 +02:00
53a4176d29
Fix #528
2015-07-22 17:44:27 +02:00
8e02786dbc
Fix #529
2015-07-22 17:42:02 +02:00
393317fa48
Added researched(), canresearch() and buildingenabled()
...
closes #524
2015-07-22 17:08:51 +02:00
d5d8c0b29f
Removed the need for progfunc() in object.factory()
...
Changes to object.factory():
* The second argument will be automatically interpreted as public function name, file name or program code
* The program starts earlier (when the robot is ready, not when the doors open)
* Refactored to std::string
2015-07-22 16:16:16 +02:00
2e606f4dcb
Fixed warning in CBrain
2015-07-22 13:56:51 +02:00
329393a65a
Added object.velocity, closes #523
2015-07-22 13:46:13 +02:00
abdb4e9782
Moved "object" class management to CScriptFunctions
2015-07-22 13:25:51 +02:00
cba3863d75
Fixed bug with object loading introduced in 083f216529
2015-07-22 12:51:29 +02:00
083f216529
Team object recoloring ( #514 )
2015-07-22 12:45:50 +02:00
0c54e1e8de
Fixed public program save directory
...
Such a dumb mistake. AGAIN.
2015-07-22 12:23:26 +02:00
72b9738eb9
Fixed possible problems when trying to use shadow maps in unsupported configuraions ( #522 )
2015-07-20 22:34:39 +02:00
52a3e0b24f
Fixed minimap texture disappearing on texture settings change
...
Bug mentioned by @erihel in #505
2015-07-20 21:22:34 +02:00
e821aa9cef
Better scaling of shortcut buttons on widescreen resolutions
2015-07-20 21:07:20 +02:00
4741118b61
Added new options to configuration presets
2015-07-20 20:47:44 +02:00
5593f427f6
Proper fix to #94 (finally!!!!)
...
It was so simple, wasn't it?
Additionaly:
* fixed texture recoloring after changing texture settings while simulation is running
* fixed annoying "could not open textures/shadow*.png" messages
* don't ChangeColor() if not in simulation to reduce lag in settings
2015-07-20 19:35:20 +02:00
7b3ae32626
Shadow mapping now disables old shadows
2015-07-20 18:56:15 +02:00
9e7cc0bab5
Renamed original shadows to simple shadows
2015-07-20 18:51:01 +02:00
f03734d17f
Added shadow mapping to settings screen
2015-07-20 18:42:09 +02:00
fce1539888
Made settings unavailable during in simulation setup visible but not editable
2015-07-20 17:19:49 +02:00
572b8ea566
Fixed a crash on exiting from win scene to level list
2015-07-20 17:06:28 +02:00
e2ebcb769e
Added MSAA to settings screen
2015-07-20 16:29:09 +02:00
90756f8b34
Added FilterMode, MipmapLevel and Anisotropy to settings screen
2015-07-20 13:56:45 +02:00
a879e496f5
Removed unused texture quality setting
2015-07-20 12:21:16 +02:00
283676fea1
Fixed CEditValue crash
...
It happened after pressing slider buttons
2015-07-20 12:12:01 +02:00
1c947f9a80
Renamed some phases to more meaningful names
2015-07-19 23:11:41 +02:00
a2f1aa195b
Combined all level list phases into one, removed PHASE_TERM
2015-07-19 23:07:57 +02:00
347654db15
Refactored CBot class "file" to PHYSFS
2015-07-19 22:34:41 +02:00
0554a77813
Refactor reading "object" class in CBot
2015-07-19 21:53:08 +02:00
8c87eedd28
Fixed huge lag on closing settings
...
Introduced in 02c24fbf27
2015-07-19 21:35:55 +02:00
d3c3f47b19
Fixed particle rendering ( #518 )
...
Introduced in 5a1c6d19ff
2015-07-19 21:17:58 +02:00
8ce3a783bb
Fixed EndMissionTake processing order with immediat=1
...
immediat=1 is supposed to work only if this condition AND all conditions above are true
2015-07-19 19:20:55 +02:00
73536290b2
Fix for incorrect compile flags in colobot-lint
2015-07-19 18:11:12 +02:00
963fa15a1c
Fix for #516
2015-07-19 16:43:03 +02:00
264f5dc278
Removed obsolete save directory configuration
...
This was used in one of the CeeBots probably for setting up networked installations in schools. This is now obsolete since now those are only paths relative to main PHYSFS save directory.
2015-07-19 16:05:09 +02:00
ffb387f8af
Changed scene loading to use CPlayerProfile for paths
2015-07-19 16:05:09 +02:00
7dc3e90e41
CPlayerProgress -> CPlayerProfile
2015-07-19 16:05:09 +02:00
02c24fbf27
CProfile -> CConfigFile
2015-07-19 16:05:09 +02:00
644f5b4d7f
Corrected some problems with dynamic shadows
2015-07-19 00:07:59 +02:00
e2691d943c
Fixed #346
...
Thanks @erihel
2015-07-18 23:16:14 +02:00
3e1fc06d6c
CPlayerProgress
...
Extracted most operations on user profile from CRobotMain and CMainDialog to a dedicated class
2015-07-18 23:14:20 +02:00
86f473ac16
Finished support for up to 999 chapters and levels
2015-07-18 19:48:25 +02:00
ea9361fbb4
LevelCategory enum
2015-07-18 19:45:40 +02:00
59a68892c6
Game displays an error message and uses default graphics device when unknown device is selected with -graphics switch
2015-07-18 12:03:33 +02:00
1d69021e94
Potential fix to #511
2015-07-18 02:02:38 +02:00
25eaf8f72f
Add MakeUniqueArray for array types
2015-07-17 20:57:12 +02:00
b3b6435039
Use MakeUnique with level parser classes
2015-07-17 20:38:21 +02:00
35043e04de
Addressed commit comments on a872ea128b
2015-07-17 20:29:53 +02:00
a872ea128b
Add MakeUnique template to avoid use of naked new
2015-07-17 20:06:59 +02:00
2c0baeec35
Fixed potential error in locale logging
...
setlocale() result is valid only until next call to setlocale()
2015-07-17 19:55:02 +02:00
dffeff929e
Removed manual memory management in CBrain in program list
2015-07-17 19:53:17 +02:00
5e44092144
Fixed brain.cpp compilation under MSVC
2015-07-17 17:01:31 +02:00
2ef68cf12d
Fixed Polish translations for Scribbler
2015-07-17 11:59:44 +02:00
14f784646b
Refactored Scribbler recorder to std::string
2015-07-17 11:52:11 +02:00
82247e75fc
Fixed a crash
...
This replaced more than I throught
2015-07-16 22:27:25 +02:00
9e19d8433c
Removed old CBot-related files
2015-07-16 22:17:54 +02:00
aa0946f4ba
Fixed line endings in pathman.cpp
2015-07-16 22:15:22 +02:00
999c35e46b
Fixed Alt+Enter starting not runnable programs, fixes #510
2015-07-16 22:12:44 +02:00
c8f6e8124e
Replaced CLogger::GetInstancePointer() calls with GetLogger()
2015-07-16 22:12:44 +02:00
c115d72d71
More TraceColor refactoring
2015-07-16 22:09:50 +02:00
2b9811d225
Movie lock refactoring
2015-07-16 22:09:50 +02:00
6dcf4dffa6
Refactor CSNDFile -> CSNDFileWrapper
...
This seems more consistent
2015-07-16 21:47:48 +02:00
8ca77f27a1
Extracted CSDLFileHandler from CResourceManager
...
This also possibly fixes some rare error cases (e.g. #439 )
2015-07-16 21:13:38 +02:00
8a72f0a849
Addressed commit comments on a0e0ee3631
2015-07-16 20:09:06 +02:00
a0e0ee3631
Separate shortcut bars for teams
2015-07-16 13:46:40 +02:00
f581d87474
Fix double increment bug in OpenAL channel allocation
2015-07-16 07:16:55 +02:00
c8498548cc
Remove manual memory management in oalsound
...
Plugging a few more memory leaks detected by valgrind
2015-07-15 22:43:30 +02:00
83f3cfa6e0
Fix some memory problems reported by valgrind
...
Also remove some manual memory management
2015-07-15 20:23:21 +02:00
31bc740f4b
Fix focusing issues with controls and cheat console
2015-07-15 19:11:48 +02:00
61ea372e51
Fixed enemy ruins not becoming neutral on destruction
2015-07-15 18:49:15 +02:00
80963f1a2b
Added global magnifyDamage setting
2015-07-15 18:15:26 +02:00
94ea1ff106
DeselList refactoring
...
Make CRobotMain hold selected object history instead of
every object holding some part of it
2015-07-15 18:09:23 +02:00
9af1422589
Fix setting wrong explosion type
2015-07-14 22:14:14 +02:00
730319ba20
Fixed Robby (OBJECT_TOTO) animations
2015-07-14 21:40:07 +02:00
d5da68d59a
Refactor old Get/SetAngle/Zoom -> Get/SetPartRotation/Scale
2015-07-14 21:35:43 +02:00
e1223ff881
Fixed shortcuts behavior
...
It was kinda broken after implementing code battles
Also, fixed overlap of shortcuts bar with cheat console
2015-07-14 21:32:08 +02:00
a1a96c62ab
Fixed system mouse setting
2015-07-14 21:03:40 +02:00
1183ed1980
Refactor old Get/SetPosition -> Get/SetPartPosition
2015-07-14 19:40:39 +02:00
7c229b4e83
Fix reading new model format with CRLF line endings
2015-07-14 19:40:07 +02:00
3f41555a61
Better exception handling in CRobotMain
2015-07-14 18:46:22 +02:00
0d1b97510d
Add exception handling when creating new objects on level loading
2015-07-14 18:28:42 +02:00
62fddd6d4f
Made pendown() trace opaque
2015-07-14 17:38:29 +02:00
5a1c6d19ff
Removed unused particle types
2015-07-14 14:16:19 +02:00
4506a4b8bd
TraceColor enum
2015-07-14 13:53:50 +02:00
fdc0081bb8
Fix checking boolean like int
2015-07-13 23:04:11 +02:00
62fdfc9f92
Refactor ResetCap -> AnimateOnReset
2015-07-13 22:47:11 +02:00
20dbb8320b
Remove unused reset code
2015-07-13 22:46:51 +02:00
4d7de592b4
Merged destructor parsing from tr00per/dev
...
Merge branch 'dev' of https://github.com/tr00per/colobot into dev
2015-07-13 19:24:43 +02:00
78f4749134
Disallow controlling enemy objects from CBot
2015-07-13 18:53:56 +02:00
0e66104829
Hacked CBot engine to get pointers to CObject* in calls to class members
2015-07-13 18:40:13 +02:00
79c131394d
Separate DoneResearch for teams
2015-07-13 18:13:28 +02:00
3479c51bb9
Refactored EnableBuild, EnableResearch and DoneResearch
...
* Moved from global variables to CRobotMain members
* Added functions for accessing the values
* Cleaned up some code related to building objects, BotFactory, ResearchCenter and AutoLab
2015-07-13 17:38:19 +02:00
38a0849e10
Added system mouse option
...
This reverts commit e21853d632
2015-07-13 12:11:11 +02:00
6e404f5aa2
Better mouse scaling on widescreen resolutions
2015-07-13 11:58:52 +02:00
9023aac960
Fix for #504
2015-07-12 20:49:00 +02:00
6c7a79de5a
Fix for #503
2015-07-12 20:44:46 +02:00
e72936c240
Clean up more functions from COldObjectInterface
2015-07-12 20:05:12 +02:00
394f911d7b
Remove unnecessary #include "object/object.h"
2015-07-12 14:23:18 +02:00
3ed8980c46
Make CTask classes use COldObject
2015-07-12 14:22:12 +02:00
45302a3f4e
Make CPhysics and CBrain use COldObject
2015-07-12 14:19:09 +02:00
2c474d7c06
Make CMotion classes use COldObject
2015-07-12 14:01:14 +02:00
16883fcdc4
Make CAuto classes use COldObject
2015-07-12 14:01:07 +02:00
fdb594b9f7
Fix crash when replacing power cell
2015-07-12 13:19:41 +02:00
a1e5812740
Make object deletion safe while iterating through their list
...
Perhaps a bit of a hack but there is no other way to implement this now
2015-07-12 13:16:07 +02:00
4dc40a8853
Fix missing curly braces
2015-07-12 12:38:25 +02:00
37b0d5796d
Fix PNGSaveSurface not closing file sometimes
2015-07-12 12:33:30 +02:00
9a7c1961a4
GetPostion(), GetRotation() and GetScale() in CObject interface
...
Also replace old calls like GetPosition(0) to GetPosition()
2015-07-12 11:05:50 +02:00
57e3e16517
Added check to avoid possible object deletion bug
...
Objects must not be deleted while iterating through their list
2015-07-12 10:34:00 +02:00
fcbbbcb83c
Fix some more CObject interface issues
...
* fix mission 1.3
* fix saving/loading missions
* fix compile warnings
2015-07-12 00:03:57 +02:00
03717e11d4
Added aspect ratio in resolution list ( #501 )
2015-07-11 23:53:25 +02:00
e8582d214c
CStaticObject subclass using new model framework
...
* added reading/writing working version of new model format V3
* added CStaticObject with minial interface intended for
non-interactive static objects like trees
* converted first model, tree0, to new format
2015-07-11 19:52:38 +02:00
639de56e6c
Fixed file.readln() help file
2015-07-11 18:36:36 +02:00
6dcef71802
GlobalSphere -> CameraCollisionSphere refactoring
2015-07-11 13:52:04 +02:00
f4b2f3468d
CPoweredObject interface
2015-07-11 13:38:27 +02:00
36d08e852c
Better splashscreen scaling on widescreen resolutions
2015-07-11 12:57:18 +02:00
0a85fae9b5
Fix crash in appearance menu
2015-07-10 23:58:53 +02:00
9537048964
Cleaned up GetHelpFilename
2015-07-10 23:30:11 +02:00
4c10730f87
CCarrierObject interface
2015-07-10 23:16:55 +02:00
8d5ddd848d
CJostleableObject interface
2015-07-10 23:04:30 +02:00
5d30de0d09
CProgrammableObject interface
2015-07-10 20:46:33 +02:00
17ae31e639
Added 'speed ###' cheat for changing simulation speed to arbitrary value
2015-07-10 20:45:50 +02:00
24db675d3f
Added x6 speed option
2015-07-10 20:17:00 +02:00
0dfbb00491
Remove unused variable
2015-07-10 19:55:18 +02:00
93479af188
CTransportableObject interface
2015-07-10 19:51:49 +02:00
52f809b8bb
Removed cmdline limit
2015-07-10 13:40:29 +02:00
b84130e067
Fix not updating track texture mapping
2015-07-10 12:22:00 +02:00
ad08d50bea
Renamed some CAuto and CMotion classes
2015-07-10 12:18:21 +02:00
26619e3f88
Removed old level parser functions (cmdtoken.cpp)
2015-07-10 11:51:59 +02:00
e6c6b77be2
Removed old Teen objects
...
The models for them were removed a looong time ago, but the code was left for no reason
2015-07-10 11:37:32 +02:00
c63efeca46
Fixed EndMissionTake conditions (again)
2015-07-10 10:45:30 +02:00
d3c3a51ede
Don't open joystick if it's not enabled in ChangeJoystick
2015-07-10 10:28:04 +02:00
20a367783b
Added joystick settings in colobot.ini
2015-07-10 10:25:31 +02:00
7e41e9fe23
Refactored keybindings storage
2015-07-10 10:11:40 +02:00
3d5bc5c563
Fixed unused variable warnings
2015-07-10 10:11:40 +02:00
b0ac2f8326
Refactor CObject interface related to crash spheres
2015-07-10 09:38:53 +02:00
5a68558f4c
Implemented basic joystick selection
...
You can select joystick in the config file, there is still no GUI. By default, the first available joystick is used.
issue #171
2015-07-10 00:05:43 +02:00
bd4a661a06
Made autosave timer independent from simulation speed, closes #485
2015-07-09 23:23:38 +02:00
b7c3a8a30b
Don't hardcode script4Runnable=in exercises, closes #493
2015-07-09 23:09:08 +02:00
978fc8f1fb
Remove program limit in scene files, closes #494
2015-07-09 23:01:18 +02:00
c585922a45
Use boost::lexical_cast instead of std::to_string
2015-07-09 22:53:58 +02:00
93e950584a
Refactor model-related code
...
* refactored model loading code based on code from dev-models
* support new model format V2 (without LOD levels)
* removed LOD levels support in CEngine and from model files
* preparations for new model format V3:
- support for multiple meshes in one model file
- support for saving crash spheres and shadow spots
- removed all direct dependencies on CEngine enum values
- quantized model rendering states to new flags and enums
2015-07-09 21:37:04 +02:00
9b232ee3f5
Sound enum refactoring
...
* rename Sound -> SoundType
* add parsing string to SoundType
2015-07-09 21:32:25 +02:00
c84ce92a86
Fixed F12 debug screen background
2015-07-09 18:50:11 +02:00
dae7cdf229
Fixed build() particles
2015-07-09 18:45:52 +02:00
7c20bb4bf6
Fixed counting of nautral objects in EndMissionTake
2015-07-09 18:28:09 +02:00
ce760aa9a3
Added All back to ObjectType parser
...
I throught this was unused, but it's actually used in NewScript
2015-07-08 20:21:30 +02:00
1361473358
Renamed Mission -> Level, MissionController -> LevelController
...
As suggested by @CoLoRaptor
2015-07-08 20:20:46 +02:00
c18b5daf57
Don't use binary literals in radar filters
...
@tomaszkax86 noticed that this syntax is valid only in C++14 and Visual Studio 2013 doesn't support that
2015-07-08 19:05:11 +02:00
b75ab7d8f6
Fixed radar() detecting neutral objects as enemies
2015-07-07 22:27:44 +02:00
b0b313f707
Fix for issue #492
2015-07-07 21:36:37 +02:00
a6ccd7f270
Added TeamName
2015-07-07 21:25:44 +02:00
5da4adad41
Added Any constant in CBot
2015-07-07 19:01:18 +02:00
79c5fabfe6
Support for team filters in radar()
2015-07-07 18:54:36 +02:00
9a873c9bea
Added object.team in CBot
2015-07-07 18:11:28 +02:00
f94519b240
Don't finish mission if there are no win conditions
...
This replaces the old EndMissionNever hack
2015-07-07 18:04:17 +02:00
a3726799c4
Added support for teams in EndMissionTake
...
Also fixed a bug in previous commit that caused lost= conditions to be skipped if previous min= max= condition was not met
2015-07-07 17:48:49 +02:00
a32efc09a2
Refactored EndMissionTake and AudioChange
2015-07-07 16:17:19 +02:00
958ef43c1e
Address review remarks, fix names and errors in code.
2015-07-06 22:00:33 +03:00
b3c2d2c450
Set CBotVar::m_binit type to specific enum instead of plain int.
2015-07-05 23:39:55 +03:00
f1684f85be
Introduce new CObject base class and mixin class framework
2015-07-02 23:50:50 +02:00
80d93c0fea
Fix comment changed by mistake
2015-06-30 18:47:35 +02:00
f6bc8f94bf
Rename fret/truck to cargo/transporter
2015-06-29 23:11:02 +02:00
b00d62b9bb
Further cleaning of CObject interface
...
* remove unused functions/members
* delegate some functions to other objects
* change some names to be more meaningful
2015-06-29 22:46:13 +02:00
c7ccb29d6a
Removed spoiler from tooltip in options menu ( fixes #489 )
2015-06-28 23:07:42 +02:00
ac291f5bea
Fix for issue #488
2015-06-28 21:05:12 +02:00
f871ba4729
Create CExchangePost subclass
2015-06-27 23:22:55 +02:00
1ccb807091
Fix for issues #486 and #487
2015-06-27 18:06:49 +02:00
78e09c757d
Basic support for teams and code battle missions
2015-06-26 22:07:55 +02:00
2a672482a5
Vault now locks only objects created during level loading ( fixed #164 )
2015-06-26 20:19:16 +02:00
195667ab2c
Potential fix for rendering problems in OpenGL 2.1 engine under Linux
2015-06-26 19:55:46 +02:00
4fc8364136
Fixed Destroyer object destruction ( fixes #308 )
2015-06-26 19:20:16 +02:00
2509f99776
Fixed program arguments not being parsed on restart ( #483 )
2015-06-26 18:51:39 +02:00
efd0b2b28f
Corrected energy cell's angle when created with robot
2015-06-26 18:07:54 +02:00
ba3c049077
Corrected problem with loading level background images
2015-06-26 14:32:44 +02:00
88ec9aaae3
Drop GCC 4.6 support
2015-06-26 00:24:32 +02:00
7e21d3bd79
Get rid of some more manual memory management
2015-06-26 00:24:05 +02:00
67be6fca2a
CObject interface cleanup
...
* remove unused functions and members
* make protected functions used only locally or in factory
* rename some functions to be more meaningful
* refactor some enums to enum classes
2015-06-25 20:43:50 +02:00
7814c0c7bd
Remove unused field "material" from CObject class in CBot
2015-06-25 18:07:48 +02:00
37e2f24fbc
Corrected small rendering problem
2015-06-25 11:47:42 +02:00
3cc2857372
Small corrections in MSAA implementation
2015-06-22 23:42:01 +02:00
90bf51ba54
Possible fix for #458
2015-06-22 22:53:55 +02:00
8806d1708d
Proper CAuto, CBrain, CMotion, CPhysics, CPyro lifetime management
...
* change manual memory manament to std::unique_ptr
* create CPyroManager
* finally get rid of CInstanceManager
2015-06-22 21:58:58 +02:00
7ae308cc75
Fix saving addresses instead of data in user profile
2015-06-22 21:25:00 +02:00
f2318803e5
Added Multisample anti-aliasing (MSAA)
2015-06-22 00:56:47 +02:00
02ffdcfe23
Refactor level parser code
...
* replace manual memory management with std::unique_ptr
* remove unnecessary dynamic allocations
* make coding style consistent
2015-06-21 20:59:23 +02:00
5f1d3c21d4
Fix some more warnings reported by Clang
2015-06-21 19:46:01 +02:00
2d623b4427
Fix introduced compilation warnings
2015-06-21 19:38:07 +02:00
dabfdf1ea0
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2015-06-21 18:51:24 +02:00
7d57ec634e
Refactored framebuffer implementations
2015-06-21 18:48:31 +02:00
2513052260
Fix setting position of power cells
2015-06-21 16:29:46 +02:00
304542afe2
Some syntax sugar for iterating through all objects
2015-06-21 16:22:09 +02:00
0c9a9bce98
Proper CObject lifetime management
...
CObjectManager is now the only class responsible for storing CObjects
2015-06-21 15:13:55 +02:00
fed67e6640
Rename objman.h/cpp -> object_manger.h/cpp
2015-06-20 20:02:40 +02:00
94851c2694
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2015-06-20 20:02:11 +02:00
ec3069eea7
Defaulted shadow color value to 0.5
2015-06-20 20:02:06 +02:00
f9b09d08f0
Create CObjectFactory
...
* move functions creating objects to new class CObjectFactory
* replace calls to CObject::Create*() with CObjectManager::Create()
* move creation/deletion of some objects to better places
* make CModelManager non-singleton
* clean up some code in changed functions
2015-06-20 19:37:25 +02:00
74a31c9fb4
Corrected compilation errors on Linux builds
2015-06-16 19:30:35 +02:00
ff44637d49
Removed VBO override switch and some unnecessary code
2015-06-16 18:00:42 +02:00
26ec927b37
Corrected compilation errors and warning
2015-06-15 20:27:44 +02:00
012eb10e19
Added automatic graphics detection (-graphics auto)
2015-06-15 20:20:03 +02:00
a880210b3d
Added ShadowRange option
2015-06-15 18:41:31 +02:00
6434ff55dd
Ending splashscreen enhancement ( fixes #472 )
2015-06-05 20:20:06 +02:00
ae29ebead3
Defaulted shadow color to 0.5 in OpenGL 2.1 engine
2015-06-05 19:48:28 +02:00
66d865942c
Added OpenGL 2.1 shaders for per-pixel lighting
2015-06-02 16:55:03 +02:00
d477caed3e
Second attempt at correcting compilation error
2015-06-01 18:41:14 +02:00
7acca9feb8
Corrected compilation error and unsigned comparison warnings
2015-06-01 17:45:51 +02:00
d112971c3e
Corrected shadow mapping and added experimental self-shadowing
2015-06-01 17:22:49 +02:00
a0c56f54cb
Shader and buffer optimizations
2015-06-01 17:21:10 +02:00
d33ddae15a
Added warnings and information what shader files are not available
2015-05-29 12:39:14 +02:00
f69dfe3421
shield() rejects incorrect robots that try to invoke it (should fix #475 )
2015-05-28 14:03:05 +02:00
e1a0f5b1c7
Added OpenGL 2.1 engine
2015-05-27 22:12:02 +02:00
08bf066f78
Added shadow color setting
2015-05-27 21:58:32 +02:00
55b4e73a7a
Corrected a problem with strmid()
2015-05-22 20:34:35 +02:00
fa67e815b8
Implemented per-vertex lighting and set it as default in OpenGL 3.3 engine
2015-05-22 18:53:51 +02:00
8abdd4b740
Improved shadow mapping
2015-05-21 18:18:46 +02:00
f67c01e5e7
Added proper render to texture support
2015-05-21 18:03:17 +02:00
a045bf3830
Added shadow ambient support
2015-05-21 16:47:24 +02:00
b1e8341475
Move OpenGL 3.3 shaders to main repository
2015-05-20 23:30:46 +02:00
619ac3cf8d
Fixed glew linking problem on MXE
2015-05-19 23:03:32 +02:00
35ce6c228a
Fix gcc warning
2015-05-19 23:03:32 +02:00
361a8c4ddd
Another fix to warning
2015-05-19 17:24:07 +02:00
3a1dffd8df
Fixing some warnings
2015-05-19 17:15:08 +02:00
df8223700b
Corrected compilation error
2015-05-19 16:26:41 +02:00
933609967a
Added OpenGL 3.3 graphics implementation
2015-05-19 14:29:31 +02:00
d210dcf70e
Implemented graceful degradation of shadow quality when not enough texture units are available
2015-05-15 10:12:35 +02:00
e747443312
Increased quality of dynamic shadows
2015-05-14 15:31:57 +02:00
0ddfdebab3
Remove unused system utils functions
2015-05-13 20:52:19 +02:00
ccaac2c544
Rewrite unit tests to use HippoMocks
2015-05-13 00:52:18 +02:00
03244ecdfd
Corrected assertion error when changing offscreen rendering
2015-05-12 20:20:57 +02:00
2665847c41
Added support for offscreen rendering and high resolution shadow maps
2015-05-12 13:09:31 +02:00
b033e35385
Transparent textures no longer cast shadows in transparent parts
2015-05-11 18:00:02 +02:00
0b2f00530b
Added experimental support for dynamic shadows (shadow mapping)
2015-05-11 15:21:17 +02:00
1e3c2cc2df
Increased the height of text area for displaying authors.txt (should fix #465 )
2015-05-09 20:36:32 +02:00
c945afafc8
Added bounds checking to CBotString type methods (should fix issue #429 )
2015-05-07 13:53:53 +02:00
619b3f2e45
Fixes recent mistake (- instead of +)
2015-05-07 13:05:20 +02:00
3164e7256e
Changed terrain UV mapping ( fixes #306 for OpenGL engine, will cause similar problem on Direct3D)
2015-05-07 12:58:05 +02:00
c28e1f6150
Added CBot functions for rounding: floor(), ceil(), round(), and trunc()
2015-05-06 23:29:55 +02:00
1c655aeda0
Corrected the problem with pendown() hanging the game ( fixes #203 )
2015-05-06 21:59:29 +02:00
1db9d8bdca
Changed CBot file handling, potentially solved problems with 64-bit executables
2015-05-06 20:39:09 +02:00
d3b052f19b
Implemented trilinear filtering, mipmap level setting and anisotropic filtering
2015-05-06 17:55:10 +02:00
05bf5be6f4
Added atan2() function to CBot
2015-05-06 13:02:44 +02:00
6c87144ae8
Merge branch 'ManuelBlanc-dev-osx' into dev
2015-04-28 15:18:37 -07:00
4c8127c6ec
Fix two bugs uncovered by MSVC
2015-04-27 20:04:01 +02:00
bca9a019ae
Suppress some MSVC warnings
2015-04-27 20:02:22 +02:00
d003247120
Provide usleep() in CSystemUtils interface
2015-04-27 20:02:22 +02:00
dec12fb977
Use wingetopt library on MSVC
2015-04-27 18:17:03 +02:00
544e513148
Minor MSVC compilation fixes
2015-04-27 18:17:03 +02:00
fcd904faf7
Fix non-integer expressions in #if
2015-04-27 18:17:03 +02:00
3dce58c0fa
Replace override and noexcept with macros
2015-04-27 18:07:42 +02:00
d23170aaf1
Fixed monospace CBot editor font ( closes #464 )
2015-04-23 21:01:04 +02:00
87ccb759e6
Allow Tech to use build(), closes #461
2015-04-18 11:40:42 +02:00
c481906242
Added nullptr checks in CPyro, should fix #462
2015-04-18 11:33:39 +02:00
df4cb110b5
Made example programs not directly runnable ( #450 )
2015-04-17 22:39:57 +02:00
45edb29de4
Fixed event management in settings, again
2015-04-17 22:02:10 +02:00
e21853d632
Removed old, unused mouse shadow option
2015-04-17 21:54:03 +02:00
c32e552368
Fixed event management in settings phases, fixes #452
2015-04-17 21:47:03 +02:00
be74b61ad3
Fixed Vault not unlocking vehicle ( #459 )
2015-04-17 21:28:30 +02:00
6d88dd5957
Allow autosave only in missions, free game and userlevels ( fixes #457 )
2015-04-17 21:11:07 +02:00
802aaad1a4
Should fix issue #456
2015-04-17 21:02:26 +02:00
9bc7c47d77
Fixed saving readonly attribute ( #454 )
2015-04-07 13:27:11 +02:00
a4bf622053
Fixed starting programs from saved games ( #455 )
2015-04-07 13:18:34 +02:00
ed0850ddb6
Fixed buttons "eating" other characters in SatCom
2015-04-07 12:27:31 +02:00
efe04be1c2
Implemented button rendering in SatCom ( #232 )
...
Finally!
2015-04-07 12:06:43 +02:00
73a12ea7db
Changed default autosave interval from 15 to 5 minutes ( #451 )
2015-04-06 22:04:23 +02:00
fa13d2bb72
Fixed compilation on old versions of GCC
...
It's the first time I saw gcc complain about something being not implemented IN THE COMPILER ITSELF o.O
In file included from /home/travis/build/colobot/colobot/src/object/auto/autoegg.cpp:25:0:
/home/travis/build/colobot/colobot/src/object/brain.h:81:28: sorry, unimplemented: non-static data member initializers
/home/travis/build/colobot/colobot/src/object/brain.h:81:28: error: ISO C++ forbids in-class initialization of non-const static member ‘readOnly’
2015-04-06 19:22:26 +02:00
2f5d4e3b2f
Fixed cheat console in main menu
2015-04-06 17:23:18 +02:00
1dd3a4d57e
Fixed loading challenge solutions and made them read-only
2015-04-06 17:00:22 +02:00
66ea5fd92b
Fixed NewScript
2015-04-06 16:41:05 +02:00
1a8bb9c0fb
Marked programs from SatCom with a star
2015-04-06 16:21:19 +02:00
58016c6c69
Made programs from SatCom read-only; added program cloning
2015-04-06 16:07:49 +02:00
0ce72bdce0
ovf's OCD
...
> ovf: krzys_h: i'm sorry, your last commit triggered a random ocd fit. http://vpaste.net/S6u62
> ovf: (you don't need to apply this, i already feel better now)
2015-03-29 20:30:29 +02:00
6844b2170f
Fixed occasional crash in CRobotMain::DeleteAllObjects
2015-03-29 15:50:47 +02:00
1b18b145cc
Changed default of countTransported to true
...
This causes failure conditions to trigger in some exercises
#412
2015-03-29 15:38:50 +02:00
30f7075f4e
Fixed program selection shortcuts
2015-03-29 14:31:43 +02:00
a3ae7802a2
New scripts interface, removed script limit
...
This is a big change in game structure and requires more testing!
2015-03-29 14:21:02 +02:00
72196b252c
Made powermin and powermax work with cells that are not in bot's power slot
2015-03-28 12:21:56 +01:00
14068ce54b
Don't count transported items by default ( #412 )
2015-03-28 12:19:40 +01:00
fd17e104ed
Removed mission file versioning
...
We've decided there is no need to keep combatibility with original Colobot.
Closes #206
2015-03-28 11:23:32 +01:00
498a5ca4cd
Reapplied temporary fix for #94
2015-03-22 17:40:08 +01:00
a0097a0e53
Copying info about selected object to clipboard ( #391 )
2015-03-22 16:32:21 +01:00
78795c4b44
Alt+tab minimize to taskbar ( #391 , fixes #329 )
2015-03-22 16:10:32 +01:00
56d66b3417
Added bots/buildings switch shortcut ( #391 )
2015-03-22 16:02:05 +01:00
23c734c3c1
Implemented shortcuts for starting programs ( #391 )
2015-03-22 15:49:33 +01:00
7e3e1c00d2
Made sniffer flatground button available only with EnableBuild
2015-03-22 14:56:35 +01:00
7578f3c118
Made bf55691e44 work with new CObjectManager
2015-03-22 14:50:54 +01:00
bf55691e44
Issue #399 : Sniffer can delete mark and probe ground
2015-03-22 14:40:19 +01:00
8cc74002cf
Added CLevelParser in one more place
...
Not sure how I missed that earlier
2015-03-22 14:29:03 +01:00
33fcdbbef5
Removed unused CRobotMain::BuildScenePath
2015-03-22 14:12:41 +01:00
f9bdd32812
Fixed USERPROFILE encoding, final fix to #414
2015-03-22 14:07:38 +01:00
d2d0886b76
Implemented %cat%
...
and renamed BuildSceneName to BuildScenePath
2015-03-22 13:51:14 +01:00
47ed73247b
Use std::wstring in boost::filesystem calls on Windows, fixes #414
2015-03-22 13:36:23 +01:00
83599238d1
Added workaround for argv encoding on Windows
...
First part of fixing #414
2015-03-22 13:11:00 +01:00
bb16c6d97c
Fixed updating C locale after exception in C++ locale, should finish fixing #445
2015-03-21 20:14:41 +01:00
9c20f275a0
Fixed MXE builds after 87cf056158
...
On MXE, setlocale is a macro...
2015-03-21 17:34:18 +01:00
2b21f5f40c
Fixed another Travis problem ( #393 )
2015-03-21 17:29:17 +01:00
c3b9c3ce4d
Changed std::vector default value, should fix compilation errors on GCC 4.6
...
Fixes #393
2015-03-21 17:21:26 +01:00
87cf056158
Modified locale setting code
...
I'm doing my best to fix #445 . At least shouldn't crash anymore.
Needs more testing.
2015-03-21 17:12:05 +01:00
a60a4590b2
Better error logging in CResourceManager for further debugging #414
2015-03-19 19:55:22 +01:00
f43acaa943
Store resolution as value instead of id on the list, closes #417
...
Also fixed a bug where after starting the game for the first time the "Apply changes" button would behave like you selected highest resolution possible (while the game is running at 800x600)
2015-03-19 19:46:37 +01:00
bb9e490316
Removed unused Copy function
...
It's not used by the game and causes incombatibility with some version of Boost.
Should fix Travis build, see issue #393
2015-03-18 21:45:28 +01:00
f0d32125e9
Don't crash when there are too many images in SatCom
...
This limit will be removed during UI refactoring in the future.
Also, I've increased the limit to 100 lines.
issue #411
2015-03-18 21:39:35 +01:00
e179847358
Fixed remapping virtual keys, closes #415
2015-03-18 21:29:33 +01:00
8f78dc81e7
Whoops, the file didn't save
2015-03-18 21:12:49 +01:00
92ea770121
Better fix for numerical enter (issue #427 )
...
Should now work everywhere, not only in the editor.
2015-03-18 21:10:47 +01:00
f582b58c2e
Fixed "files" directory creation
...
Related to #444
2015-03-08 16:21:09 +01:00
3c2b0a8206
Probably fixed null CObject* instances in object list, should fix #440 , #441 , #442 and #443
2015-03-08 16:14:45 +01:00
6d85db5314
Fixed weird Converter behaviour, closes #431
2015-03-08 16:05:14 +01:00
f54b46b61d
CPathManager
...
* Moved path management from CApplication to CPathManager
* Moved %lvl% replacements from CParserParam to CPathManager
* Added %lvl% support in produce(), closes #426
2015-03-08 15:22:21 +01:00
03bb000e82
Revert "Potential fix to Travis build fails"
...
This reverts commit ed0e5dfef5
2015-01-31 11:55:37 +01:00
ed0e5dfef5
Potential fix to Travis build fails
2015-01-30 22:13:07 +01:00
cb95f9947c
Corrected the problem where every key acted as Enter
2015-01-27 18:18:27 +01:00
dfda70af07
Numerical Enter key should now act the same as normal Enter ( #427 )
2015-01-18 12:47:37 +01:00
0ee86c3d15
Fixed loading scripts in produce() ( #418 )
2015-01-08 19:21:02 +01:00
0231c2359a
Fixed #425
2015-01-08 19:01:56 +01:00
61b186343f
Fixed #424 , #423 and probably #421
2015-01-08 18:56:26 +01:00
986cf98aaf
CController - entry point into CRobotMain and CMainDialog
2014-12-22 10:36:36 +01:00
4fef3af9ef
Moved all CObject management from CInstanceManager to CObjectManager
2014-12-21 19:04:31 +01:00
e8a0dc8ddb
CObjectManager::Radar
2014-12-20 20:36:09 +01:00
c5b6faea05
Refactored CObjectManager to std::map
2014-12-20 19:09:53 +01:00
58bc01c82c
Removed unused script/dd.cpp
2014-12-20 18:48:44 +01:00
07c651bd0a
Moved all CBot functions into a separate class
2014-12-20 18:45:46 +01:00
af9960d41e
Fixed saving files from CBot
2014-12-20 18:20:59 +01:00
ce27a80caa
Moved "file" CBot class (CRobotMain -> CScript)
2014-12-20 18:03:49 +01:00
fb07691790
New speed keybindings
2014-12-14 17:05:28 +01:00
be0f4c2ffe
Refactored keybindings UI and added some keybindings
2014-12-14 16:54:32 +01:00
56393f4278
Modified CMake to search the path for libintl headers
...
Conflicts:
src/CMakeLists.txt
2014-12-12 01:17:10 +01:00
7356f67b78
Shortcuts now use the meta key on OSX
2014-12-12 01:17:05 +01:00
7bb12511d9
Implemented the OSX clipboard using the AppKit API
...
The X11 dependency is no longer needed on OSX, and has been removed
2014-12-11 23:31:41 +01:00
5948a9e9d8
Show game version in logs, closes #413
2014-12-11 19:59:24 +01:00
601a58ea31
Nicer formatting of key names
2014-12-11 19:48:06 +01:00
eec6041104
Refactoring of input and input bindings, CInput class
2014-12-11 19:14:33 +01:00
e3e551de22
Fixed loading sound 0
2014-12-11 19:00:02 +01:00
40428bb89b
Merge pull request #409 from piotrwalkusz1/dev
...
Issue #396
2014-12-10 20:35:23 +01:00
f30592bf56
Better fix for #94
2014-11-22 13:30:50 +01:00
7c8a31c074
#257 Destructor is parsed and (by some magic) already used
2014-11-19 10:02:27 +01:00
f8fe681dc5
Issue #396
2014-11-18 20:07:00 +01:00
0ce8f7ad90
Fix #395 issue and fix read function
2014-11-15 13:45:05 +01:00
ec8b2cfd81
Fix issue #394
2014-11-14 20:23:52 +01:00
d3df4a157a
Undo
2014-11-12 23:32:26 +01:00
3201bcd8f4
Delete unnecessary info in documentation
2014-11-12 23:21:47 +01:00
54098bcd55
Fixed updating "Apply" button after changing fullscreen, closes #392
2014-11-12 17:06:29 +01:00
e0448825a8
Fixed reading cmdline=, closes #388
2014-11-12 17:01:31 +01:00
fd28dfd9bb
Fixed Apperance textures
...
Issue #94
I beleive there is a better fix, I just can't find it because I don't fully understand the graphics engine.
I'll leave this issue open for @piotrdz to take a look at when he comes back
2014-11-12 16:47:40 +01:00
675ec3a222
Fixed bug in saving list of finished missions, closes #390
2014-11-12 15:11:42 +01:00
c509bc1709
Fixed PowerCell/Tracked animations ( closes #389 )
2014-11-12 15:05:02 +01:00
7b03479a85
Fixed #386
2014-11-12 10:07:25 +01:00
80c9b35ce2
Close CBot editor by CTRL+Action key (default ENTER), closes #383
2014-11-11 17:42:19 +01:00
490e6fe2d6
Always show CBot documentation in SatCom, fixes #382
2014-11-11 17:22:21 +01:00
a50da4f5de
Loading texturesfrom objects/ subdirectory
...
Closes #381
2014-11-11 15:52:08 +01:00
fa4c70d1fe
Resetting fields in scene to defaults
...
Fixes #218
2014-11-11 15:38:11 +01:00
dbdaecd1e8
Fixed texture recoloring reset
...
Partially fixes #218
2014-11-11 15:32:38 +01:00
48ca5b5663
Removed info about CD in background music tooltip; removed unused 3D sound translation
2014-11-11 14:59:56 +01:00
fa2bd7901a
Translations for autosave
2014-11-11 14:56:19 +01:00
a1fe9c8d7f
Implemented autosave ( #292 )
2014-11-11 14:50:44 +01:00
b8103963c3
Sorting saved games list ( #380 )
2014-11-11 12:08:19 +01:00
afa0061364
Reset save filename if exception is thrown while loading
2014-11-10 22:50:00 +01:00
5cd45fbe17
Fixed saving aParamString in CAutoEgg
2014-11-10 22:45:06 +01:00
abcbaa1902
Fixed running programs with long names ( #379 )
2014-11-10 22:42:05 +01:00
462f0ce9d7
Removed unused PHYSFS conversions
2014-11-10 22:19:52 +01:00
76ca4fc6ae
Fixed isnan() on MXE
2014-11-10 22:17:41 +01:00
97e76e6303
Better handling of filenames longer than maximum allowed
...
#354
2014-11-10 22:07:51 +01:00
b698c40abf
Fixed saving Shielder's shield ( #365 )
2014-11-10 21:26:02 +01:00
ef35a3a2ef
Custom path to SecondTexture, closes #370
2014-11-10 20:46:39 +01:00
643d1ec46a
Fixed scenetest mode
2014-11-10 20:23:18 +01:00
fca746fdb4
Merge branch 'dev-physfs-save' into dev
2014-11-10 19:39:56 +01:00
a952e0ec54
Fixed DefenseTower empty cell detection ( #378 )
2014-11-10 19:38:49 +01:00
krzys-h