Skip to content

/Cataclysm-DDA

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Roughen up river edges #7696

Closed
wants to merge 51 commits into from

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
8 participants
@vache @KA101 @kevingranade @Rivet-the-Zombie @VlasovVitaly @BevapDin @yowshi @jeremyosborne
@vache
Copy link
Contributor

commented May 20, 2014

River banks are no longer so straight. Bridges still have deep water directly at the edges.

Not sure what the extra commits are...

vache and others added some commits May 10, 2014

@vache
River edge tweak
4850f61
@vache
Change draw_overmap to use tripoint. Allows debug teleport across z l… 
…evels
30e70b6
@vache
Transition to use overmapbuffer in overmap::open, fails
f58c1ba
@vache
Further testing
6d92220
@vache
Modify overmap::open to use overmapbuffer, fix road connections
384f978
@vache
Fixed several overmap special placement bugs. Roads align (mostly), b… 
…uildings rotate correctly, no more gas stations on bridges
acb878f
@Rivet-the-Zombie @vache
More price fixes.
3f2306d
@VlasovVitaly @vache
Don't use gettext with empty string
2474713
@vache
Fix overmap buffer infinite loops for 0,0 overmap
54d6d7d
@VlasovVitaly @vache
Additional translations fixes
12792ee
@VlasovVitaly @vache
Show translated item names in crafting menu
ae17b47
@vache
Fix apartment rotation problem
733381f
@BevapDin @vache
fix bug in inventory_ui.cpp where dropping partial stacks were not ac… 
…counted for in the volume calculation.
47ae2c5
@BevapDin @vache
Add the ABSORBENT flag only if the item does not already have it. 
Note that item::has_flag checks the item tags of the item type, too. For a (dry) towel it returns true and the item instance does not get the ABSORBENT flag.
Also changed to get the item type to revert to from json data: it_tool::revert_to
b49083c
@VlasovVitaly @vache
self-fix
4651ba3
@VlasovVitaly @vache
self-fix part 2
7b43d36
@BevapDin @vache
defense.cpp: make the setup window the same position as the char gen … 
…window to overdraw the old content of it
0c9ba70
@BevapDin @vache
Don't consume worn item, print a message instead. 
Print a message when attempting to wear a worn item.
8d3094e
@vache
Move terrain & player filenames to overmapbuffer, solve some road con… 
…nection issues
1878086
@Rivet-the-Zombie @vache
Fixes the prices of a few shoes.
306ddf2
@BevapDin @vache
fix to disable dropping of bionic weapons
5590524
@yowshi @vache
Update professions.json 
added a profession Bionic Prepper. a few CBM's losing a couple skills and the lighter
2b857e7
@Rivet-the-Zombie @vache
Sneaker price.
9afe9df
@Rivet-the-Zombie @vache
More price fixes.
a631e32
@BevapDin @vache
Search for item type in itypes when not found in Item_factory::m_temp… 
…lates because newly created artifacts add their itype only to itypes and not to Item_factory::m_templates.

Removed the c_str call whose result is converted to a std::string anyway.
8729452
@BevapDin @vache
remove debug message
5e9b0bf
@BevapDin @vache
Don't call monster::die when a hallucination monster should disappear 
Instead set it to be dead. game::cleanup_dead takes care of the actual death (and calls monster::die).
b957135
@BevapDin @vache
Remove static modifiers from local variables in MonsterGernerator fun… 
…ctions:

The values contained in those static variables can change when a new game is loaded because the previous world data is reset and reloaded.
This will eventually lead to new monster type pointers, the previous pointers (stored in the static variables) are than invalid.
50afa0c
@yowshi @vache
Changing Bionic Prepper to be more balanced, lowered skillset and pow… 
…er storage changed metab to torsion upped profession cost to 8
f9936d3
@yowshi @vache
Update professions.json
1e1c799

Rivet-the-Zombie and others added some commits May 16, 2014

@Rivet-the-Zombie @vache
More prices fixes.
395b8f5
@BevapDin @vache
Change item::material to return a material pointer directly. 
Previously item::material returned only the material ident. That ident has been used to get the material_type object. Now this is already done by the get_material function.

Use material ident null instead of empty ident for is_null check. The
json file contains a material with ident "null" and some code also
relies on it.
2fbd40e
@BevapDin @vache
Search for translated material name in game::list_items_match 
Also made search for category and material case-insensitive.
a26ea07
Wuzzy @vache
Random character respects INITIAL_POINTS now
06485be
Wuzzy @vache
Let random char creation respect max stat/skill
18a6113
@Rivet-the-Zombie @vache
More price fixes.
1959970
@kevingranade @vache
Fix float/int rounding bugs that were making layering too forgiving.
159c44a
@BevapDin @vache
load item group for vending machine specials from mapgen json 
Fix the error reporting, second parameter to JsonObject::throw_error is the name of the offending member
throw_error does not perform printf-style string formatting.
22acbff
@VlasovVitaly @vache
show translated tools names
3529203
@VlasovVitaly @vache
Fix component names length calculation
b3261a8
@VlasovVitaly @vache
Fix SDL construction weird symbols on border
086c65d
@VlasovVitaly @vache
move toggling message to downside
aa01008
@jeremyosborne @vache
Took a moment to do minor tweaks and updates to the compilation guide… 
… for Mac. Mainly clarifications (things that I stumbled with) and formatting changes (fixes a few markdown errors). Also reminds me how to do a pull request on github.
79c79c2
@kevingranade @vache
Don't try to translate strings used as skill ids.
483409b
@Rivet-the-Zombie @vache
Tetanus tweaks. 
Makes tetanus slightly less brutal on the sufferer (reduced the constant
falling on your face part) and harder to contract in the first place,
makes tetanus respect the infection resistance/immunity traits, adds
chance of infection to falling in spiked pits, reduces infection chance
from bear traps (they don't generally create the type of wounds that
tetanus thrives in), and makes tetanus respect medical bionics.
41c336d
Wuzzy @vache
Fix 32 excess points in char creation bug 
If you created a custom char, you received 32 points than you should.
bc15995
@Rivet-the-Zombie @vache
Disease target fix.
f54ed4a
@vache
Fix off-road mansion rotation, road connections that don't face north
6086a3e
@vache
Fix fema rotation issues. mongroup rad: unsigned char -> unsigned int
c55f4f1
@vache
No more straight river edges
cfd3743
@vache
merge
Loading status checks…
7764554
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented May 20, 2014

Probably a Wonky merge update. if cfd3743 is all you need, then we can cherry-pick that easily enough.

@KA101 KA101 assigned KA101 and unassigned KA101 May 21, 2014

@kevingranade

This comment has been minimized.

Sign in to view
Copy link
Member

commented May 22, 2014

cherry-picked cfd3743

@kevingranade kevingranade closed this May 22, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.