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