lp:cataclysm-dda

Created by Sylpheed on 2013-07-16 and last modified on 2015-08-08
Get this branch:
bzr branch lp:cataclysm-dda

Related bugs

Related blueprints

Branch information

Owner:
Sylpheed
Project:
Cataclysm-DDA
Status:
Development

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at git://github.com/CleverRaven/Cataclysm-DDA.git.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was on 2015-08-08.

Import started on 2015-08-12 on pear and finished on 2015-08-12 taking 1 minute — see the log
Import started on 2015-08-10 on russkaya and finished on 2015-08-10 taking 1 minute — see the log
Import started on 2015-08-09 on pear and finished on 2015-08-09 taking 1 minute — see the log
Import started on 2015-08-09 on pear and finished on 2015-08-09 taking 1 minute — see the log

Recent revisions

5415. By Angela Graves <email address hidden> on 2015-08-08

Merge pull request #13210 from illi-kun/make_sounds_translatable

make onomatopeias translatable

5414. By Angela Graves <email address hidden> on 2015-08-08

Merge pull request #13213 from dholmes215/diamondNodachiFix

Add CUT and BUTCHER to diamond nodachi

5413. By Kevin Granade on 2015-08-07

Merge remote-tracking branch 'dda/pr/13151'

* dda/pr/13151:
  Doxygen update
  Doxygen updated. Removed unused definintion
  Fix main test
  Small fixups
  Refactor tileset loading functions. Work with all tileset config types
  Small fixes of var names and comments.
  Remove testing debug message
  Fixes build. Working with old-style configs.
  Move some functional into upper level(init()). Removed ags from init() and reinit(). Used FILENAMES["gfxdir"] instead. Fixed headers. Build is broken with -WError.
  Refactoring of get_tile_information()
  New global vat TILESE. Contail all tilesets found. New function in options that fill TILESETS mapping.
  Not related to PR. Minior fixes in options. initOptions() renames to init_options(), like save_options(), load_options() and others. options_data::* moved to begin of file like other classes methods.
  New helper lookup pattern in dir. Retrun directory names only.
  Add new FILENAMES var tileset-conf.
  Use related pathes in tileset JSON config.
  Change JSON and TILESET filenames to related to tileset directory.

5412. By Angela Graves <email address hidden> on 2015-08-07

Merge pull request #13202 from Coolthulhu/list-drops

List dropped CBMs and forage results

5411. By DanmakuDan <email address hidden> on 2015-08-06

Allow inflatable boats to be deployed on deep water.

5410. By Kevin Granade on 2015-08-06

Merge remote-tracking branches 'dda/pr/13184', 'dda/pr/13186', 'dda/pr/13188', 'dda/pr/13189' and 'dda/pr/13193'

* dda/pr/13184:
  restyle editmap.cpp
  further tweaks of editmap.cpp

* dda/pr/13186:
  Rough MSYS2-only guide
  Make Windows have its own section

* dda/pr/13188:
  Minor cleanup and a bug fix

* dda/pr/13189:
  Avoid the divide by zero crash for boat dragging by checking wheel count.

* dda/pr/13193:
  Nerf javelin too
  Remove rapid attacks from spears, buff dmg

5409. By Angela Graves <email address hidden> on 2015-08-06

Merge pull request #13190 from BevapDin/lop

Fixes vanishing vehicles.

5408. By Coolthulhu <email address hidden> on 2015-08-05

Merge pull request #13175 from chaosvolt/pipe-combination-gun-fix

Workaround to issue #13171, makes underbarrel pipe shotgun craftable, other weapon fixes

5407. By Coolthulhu <email address hidden> on 2015-08-05

Merge pull request #13180 from DanmakuDan/load_json_aim_filter_fix

Fix json exception using wrong array getter.

5406. By Coolthulhu <email address hidden> on 2015-08-05

Merge pull request #13179 from DanmakuDan/zero_skill_memorize_fix

Fix divide by zero where recipe is memorized with zero relevant skill.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.

Subscribers