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
dc81cda4b1
Cleaned up creating objects
2013-12-29 12:08:59 +01:00
9631f26270
Don't stop music when SatCom or pause menu is opened
2013-12-28 16:45:11 +01:00
e9addb5a5e
Added smooth transition in music - issue #205
2013-12-28 12:30:46 +01:00
0ff7e55b33
Fix for #177 - save list sorting
2013-12-27 22:28:25 +01:00
1b73893678
Temporary fix for #232 - don't try to show the buttons
...
This makes SatCom usable for now
2013-12-27 21:46:16 +01:00
246b7e107e
Removed prototypes support
2013-12-27 20:36:11 +01:00
9a741a66a4
Changed version display in bottom-right corner to be actually version number instead of date
2013-12-27 11:15:36 +01:00
8b5b2eeaa1
Added error message when CEdit is unable to read a file
2013-12-27 10:50:52 +01:00
555c486fc6
Disable immediat SatCom when scene test is enabled
2013-12-26 22:33:17 +01:00
01cbc4177e
Whoops
2013-12-26 22:14:53 +01:00
0f57809f51
Added scene test mode
...
... and fixed a "small" bug in previous commit ;)
2013-12-26 22:13:04 +01:00
3a78d587bd
Exit the game after finishing the mission while using -runscene
2013-12-26 21:54:05 +01:00
32c55297c4
Fix for building physics.cpp on some systems
...
Why is it working on my local machine but it's crashing on MXE on my server?
2013-12-26 21:14:36 +01:00
16842b5e83
Changed default loglevel on dev builds to Debug
2013-12-26 21:09:19 +01:00
fcda183b96
Hide userlevels menu in release version
...
Userlevels aren't working right now (issue #219 )
2013-12-26 21:05:58 +01:00
07901341a6
Fix for #71 - infinite energy
2013-12-26 20:37:39 +01:00
3eec21895e
Renamed "New player" to "Change player" ( #220 )
2013-12-26 19:48:44 +01:00
8b121910c1
Indentation fixes
2013-12-26 19:39:32 +01:00
46a7aa98b0
Added error message when unable to load script from file specified in CreateObject
2013-12-26 19:36:17 +01:00
0d31f59b12
.takeoff() for SpaceShip ( #265 )
2013-12-26 18:50:05 +01:00
a79bd6c5c7
Fixed build of stringutils.cpp
...
/var/www/colobot_compiled/colobot/dev/colobot/src/common/stringutils.cpp:33:51: error: 'vsnprintf' was not declared in this scope
2013-12-25 23:41:50 +01:00
c8ec3f2020
Added "E" as a secondary action button
...
As requested by @Emxx52 on IRC
2013-12-25 19:43:11 +01:00
5661f5a413
Fixed "default controls" button ( #263 )
2013-12-25 19:41:15 +01:00
55fd03ade3
Added WSAD as secondary controls ( #231 )
2013-12-25 19:34:34 +01:00
f1e267b18e
Fixed bug #240 - CAuto in produce()
2013-12-25 19:13:15 +01:00
d0285d6886
Fixed AudioChange
2013-12-25 18:53:32 +01:00
3966e3fce0
Merge branch 'dev-string-in-restext' into dev
...
Merging branches after code review
This should fix buffer overflow problems with translation strings
2013-12-20 20:22:51 +01:00
95661918ce
Some further refactoring and test corrections
2013-12-20 20:18:30 +01:00
fe3f9ea38c
Sound support changes
...
* removed 2d sound
* fixed listener orientation (propably issue #235 )
* removed unused code and minor refactoring
2013-12-19 22:46:29 +01:00
114cbec8a9
Never cache Data, Sound and Music paths
...
Let them always be either auto-detected, defined on the command-line
or written in the configuration file
2013-12-09 17:39:39 +01:00
krzys-h