lp:cdda
- Get this branch:
- bzr branch lp:cdda
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at https://github.com/CleverRaven/Cataclysm-DDA.
Last successful import was .
Recent revisions
- 5415. By Angela Graves <email address hidden>
-
Merge pull request #13210 from illi-kun/
make_sounds_ translatable make onomatopeias translatable
- 5414. By Angela Graves <email address hidden>
-
Merge pull request #13213 from dholmes215/
diamondNodachiF ix Add CUT and BUTCHER to diamond nodachi
- 5413. By Kevin Granade
-
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>
-
Merge pull request #13202 from Coolthulhu/
list-drops List dropped CBMs and forage results
- 5410. By Kevin Granade
-
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>
-
Merge pull request #13190 from BevapDin/lop
Fixes vanishing vehicles.
- 5408. By Coolthulhu <email address hidden>
-
Merge pull request #13175 from chaosvolt/
pipe-combinatio n-gun-fix Workaround to issue #13171, makes underbarrel pipe shotgun craftable, other weapon fixes
- 5407. By Coolthulhu <email address hidden>
-
Merge pull request #13180 from DanmakuDan/
load_json_ aim_filter_ fix Fix json exception using wrong array getter.
- 5406. By Coolthulhu <email address hidden>
-
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)