Skip to content
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

Initial Blazemod re-work #37497

Closed
wants to merge 1,024 commits into from
Closed
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
1024 commits
Select commit Hold shift + click to select a range
9ffc92e
Declutter river terrains
ZhilkinSerg May 2, 2020
331634b
Declutter private resort terrains
ZhilkinSerg May 2, 2020
0b0a3d4
Declutter public institutional terrains
ZhilkinSerg May 2, 2020
c1441bb
Simplify melee::clear_stats
jbytheway May 2, 2020
870dd4f
Updates to dps tests
jbytheway May 2, 2020
1c10133
Clear martial arts style in clear_character
jbytheway May 2, 2020
4f17b79
Fix caramel ointment crafting
May 2, 2020
771b6be
Merge pull request #40069 from jbytheway/consolidate_wake_up_code
ifreund May 2, 2020
015c0c2
Declutter mi-go terrains
ZhilkinSerg May 2, 2020
98c27a4
Declutter mansion terrains
ZhilkinSerg May 2, 2020
bcec49e
Declutter military terrains
ZhilkinSerg May 2, 2020
4b9f8ff
Declutter lab terrains (partially)
ZhilkinSerg May 2, 2020
a64a9e0
Declutter evac center terrains
ZhilkinSerg May 2, 2020
417ee79
cleanup mall part 1
curstwist May 2, 2020
6cef4aa
[magiclysm] buff glowing rocks
KorGgenT May 2, 2020
b4fbce7
Merge pull request #40073 from jbytheway/dps_test_cleanup
ifreund May 2, 2020
21d8bb4
Merge pull request #40071 from ZhilkinSerg/overmap-terrain-id-declutt…
ifreund May 2, 2020
11e6815
Merge pull request #40077 from ZhilkinSerg/overmap-terrain-id-declutt…
ifreund May 2, 2020
0bf295e
Merge pull request #40074 from Fris0uman/sweet_bio
ifreund May 2, 2020
dd87a23
Migrate ACT_OPEN_GATE to the activity actor system (#40039)
rsulli55 May 2, 2020
a6d9cae
Merge pull request #40080 from curstwist/mall-prep-work
ifreund May 2, 2020
0b6c360
Merge pull request #40079 from KorGgenT/magiclysm-glowing-rocks-buff
ifreund May 2, 2020
789d3b2
Merge pull request #40067 from Soup-de-Loop/soupdeloop-blazemod-PR31
ZhilkinSerg May 2, 2020
24d8736
vol and weight to string functions
KorGgenT Apr 9, 2020
f9c60d0
nested containers json
KorGgenT Apr 9, 2020
0ee9b4a
markdown documentation of pocket data json
KorGgenT Apr 11, 2020
5383aaf
change inventory UI to show items in containers
KorGgenT Apr 11, 2020
380ed81
remove unneeded backpack logic from drop activity
KorGgenT Apr 11, 2020
744a412
create new class item_pocket that lives in item_contents
KorGgenT Apr 11, 2020
09ee4e1
nested containers code
KorGgenT Apr 11, 2020
8919d43
adjust unload function to avoid item unloaded
KorGgenT Apr 14, 2020
9cd6bf5
make adv inventory work for inventory pane
KorGgenT Apr 14, 2020
400fc8b
fix item processing for nested containers
KorGgenT Apr 14, 2020
39e27c9
fix professions loading inventory incorrectly
KorGgenT Apr 15, 2020
6b6621e
migration code for item contents
KorGgenT Apr 16, 2020
d656a87
remove early return from item_pocket::restack
KorGgenT Apr 17, 2020
425e0de
change game::wield to not take an item_location reference
KorGgenT Apr 17, 2020
0e2efdb
add conditional on debug message for handle_contents_changed()
KorGgenT Apr 17, 2020
2f344d1
unseal pockets when they are empty
KorGgenT Apr 17, 2020
f042d01
change has_pockets to use has_pocket_type
KorGgenT Apr 18, 2020
bb8ec7b
fix crash trying to wield an item contained in a wielded item
KorGgenT Apr 18, 2020
1354c4b
fix wear and takeoff item weirdness
KorGgenT Apr 18, 2020
e34dec6
fix get item not calling correct function to check stashability
KorGgenT Apr 18, 2020
bfee53f
fix non guns with magazines spawning
KorGgenT Apr 18, 2020
28947bd
remove superfluous call to seal() in wish.cpp
KorGgenT Apr 18, 2020
092f079
fixes based on code review
KorGgenT Apr 19, 2020
ccde741
refactor i_add_to_container
KorGgenT Apr 19, 2020
086fe5b
revert erasure of bucket filtering logic in adv_inv
KorGgenT Apr 19, 2020
7948565
lint
KorGgenT Apr 19, 2020
971fff0
migrate pocket json to clear tests
KorGgenT Apr 20, 2020
9b1480e
change clear_player to delete worn items directly
KorGgenT Apr 20, 2020
a5a3589
is_food_container is not food itself
KorGgenT Apr 20, 2020
d646c5b
fix dereferencing erased iterator
KorGgenT Apr 20, 2020
13d5c1e
allow gun_actor to have items in order to fire their guns
KorGgenT Apr 20, 2020
d584ebb
bumped automatically generated pocket stats
KorGgenT Apr 20, 2020
99bcd37
migrate_items_to storage
KorGgenT Apr 20, 2020
e581a2d
fix a few seg faults in the tests
KorGgenT Apr 20, 2020
f3df832
Update modify_morale_test.cpp
KorGgenT Apr 21, 2020
e879fcd
more test fixes
KorGgenT Apr 21, 2020
14e92e6
Update reload_option_test.cpp
KorGgenT Apr 21, 2020
7468b4a
fix bug where empty containers spawn sealed
KorGgenT Apr 21, 2020
0126449
Update pickup.cpp
KorGgenT Apr 22, 2020
8f77536
item_pocket::restack()
KorGgenT Apr 22, 2020
6a8cb45
item::combine()
KorGgenT Apr 22, 2020
52e6ad8
Remove unused lambda capture liquid_id
wapcaplet Apr 23, 2020
94c0a00
Parenthesize && to silence compiler warnings
wapcaplet Apr 23, 2020
15c40b3
refactor wield_times_test
KorGgenT Apr 23, 2020
c9eeef5
fix crafting tests
KorGgenT Apr 23, 2020
eee5c5d
adjust behavior_oracle for nested containers
KorGgenT Apr 23, 2020
a942ac5
fix reload_option_test
KorGgenT Apr 23, 2020
73e5fa5
Update visitable_remove_test.cpp
KorGgenT Apr 23, 2020
fa93a61
Separate avatar from their items
wapcaplet Apr 23, 2020
d34ddf6
turn off some tests for a future pr
KorGgenT Apr 24, 2020
0bce062
fix INT_MIN failures in reloading test
KorGgenT Apr 24, 2020
72a98a7
reload test refactoring
KorGgenT Apr 24, 2020
c9f3f91
more reloading test work
KorGgenT Apr 24, 2020
d8e7bdd
fix unloading revolvers
KorGgenT Apr 24, 2020
7059372
adjust item_location_test
KorGgenT Apr 24, 2020
689cea7
Update iuse_actor_test.cpp
KorGgenT Apr 25, 2020
e1119a9
adjust item_contents_test
KorGgenT Apr 25, 2020
6da39dc
fix deleting charges picking up anesthetic kit
KorGgenT Apr 25, 2020
5d6f472
autodoc does not make you handle all installed bionics when trying to…
KorGgenT Apr 25, 2020
af6e685
cannot drop frozen liquid from container
KorGgenT Apr 25, 2020
6280fa6
change to Character::all_items_loc and fix merchant inventory
KorGgenT Apr 25, 2020
837eb7d
clang tidy warnings
KorGgenT Apr 25, 2020
ae57d67
fix processing crash
KorGgenT Apr 26, 2020
ec5a19b
fix minor magiclysm loading error
KorGgenT Apr 26, 2020
223cb39
Update reloading_test.cpp
KorGgenT Apr 26, 2020
3561b24
fix corpses disappearing in 1 turn
KorGgenT Apr 26, 2020
275010a
appease clang tidy
KorGgenT Apr 26, 2020
a97958d
Update bionics_test.cpp
KorGgenT Apr 27, 2020
9f65822
adjust try_add
KorGgenT Apr 27, 2020
f2b5adb
Update npc_talk_test.cpp
KorGgenT Apr 27, 2020
72206fb
added mayfail to some tests
KorGgenT Apr 27, 2020
08870bd
fix comestible tests
KorGgenT Apr 28, 2020
0200b88
Avoid copying in range-based for loops
anothersimulacrum Apr 28, 2020
47047ec
Update crafting_test.cpp
KorGgenT Apr 28, 2020
6b4544e
turn off invlet tests
KorGgenT Apr 28, 2020
b388a06
fix crashes in reload test
KorGgenT Apr 28, 2020
ca44537
Update Cataclysm-test-vcpkg-static.vcxproj
KorGgenT Apr 28, 2020
b95da6d
turn off other invlet test
KorGgenT Apr 28, 2020
417c398
Update new_character_test.cpp
KorGgenT Apr 28, 2020
14b298b
adjust professions to pass tests
KorGgenT Apr 28, 2020
f5b57fd
Update professions.json
KorGgenT Apr 28, 2020
a4baa73
astyle
KorGgenT Apr 28, 2020
733ac6a
Update professions.json
KorGgenT Apr 28, 2020
0c228b3
fix integral mods adding volume to pockets
KorGgenT Apr 28, 2020
5912a1b
fix ranged balance tests
KorGgenT Apr 28, 2020
d793403
Revert "fix ranged balance tests"
KorGgenT Apr 28, 2020
40cf842
fix ranged tests take 2
KorGgenT Apr 28, 2020
f211350
fix crafting with UPS
KorGgenT Apr 28, 2020
a0ec26a
fix trying to open uilist in tests
KorGgenT Apr 28, 2020
fc08161
fix vehicle power test
KorGgenT Apr 29, 2020
10a446f
Revert "fix vehicle power test"
KorGgenT Apr 29, 2020
73cbe64
ok for real don't revert this
KorGgenT Apr 29, 2020
6d64a79
Revert "Revert "fix vehicle power test""
KorGgenT Apr 29, 2020
fa39203
adjust reloading code to work (mostly)
KorGgenT Apr 29, 2020
ca74254
adjust crafting test to use battery mags
KorGgenT Apr 29, 2020
d20d499
simplify json item substitution
KorGgenT Apr 29, 2020
e7ed0a4
remove restriction on golf bag
KorGgenT Apr 29, 2020
43816d2
possible fix for item::in_container
KorGgenT Apr 29, 2020
0cf2d73
clang didn't like that
KorGgenT Apr 29, 2020
caca8ca
Update item.cpp
KorGgenT Apr 29, 2020
09f2319
test me
KorGgenT Apr 29, 2020
bd30927
Update item.cpp
KorGgenT Apr 29, 2020
460f0a3
possible fix for test
KorGgenT Apr 30, 2020
abd0615
ok for real the profession test is fixed now
KorGgenT Apr 30, 2020
93801c6
lint json
KorGgenT Apr 30, 2020
3ad9df1
Update item.cpp
KorGgenT Apr 30, 2020
4d3d69f
fix seg fault in reloading test
KorGgenT Apr 30, 2020
4c4055b
fix vehicle efficiency test crash
KorGgenT Apr 30, 2020
457aef7
disable iteminfo test
KorGgenT Apr 30, 2020
9e13ced
fix crafting tests
KorGgenT Apr 30, 2020
a22941a
adjust item::fill_with to take itype instead of item parameter
KorGgenT Apr 30, 2020
b2fbfec
fix comestible tests
KorGgenT Apr 30, 2020
cda5e41
move pockets member in itype to attempt to fix padding error
KorGgenT Apr 30, 2020
31aff1f
fix vehicle interact test
KorGgenT Apr 30, 2020
ce2208c
Update offal_dishes.json
KorGgenT Apr 30, 2020
99e5fd5
disable newcharacter test temporarily and maybe fix padding error
KorGgenT Apr 30, 2020
e53d764
astyle
KorGgenT May 1, 2020
606a142
fix merge conflict
KorGgenT May 1, 2020
a1a3984
Update item_location.cpp
KorGgenT May 1, 2020
5b85239
fix json errors
KorGgenT May 1, 2020
1339074
Update tools.json
KorGgenT May 1, 2020
03ef579
Update item_pocket.h
KorGgenT May 1, 2020
2ac34d6
temporarily disable padding clang tidy check
KorGgenT May 1, 2020
bca17a2
Update player_helpers.h
KorGgenT May 2, 2020
d662a32
Update npc_talk_test.cpp
KorGgenT May 2, 2020
c491377
Declutter commercial terrains
ZhilkinSerg May 2, 2020
63d18dc
Declutter cemetery terrains
ZhilkinSerg May 2, 2020
9291acd
Corrected wrong use of "it's"
Someoneman May 3, 2020
83df153
Update misc.json
Someoneman May 3, 2020
07698af
Update misc.json
Someoneman May 3, 2020
b056dd8
Update martialarts.json
Someoneman May 3, 2020
a73dc81
Update fungus.json
Someoneman May 3, 2020
e294885
Update jabberwock.json
Someoneman May 3, 2020
bcdb7ca
Add support for hiding achievements
jbytheway May 2, 2020
12231d3
Add achievements for 10, 100 kills
jbytheway May 3, 2020
8ecd8e2
Test for achievement hiding
jbytheway May 3, 2020
007e7ce
Document hidden_by field on achievements
jbytheway May 3, 2020
cf7473e
Merge pull request #40091 from Someoneman/patch-7
Rivet-the-Zombie May 3, 2020
1ed056b
Prevent attempt to removing an item from itself.
BevapDin May 3, 2020
a4d2de0
Merge pull request #40084 from ZhilkinSerg/overmap-terrain-id-declutt…
ifreund May 3, 2020
0c074f2
Merge pull request #40090 from jbytheway/hidden_by_achievements
ifreund May 3, 2020
8cea0fc
Merge pull request #40023 from Qrox/uilist
ifreund May 3, 2020
dedd73c
Call `item::remove_item` on appropriate object.
BevapDin May 3, 2020
1d61507
Merge pull request #39785 from olanti-p/target_ui-as-class
ifreund May 3, 2020
35fc286
Merge pull request #39910 from enaantd/fix-humvee-tow-fuel
ifreund May 3, 2020
3f4e86a
Merge pull request #40098 from BevapDin/uoy
ifreund May 3, 2020
b734971
add id_suffix to ammonium nitrate recipes (#40096)
sanfordmadness May 3, 2020
da38caf
Merge pull request #40099 from BevapDin/zeb
ZhilkinSerg May 3, 2020
7090b36
merge some maps, swap palette
curstwist May 3, 2020
a6bb392
Fix regression related to aim-and-fire losing targets not identified …
olanti-p May 3, 2020
6a138fe
Zombie scientists can't open doors
TheShadowFerret May 3, 2020
54e8477
Mi-go can open doors
TheShadowFerret May 3, 2020
70df07c
Zombie masters and necros can open doors
TheShadowFerret May 3, 2020
ecc602c
Merge remote-tracking branch 'origin/pr/39406'
kevingranade May 3, 2020
a9778c1
Declutter waterbody terrains
ZhilkinSerg May 3, 2020
31f1163
Declutter mall terrains
ZhilkinSerg May 3, 2020
b546c20
[Magiclysm] Allow spells to spawn items with their containers (#40097)
RedShakespeare May 3, 2020
4fb7604
Declutter industrial terrains
ZhilkinSerg May 3, 2020
686104e
Merge pull request #40103 from olanti-p/fix-targets-behind-fences
ifreund May 3, 2020
86ab3c8
Extracts and Concentrates pt 6 (recipes) (#37959)
NastyNate2612 May 3, 2020
fd7db4a
Merge pull request #40102 from curstwist/mall-cleanup-part-2
ifreund May 3, 2020
d365c79
Merge branch 'master' into dt_bullet
kevingranade May 3, 2020
8f939e9
Declutter necropolis terrains
ZhilkinSerg May 3, 2020
964fe80
Fix localized_comparator for macOS (#40100)
akirashirosawa May 3, 2020
08f6210
Merge pull request #40095 from Qrox/migrate-ui-13
ZhilkinSerg May 3, 2020
71827cf
Update JSON_INHERITANCE.md (#40107)
Jerimee May 3, 2020
761e033
Final Blazemod PR: Finalise succession of modern Blaze Industries fro…
Soup-de-Loop May 3, 2020
9b4d189
Long pole changes. (#39924)
kevingranade May 3, 2020
ae30117
Scan for languages (#40056)
akirashirosawa May 3, 2020
b7091a5
Add tea bags, herbal tea bags and adjust drinks recipes (#39989)
CountAlex May 3, 2020
2a631eb
Merge pull request #39928 from Night-Pryanik/improvised-lockpicks-rec…
kevingranade May 3, 2020
c2b5d41
[Aftershock] Uplifted monsters and zombies (#39097)
Maleclypse May 3, 2020
51b03d7
Merge pull request #39939 from crazykid080/ninjutsu-survival-machete
kevingranade May 3, 2020
a13e5c7
Update throwing knives weight and size (#39992)
CodeBandit May 3, 2020
4e0786c
Xl underwear and accessories Part 1 (#39978)
Maleclypse May 3, 2020
1e45902
Slipping when climbing down may happen only on unstable terrain below…
Night-Pryanik May 3, 2020
92b6013
Add extra forging recipes, part 2 (#40057)
Rail-Runner May 3, 2020
fbf3b84
Mi-go, necromancers, and masters can open doors (#40065)
kevingranade May 3, 2020
33f26ca
Split some traits from professions (#40075)
Rail-Runner May 3, 2020
9936ba5
Magic bionics (#39940)
KorGgenT May 3, 2020
34906bd
Merge pull request #38912 from anothersimulacrum/dt_bullet
kevingranade May 3, 2020
1a517a9
Prevent copying in range-based loops
anothersimulacrum May 3, 2020
b3f3ea4
Update tea box to be a container
anothersimulacrum May 3, 2020
d15c896
Add newly required tools to crafting test
kevingranade May 4, 2020
17b6b76
Bionic fingerpick fix (#39857)
Night-Pryanik May 4, 2020
87b94d9
Max stamina modifiers from mutations now affect stamina regen (#39994)
CodeBandit May 4, 2020
47b1e3d
Allow HEALING_RATE for any effect (#40072)
Fris0uman May 4, 2020
4aaba04
Replace random lab turrets with lab security
anothersimulacrum May 2, 2020
5e2bffc
Merge pull request #40105 from ZhilkinSerg/overmap-terrain-id-declutt…
kevingranade May 4, 2020
b4cbba5
Fix crafting iteminfo test
kevingranade May 4, 2020
2ebad2a
storage definition hotfix
kevingranade May 4, 2020
0c4d9b2
Merge pull request #40049 from Rail-Runner/plants3
Rivet-the-Zombie May 4, 2020
8cc6f88
Migrate inventory_ui.cpp and game_inventory.cpp to ui_adaptor
Qrox May 1, 2020
6b7fa02
map fixes (#40113)
curstwist May 4, 2020
141e5ff
Update materials for bullet damage type (#40112)
anothersimulacrum May 4, 2020
54afa14
Consume menu fix (#40108)
KorGgenT May 4, 2020
7ba9c31
Merge pull request #40123 from kevingranade/fix-iteminfo-crafting-test
ZhilkinSerg May 4, 2020
5ed7427
CFRelease CFString objects
akirashirosawa May 4, 2020
6d444b8
Make point and tripoint abs functions into methods. (#40106)
kevingranade May 4, 2020
6f79dc9
Merge pull request #40094 from Qrox/migrate-ui-12
ZhilkinSerg May 4, 2020
7780822
Merge pull request #40131 from akirashirosawa/fix-macos-memory-leak
ZhilkinSerg May 4, 2020
a7a3646
Expand sorting check to std::sort calls
jbytheway Apr 30, 2020
ce441bf
Sort achievements by name, not description
jbytheway Apr 30, 2020
76cf8b6
Remove unnecessary '/' character
jbytheway Apr 30, 2020
4402b90
Suppress warning on sorting directory names
jbytheway Apr 30, 2020
8ca7f94
Convert some std::sort calls to localized_compare
jbytheway Apr 30, 2020
f16e8e2
Audit Marlin 1895 SBL
TheShadowFerret May 1, 2020
1ac1a33
Audit Magnum Research BFR
TheShadowFerret May 1, 2020
a247f84
Audit 1874 Sharps Rifle
TheShadowFerret May 1, 2020
20bdfee
[DinoMod] Create recipe_food.json
LyleSY May 4, 2020
11714a3
Add support for damage overtime and move super healing from panacea t…
Fris0uman May 4, 2020
8b4a4e2
Cannibalism and demihumans (#38313)
Maleclypse May 4, 2020
5de957a
Falling into deep water deals less damage (#39903)
int-ua May 4, 2020
d552434
Merge pull request #40141 from LyleSY/patch-1
ZhilkinSerg May 4, 2020
c1b8853
Add survivor car to survivor camp (#40021)
Pupsi-Mupsi May 4, 2020
70f064a
Update ws_fire_lookout_tower.json (#40033)
kevingranade May 4, 2020
3928c8f
Add FS2000(plus STANAG mag volume update) (#36838)
May 4, 2020
2d5cca7
Ask for confirmation on eating raw meat
RipleyTom Apr 25, 2020
f97e96a
Merge pull request #40060 from LaVeyanFiend/GunVolume4570
kevingranade May 4, 2020
e635446
Merge pull request #40041 from jbytheway/enforce_localized_sorting_2
kevingranade May 4, 2020
6d45131
more modernisation
Soup-de-Loop Feb 7, 2020
b8d5c26
Update blob_turret.json
Soup-de-Loop Feb 7, 2020
b5fa5f0
Refactor diamond and vortex stuff
Soup-de-Loop Feb 10, 2020
de7e55d
Replace gelectrode, minor fixes
Soup-de-Loop Feb 15, 2020
522a2be
remove leadworks turrets
Soup-de-Loop Mar 13, 2020
833bfab
rebase old blazemod PR
Soup-de-Loop May 12, 2020
2aaa273
Merge branch 'soupdeloop-blazemod' of https://github.com/Soup-de-Loop…
Soup-de-Loop May 12, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,670 changes: 0 additions & 1,670 deletions data/mods/blazemod/blaze_autoweapons_parts.json

This file was deleted.

1,305 changes: 0 additions & 1,305 deletions data/mods/blazemod/blaze_blob.json

This file was deleted.

1,760 changes: 0 additions & 1,760 deletions data/mods/blazemod/blaze_blob_parts.json

This file was deleted.

195 changes: 0 additions & 195 deletions data/mods/blazemod/blaze_other.json

This file was deleted.

127 changes: 0 additions & 127 deletions data/mods/blazemod/blaze_override.json

This file was deleted.

Loading