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
krzys-h