601ea0ec87
Increased mission end accuracy
...
It whould now detect mission end immediately. We need somebody with an older computer than mine to make sure it doesn't cause FPS drop.
2014-10-30 22:26:14 +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
6d2fd18b41
Implemented mission timer
2014-10-29 17:53:46 +01:00
61e06149c6
Fixed position updating
2014-10-29 16:08:55 +01:00
d91569e165
Showing coordinates in stats menu (F12/showstat); removed "showpos" cheat
...
Issue #277
Conflicts:
src/object/cheat.cpp
src/object/robotmain.cpp
src/object/robotmain.h
2014-10-29 16:08:55 +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
11854dc89e
Fixed script saving (issue #348 )
2014-10-27 21:49:03 +01:00
d6e88a07b0
Support for %lvl% in TerrainInitTextures + cleanup
...
cleanup:
* Removed CProfile::SetUserPath (unused)
* Removed CProfile::GetUserBasedPath (unused)
* Removed CProfile::CopyFileToTemp (i have no idea why it even existed)
* Removed CopyFileListToTemp (it did the same as CopyFileToTemp but for multiple files, wasn't even fully implemented)
2014-10-27 21:15:14 +01:00
990ecf7290
Corrected clamping mode in textures
2014-10-26 22:24:12 +01:00
569dd8ed25
Fixed regex in CResourceManager::CleanPath
2014-10-26 20:43:51 +01:00
ca4f1e85d2
Support for %lvl% in all commands
...
Except for TerrainInitTextures (I'm not sure what it does but it does something weird)
2014-10-26 18:35:13 +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
c9eb3ce5c5
Another possible (and more likely correct) fix for #339
2014-10-25 18:17:03 +02:00
9d68868f8e
Possible fix for #339 (?)
2014-10-25 18:00:39 +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
c12ebb1c7b
Fixed NewScript ( #341 )
2014-10-25 17:17:59 +02:00
ef1edba307
Fixed #340 again
2014-10-25 17:09:14 +02:00
81062e5e87
Fixed linking convert_model ( #332 )
2014-10-25 12:44:52 +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
4c865322f0
Fixed #341
2014-10-25 11:30:38 +02:00
1aebe8af03
Added support for VBO in OpenGL older than 1.5 if ARB extension is present
2014-10-24 00:29:26 +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
d3a722a0c5
Improved VBO support detection
2014-10-22 00:53:35 +02:00
1ab5746ca7
Disabled active window resizing that crashes in some software/hardware configurations
2014-10-21 22:22:32 +02: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
cf7be276dc
Possibly fixed goto() by changing safety margin
...
TODO: More testing
Closes #326
2014-10-20 20:48:03 +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
c001c46cb5
Small fix to 72b4228abe
2014-10-19 15:27:00 +02:00
9ea0b37408
Possible fix for #331
2014-10-19 14:21:55 +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
7af92cc4ce
Added portable build flag
2014-10-18 20:00:30 +02:00
b85a41b42a
Also fixed the same thing in file writing code
2014-10-15 21:31:43 +02:00
63b6aa56b0
Fixed crash when colobot.ini doesn't exist
2014-10-15 21:28:40 +02:00
47ea8a1175
Updated some more license headers
2014-10-15 21:16:06 +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
343504168f
Clean up translations
...
* translate only marked strings from restext.cpp
* update and clean pot and po files
* remove redundant POT-Creation-Data
2014-10-09 00:32:58 +02:00
342210b062
GCC 4.6 compilation fixes
2014-10-07 23:25:37 +02:00
72b4228abe
Fixed CBot debugger ( #325 )
2014-10-07 22:28:32 +02:00
12feb49098
Fixes in unit tests
2014-10-07 22:22:59 +02:00
5274acd624
Merge with dev
2014-10-07 22:15:40 +02:00
2770ee8927
Fixed issue #324
2014-10-07 21:40:51 +02:00
3ef2f976df
Added %chap% for current chapter directory
2014-09-29 21:53:21 +02:00
c2b8787453
On development builds store savegame data in current directory
2014-09-29 21:39:21 +02:00
f2c6b322dd
Replaced std::to_string with boost::lexical_cast<std::string>
...
MXE has problems with std::to_string
2014-09-28 19:25:28 +02:00
ad79babbc1
Made proxyDistance optional
2014-09-27 18:34:08 +02:00
b3fa72c007
Moved effect??.png textures and made pos= in GroundSpot optional
2014-09-27 18:26:29 +02:00
32504be8a9
Fixed TerrainLevel bug
2014-09-27 17:46:52 +02:00
8fab044bcd
Removed more unused variables
2014-09-27 17:16:58 +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
3b1cfdbfb4
Don't use physfs in saving code for now
...
This requires too much refactoring and we want to release 0.1.5 soon.
We'll need to rewrite saving/loading code to fully implement new level parser anyway.
2014-09-26 19:50:27 +02:00
740036e430
New level parser
...
Known issues:
* TerrainLevel for some reason doesn't work
* %lvl% is not yet implemented everywhere because of hardcoded directories in functions
2014-09-24 22:56:19 +02:00
9f2d544b27
Fix zenity version checking problems
2014-09-21 21:28:59 +02:00
2b86e6e9d9
Rewrite CMainDialog to use physfs
2014-09-21 12:29:06 +02:00
6a1ceba8c0
Some cleaning up
2014-09-21 12:29:06 +02:00
f0b38721e0
Loading all mods found in "mods" directory
2014-09-21 12:29:01 +02:00
e4d52d9afb
CProfile refactoring
2014-08-12 21:24:33 +02:00
74312b0405
Better CMake organization and unit test cleanups
...
* created a static library containing most source modules
to avoid compiling source modules twice in code and unit tests
* moved profile_test to main unit tests executable
* removed image_test and edit_test as not really useful
2014-08-12 20:58:55 +02:00
4bdfa0aa4e
Remove unused accessors from CDevice
2014-08-12 18:18:30 +02:00
360b72ac5a
Fix task stopping checks in CBrain
...
This possibly fixes some issues resulting from improperly
stopping tasks (CTask::Abort() not called before deleting the task).
Found while looking for instances of #318 .
2014-08-10 18:00:40 +02:00
9de086390b
Remove some more delete checks ( #318 )
2014-08-10 17:51:47 +02:00
ac019c263d
Remove unnecessary delete checks ( #318 )
2014-08-09 22:45:07 +02:00
ea0615ee05
Fixed #315
2014-08-08 14:03:43 +02:00
4a202a086f
Fixed #314
2014-08-06 17:18:52 +02:00
a56e69883f
Removed some unused code
2014-08-06 16:58:36 +02:00
0b2f25a6e3
Restored -datadir and -langdir arguments, added -savedir
...
Also, fixed some crashes when unable to open file
2014-08-06 12:27:17 +02:00
9a3cd67c3b
Saving colobot.ini through physfs
2014-07-24 23:38:13 +02:00
17041e718b
Added -mod commandline argument to add additional locations to physfs
2014-07-24 22:46:47 +02:00
7131abd385
Fixed SatCom image loading
...
Now LoadTexture/SetTexture functions require full path with "textures/" directory
2014-07-24 22:17:49 +02:00
117a5289ea
fixed issue #223 about disabling shadows/ground textures
2014-07-12 19:37:34 +00:00
02ba358a89
Help file loading
2014-07-11 16:40:07 +02:00
96d49d84aa
Merge branch 'dev' into dev-physfs
...
Conflicts:
data
src/app/gamedata.cpp
src/ui/control.cpp
src/ui/edit.cpp
src/ui/maindialog.cpp
2014-07-11 15:24:44 +02:00
9a6c06665c
Removed some old stuff related to Ceebot-Teen
2014-07-10 17:39:45 +02:00
c22e55b99a
Removed some unused code related to Quit button
...
The button itself has been removed a long time ago
2014-07-10 16:52:29 +02:00
5223ef1fb1
Fixed mission description loading
2014-07-10 16:36:00 +02:00
106ec014b8
Fixed texture and script loading
2014-07-10 16:25:40 +02:00
7b04f67358
Fixed music loading
2014-07-10 15:38:37 +02:00
1ee0c0e8fe
Fixed level list
2014-07-10 15:27:43 +02:00
aa190bb59b
Last changes
2014-06-30 17:40:40 +02:00
1835d2ae58
Removed old code based on #ifs (issue #55 )
2014-06-27 19:52:09 +02:00
0fbc05b96c
Fix test compilation
2014-06-26 22:36:57 +02:00
092e7cc68d
Fixed tests
2014-06-26 22:14:30 +02:00
fd8ea13cbb
Fixed not destroying CGameData
...
This also fixed failing assertion in tests
2014-06-26 21:38:02 +02:00
bc3b7ef283
Fixed negative parameter in fire() (issue #305 )
...
Also fixed checking parameter count and type for ants, spiders and shooters
2014-06-26 21:06:53 +02:00
f5ba2a27d4
fixed savefile screenshot loading bug
2014-06-24 20:31:17 +03:00
b7125a5b24
formatting and enhancements for savefile screenshot feature
2014-06-24 20:27:31 +03:00
613e1d74c4
implemented savefile screenshot feature
2014-06-24 01:35:05 +03:00
68d41d3b21
More work on streams
2014-06-23 23:19:55 +02:00
3aca1de731
More work on levels
2014-06-22 21:30:23 +02:00
0556b5dfbc
Added Exist() to resource manager, updated model
2014-06-22 16:29:26 +02:00
754154341d
More work on PhysFS support
...
* added output stream
* fixed music loading
2014-06-22 15:01:06 +02:00
1630cf0ed2
Implemented libsndfile loader in PhysFS
2014-06-21 02:59:26 +02:00
2260f6bf4f
Big part of PhysFS support
...
* removed -mod argument
* removed -datadir argument
* removed -lang argument
* removed some dead ui code
* added resource manager and file loaders (stream and SDL)
* changed interface textures location to match new directory structure
* removed CGameData for mod support
* added PhysFS support
2014-06-20 23:51:28 +02:00
ba62e6f8be
Remove dead code
2014-06-01 13:02:08 +02:00
f0d97bfdb9
Better datadir mod support
2014-05-18 12:12:47 +02:00
f71658e38d
Random relief generator
2014-04-10 21:50:26 +02:00
a181ba9bbf
Fixes #271
2014-03-25 22:56:40 +02:00
a2a4eb75cb
Whitespace
2014-03-21 13:22:02 +02:00
119fce546a
Issue #295 - continue
...
Renamed the method, fixed typo in comments
2014-03-21 13:18:28 +02:00
4491f51839
Whitespace
2014-03-21 13:15:15 +02:00
7485ed790c
Fixes #295
...
When cannon cannot turn at specified angle, it will still reach the edge angle, but return the error code
2014-03-21 13:08:36 +02:00
2cf84ad214
Added spaces to align values
2014-03-21 09:34:52 +02:00
e569fd6c39
Fix for #294
2014-03-16 15:25:49 +01:00
244ca93cf7
Fixed bug with fall damage
...
If you change the height after overheat, you get damage like you didn't change it at all. For example: overheat when you are 10 meters above the ground, and you fall to place 20 meters deeper, but you get the damage like you fell from 10 meters instead of 30. This commit fix this.
2014-03-12 19:43:20 +01:00
2ee0702d69
Made some improvements to fall damage from a61da740
...
Fall damage on:
- no energy
- overheat
Fall damage off:
- underwater
2014-03-09 14:36:39 +01:00
3dd400810f
Fixed bug from a61da7404b
...
Moved ExploObject to CPhysics::EventFrame, it shouldn't crash anymore.
2014-03-08 23:20:39 +01:00
a61da7404b
Added fall damage
...
+ changed window title
2014-03-08 22:36:35 +01:00
fbe2bf8bc7
Added special mode in scene for bots to build more buildings than they usualy can
...
Will be used in "Leaving Earth" missions for making decorative bots building base
2014-03-03 21:55:28 +01:00
a806d4257c
Check if pause music is defined in scene before trying to play it
2014-03-02 16:10:02 +01:00
1a0dcedf83
fixed m_oldMusic.push_back(nullptr) and segfault
2014-03-02 18:00:02 +04:00
e9960f5373
GetStringWidth fix
2014-03-02 04:15:59 +04:00
14709427c4
Fixed compile warning
2014-02-21 14:33:56 +01:00
bb2a9bcfd3
Added option to set pause audio in Scene
2014-02-21 14:19:58 +01:00
2433cb595a
Added a check when trying to play a music file
2014-02-21 10:13:48 +01:00
f21ab91184
Changed max channels to fix compilation error
2014-02-02 02:01:42 +01:00
93582536de
Merge branch 'dev' of github:colobot/colobot into dev
2014-02-02 01:51:14 +01:00
d84d38280b
Changed max number of sound channels
2014-02-02 01:50:34 +01:00
70b18cc4c0
Move engine frame update after game state update
...
This should finally fix #225
2014-01-18 21:35:32 +01:00
181a404930
Fixed warnings about unknown commands in scene files
2014-01-18 19:24:08 +01:00
c5ae2610b5
Minor changes to sound support.
...
* changed channel limit from 64 to 2048 that will decrease if error is found while trying to play sound
* added id to each channel to avoid collisions when more than 1 object tries to modify a sound
* minor formatting changes
2014-01-18 03:42:07 +01:00
652dc6081d
Removed some unused objects
2014-01-11 23:43:10 +01:00
d855586674
Fixed a bug from 59935b4706
...
Cmd() now checks if length of token we're looking for is equal to token we've found
2014-01-11 18:22:37 +01:00
082989a413
Changed main menu title to "COLOBOT: Gold Edition"
2014-01-01 19:49:29 +01:00
59935b4706
Changed comments in ObjectType to be object categories; removed unused SEAWEED
2014-01-01 17:33:19 +01:00
130c4fd941
Fixed log level in 8d30791595
2014-01-01 16:46:28 +01:00
90437d1765
Fixed two bugs in dc81cda4b1
...
* win/end scene animations
* produce() was producing empty cells
2014-01-01 16:45:08 +01:00
3d7017525b
Added camerafocus() for changing camera
2013-12-31 19:09:54 +01:00
8d30791595
Ability to set language via ini file
...
If language autodetection doesn't work, someone might want to manually force the game to use correct language without using -language parameter every time
2013-12-31 17:20:03 +01:00
999490e88b
Code for changing music in pause mode
...
As requested by @Emxx52. Only code for now, we don't have the music yet. Temporairly in developements builds music will change to Prototype (in CBot editor) and Constructive Destruction (in SatCom)
2013-12-31 16:58:21 +01:00
4a237f5925
CPauseManager
2013-12-31 13:24:09 +01:00
3536f1c7cc
Added CObjectManager::Flush()
...
Possible fix for #275
2013-12-30 10:51:29 +01:00
12e17224b3
Added nullptr shecks to object.factory()
...
Trying to fix #275
2013-12-29 16:31:32 +01:00
a36450a6da
Added tool= i drive=
2013-12-29 15:03:21 +01:00
krzys-h