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
82e06bfd8e
Fixed wrong program being highlighted after loading ( closes #616 )
2015-08-31 11:37:02 +02:00
934d97a801
Fixed #581 for aliens
2015-08-25 17:25:53 +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
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
d9b680bdcf
Removed Windows restart on resolution change workaround
2015-08-24 19:47:48 +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
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
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
b086c52b14
Render some things in code instead of using effect03.png texture (in CEdit)
2015-08-18 21:04:00 +02:00
28925106e4
Cleaned up some long lists of ifs
2015-08-18 12:29: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
63b4849275
Fixed #561
2015-08-17 21:57:53 +02:00
1059ae37c1
Shielder subclass
2015-08-17 14:06:31 +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
e11d2ec33e
Refactor object dying status and GetActive
2015-08-16 20:24:48 +02:00
3f303ea824
Removed some unneccessary includes
2015-08-16 16:35:39 +02:00
0986a200d7
Fixed CBot editor being inaccessible while running program
2015-08-16 16:03:36 +02:00
d703eb7165
Compile fixes for MSVC2013
2015-08-16 00:39:08 +02:00
ceae617949
Fixed user programs disappearing after swapping them with level programs
2015-08-15 23:47:51 +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
856c5baa0e
Removed CTaskManager
2015-08-15 20:30:15 +02:00
9a15db1bea
Split global.h
2015-08-15 14:02:07 +02:00
0ec3f29e68
Fixed win/lost scene music cached at startup not being ever used
2015-08-14 19:44:44 +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
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
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
26e4ec0ae2
Add more missing includes and forward declarations
2015-08-13 22:49:05 +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
60797f72d3
Removed some old, unused code
2015-08-12 17:25:41 +02:00
63d83185b5
Move GetTooltipText and Get/SetLock to CObject; remove Get/SetEnable
2015-08-12 00:16:57 +02:00
571cc96523
Add proper initializers and remove manual memory management in ui classes
2015-08-11 23:15:32 +02:00
364f87c49b
CPowerContainerObject interface
2015-08-11 22:51:16 +02:00
15c1c7ee03
CMovableObject, CControllableObject
2015-08-10 23:21:15 +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
3a5f618f65
CTaskExecutorObject interface; some general task and CBrain cleanup
2015-08-10 13:46:39 +02:00
2f156f022e
Fixed screen_level_list.cpp warnings
2015-08-09 23:21:08 +02:00
115e18cc85
Fixed version display being invisible during loading
2015-08-09 22:53:59 +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
bb3fc63e03
More details on terrain loading
2015-08-07 23:40:38 +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
0d00952b10
Rename text.png to effect03.png
2015-08-06 22:41:54 +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
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
711643b454
Refactored CMainDialog
2015-08-06 16:02:59 +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
b20d589c87
Check available texture units in shadow mapping settings
2015-08-06 13:47:42 +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
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
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
95a438bcc6
Fixed cheat console and particles during loading
2015-08-05 22:54:13 +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
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
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
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
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
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
119bc62a7c
Fixed #542
2015-07-29 22:46:52 +02:00
1bc0c891b0
Fixed early profile creation ( #538 )
2015-07-29 18:17:28 +02:00
ab6a8eba2b
Possible fix to #482
2015-07-29 09:41:25 +02:00
59d5545eca
Fixed code pause editor bug ( #527 )
2015-07-22 18:01:24 +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
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
7b3ae32626
Shadow mapping now disables old shadows
2015-07-20 18:56:15 +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
8c87eedd28
Fixed huge lag on closing settings
...
Introduced in 02c24fbf27
2015-07-19 21:35:55 +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
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
b3b6435039
Use MakeUnique with level parser classes
2015-07-17 20:38:21 +02:00
c8f6e8124e
Replaced CLogger::GetInstancePointer() calls with GetLogger()
2015-07-16 22:12:44 +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
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
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
20dbb8320b
Remove unused reset code
2015-07-13 22:46:51 +02:00
38a0849e10
Added system mouse option
...
This reverts commit e21853d632
2015-07-13 12:11:11 +02:00
394f911d7b
Remove unnecessary #include "object/object.h"
2015-07-12 14:23:18 +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
03717e11d4
Added aspect ratio in resolution list ( #501 )
2015-07-11 23:53:25 +02:00
36d08e852c
Better splashscreen scaling on widescreen resolutions
2015-07-11 12:57:18 +02:00
93479af188
CTransportableObject interface
2015-07-10 19:51:49 +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
7e41e9fe23
Refactored keybindings storage
2015-07-10 10:11:40 +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
9b232ee3f5
Sound enum refactoring
...
* rename Sound -> SoundType
* add parsing string to SoundType
2015-07-09 21:32:25 +02:00
f1684f85be
Introduce new CObject base class and mixin class framework
2015-07-02 23:50:50 +02:00
f6bc8f94bf
Rename fret/truck to cargo/transporter
2015-06-29 23:11:02 +02:00
78e09c757d
Basic support for teams and code battle missions
2015-06-26 22:07:55 +02:00
88ec9aaae3
Drop GCC 4.6 support
2015-06-26 00:24:32 +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
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
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
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
74a31c9fb4
Corrected compilation errors on Linux builds
2015-06-16 19:30:35 +02:00
a880210b3d
Added ShadowRange option
2015-06-15 18:41:31 +02:00
1e3c2cc2df
Increased the height of text area for displaying authors.txt (should fix #465 )
2015-05-09 20:36:32 +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
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
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
efe04be1c2
Implemented button rendering in SatCom ( #232 )
...
Finally!
2015-04-07 12:06:43 +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
58016c6c69
Made programs from SatCom read-only; added program cloning
2015-04-06 16:07:49 +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
23c734c3c1
Implemented shortcuts for starting programs ( #391 )
2015-03-22 15:49:33 +01:00
8cc74002cf
Added CLevelParser in one more place
...
Not sure how I missed that earlier
2015-03-22 14:29:03 +01:00
d2d0886b76
Implemented %cat%
...
and renamed BuildSceneName to BuildScenePath
2015-03-22 13:51:14 +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
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
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
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
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
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
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
7356f67b78
Shortcuts now use the meta key on OSX
2014-12-12 01:17:05 +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
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
54098bcd55
Fixed updating "Apply" button after changing fullscreen, closes #392
2014-11-12 17:06:29 +01:00
675ec3a222
Fixed bug in saving list of finished missions, closes #390
2014-11-12 15:11:42 +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
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
97e76e6303
Better handling of filenames longer than maximum allowed
...
#354
2014-11-10 22:07:51 +01:00
759b9871bb
Removed CMainDialog::GetPHYSFSSavegameDir()
...
CMainDialog is also finished.
This is last commit for saving with PHYSFS, closes issue #334
2014-11-10 19:26:36 +01:00
aeaea87d0d
Saving/loading list of finished missions via PHYSFS
2014-11-10 19:23:51 +01:00
fc5fcc7e61
Loading/saving apperance via PHYSFS
2014-11-10 19:02:43 +01:00
4994965201
Removed CRobotMain::GetPHYSFSSavegameDir()
...
Everything in CRobotMain uses PHYSFS now
2014-11-10 19:02:07 +01:00
c330bcac6d
PHYSFS in CStudio
2014-11-10 18:17:13 +01:00
5bb740696f
Fixed screenshot saving
2014-11-10 17:50:36 +01:00
fc16c36a45
Use PHYSFS in listing save files
...
Revert "Don't use physfs in saving code for now"
This reverts commit 3b1cfdbfb4
2014-11-10 17:37:34 +01:00
3dade17f89
Level saving through CLevelParser
2014-11-10 14:27:42 +01:00
6d152d5aee
Fixed console spam when music files are not installed
...
Closes #359
2014-11-02 13:35:00 +01:00
11a8742079
#335 , #348 , #352
...
I don't know what I'm doing anymore :/
I should set up dev envrioment on Windows so I don't have to commit every time I want somebody on Windows to test if my changes work
2014-11-01 14:02:39 +01:00
71577b7b0a
Fixed #335 and #348
2014-10-31 20:40:19 +01:00
c1f931c8ee
Added some debug stuff, possible fix for #348 and #335
2014-10-30 22:18:33 +01:00
066344dde3
Fixed screenshoot loading again
...
issue #335
2014-10-29 21:15:45 +01:00
d6d08797ca
I forgot to remove some debug stuff
2014-10-29 21:13:12 +01:00
f68e7df8d6
Fixed program saving ( #352 )
2014-10-29 21:06:59 +01:00
ca3a1cb02b
Changed splashscreens filenames in maindialog.cpp
2014-10-28 10:37:05 +01:00
f679b5c84c
Sorry, I didn't mean to remove that
2014-10-27 22:09:57 +01:00
d75efcc5b2
Fixed problems with loading save screenshots (issue #335 )
2014-10-27 22:08:49 +01:00
475f222276
Fixed "Device" tab opening if it was opened in main menu earlier
2014-10-25 19:11:24 +02:00
0d873ad43a
Added warning about restarting game in order to apply changes
...
issue #339
2014-10-25 18:43:02 +02:00
26376c652d
Nothing else works, so restart the game on resolution change
...
Fixes #339 for now, but we'll need alternative solution later
2014-10-25 18:34:29 +02:00
fdbc4080c7
But do 182d5206a8 only on Windows, since it works correctly on Linux
2014-10-25 17:28:30 +02:00
182d5206a8
Disable resolution settings in simulation
2014-10-25 17:23:09 +02:00
ef1edba307
Fixed #340 again
2014-10-25 17:09:14 +02:00
78d7cc9eef
Change userlevels button text via text file
2014-10-25 12:21:13 +02:00
db7ab65354
Fixed #344
2014-10-25 12:10:29 +02:00
7d28b9a6da
Fixed #340
2014-10-25 12:01:21 +02:00
2d043d46bb
Merge branch 'vieux-blood_mode' into dev
...
Conflicts:
src/common/restext.cpp
src/ui/maindialog.cpp
2014-10-22 17:52:17 +02:00
d019a4990f
add option to disable blood
2014-10-21 21:44:17 -07:00
97b7c0cab1
Fixed map turning gray after resizing window
2014-10-20 21:54:52 +02:00
c0ac60e4fa
Fixed save directories in things not yet refactored to use PHYSFS
2014-10-20 21:15:39 +02:00
0245fdc6c3
Merge branch 'dev-physfs' into dev
...
Conflicts:
src/app/app.cpp
2014-10-19 16:18:36 +02:00
d7ef0a1a5f
Implemented "Apply changes" button (issue #141 )
2014-10-19 15:45:59 +02:00
0fb1cb11d4
Changed max and default font size
...
Min font size is 9, max is now 24 (previously 21)
Default size is now 19 (previously 9)
Closes #330
2014-10-19 13:33:19 +02:00
83abb8ca8e
Fixed program saving
2014-10-19 13:18:31 +02:00
f65b00089a
Merge branch 'dev' into dev-physfs
...
Conflicts:
data
2014-10-14 15:42:19 +02:00
9fd6cf5449
Changed all occurences of PPC in the code to TerranovaTeam
2014-10-14 15:26:18 +02:00
5274acd624
Merge with dev
2014-10-07 22:15:40 +02:00
c29ef4ec41
Fixed some warnings
...
Removed unused variables and fixed signed/unsigned comparation warnings
2014-09-27 16:49:00 +02:00
d3eaf2e1ce
Merge branch 'dev-physfs' into dev-physfs-levels
2014-09-26 21:05:55 +02:00
71f84d1e16
Fixed human.png texture
2014-09-26 21:02:54 +02:00
de375548ad
Userlevel listing
2014-09-26 20:53:11 +02:00
krzys-h