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

aaa #2

Closed
wants to merge 275 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
275 commits
Select commit Hold shift + click to select a range
fd6b196
Backporting #49534 Made Tea batch crafting mod equal to boiling plain…
ZhilkinSerg Aug 14, 2021
7772c17
Backporting #49513 Fix Cut Logs faction camp mission difficulty disp.
ZhilkinSerg Aug 14, 2021
376d6e7
Backporting #49318 Ignore pocket settings when manually inserting sta…
ZhilkinSerg Aug 14, 2021
564a690
Backporting #49550 Colt Delta Damage
ZhilkinSerg Aug 14, 2021
6499b6d
Backporting #49734 Reduce solder in electronics control unit from 150…
ZhilkinSerg Aug 14, 2021
c36b12a
Backporting #49303 Adjust Burrowing mutation's description/effects
ZhilkinSerg Aug 14, 2021
4cc95c1
Backporting #48637 Fix fur/scales loop in Chimera
ZhilkinSerg Aug 14, 2021
c0290c0
Backporting #49596 Roof and general improvements for orchard_apple
ZhilkinSerg Aug 14, 2021
5b5418d
Backporting #48827 Replace MREs with itemgroups
ZhilkinSerg Aug 14, 2021
01cb581
Backporting #49512 Reworked brewing, now with merge conflicts resolved
ZhilkinSerg Aug 14, 2021
4211d63
Backporting #48960 Fix various meaty comestibles' vitamin values
ZhilkinSerg Aug 14, 2021
23a1cdd
Backporting #49760 Improve error message re armor portions
ZhilkinSerg Aug 14, 2021
7c89846
Backporting #49380 10mm adheres to GAME_BALANCE.md
ZhilkinSerg Aug 14, 2021
2eab49c
Backporting #49109 fix feints and lightly clean up some miss recovery…
ZhilkinSerg Aug 14, 2021
ba21f23
Backporting #47986 Populated Bone Skewers into recipes, made Skewers …
ZhilkinSerg Aug 14, 2021
3e1f17f
Backporting #49762 Change recipe sort to difficulty, name, crafting time
ZhilkinSerg Aug 14, 2021
9c3b8f2
Backporting #49279 Remove additional spawns from Wander Hordes
ZhilkinSerg Aug 14, 2021
0b3fc41
Backporting #45584 Balance tactical helmets
ZhilkinSerg Aug 14, 2021
a24052b
Backporting #49759 Fix CBM install data retrieval when installing CBM…
ZhilkinSerg Aug 14, 2021
ea26b17
Backporting #49778 Force place_special_forced to place special in for…
ZhilkinSerg Aug 14, 2021
46bea9c
Backporting #49799 Fix healthy rounding bug
ZhilkinSerg Aug 14, 2021
42c105e
Backporting #49758 Make cooking oil unhealthy
ZhilkinSerg Aug 14, 2021
52d66a6
Backporting #49794 Move workshop toolbox recipe to containers tab
ZhilkinSerg Aug 14, 2021
d55e25c
Backporting #49751 Correct monster_size_capacity to creature_size_cap…
ZhilkinSerg Aug 14, 2021
9f0d802
Backporting #48651 [Magiclysm] Can't cast if Stunned
ZhilkinSerg Aug 14, 2021
cf1ed0e
Backporting #48078 [Magiclysm] Add mutations to manatouched
ZhilkinSerg Aug 14, 2021
af57ba3
Backporting #49844 Correct the plural name of 'mana infused blood'
ZhilkinSerg Aug 14, 2021
e18a3ff
Backporting #48746 [Magiclysm] Leprechaun adjustments
ZhilkinSerg Aug 14, 2021
dd13624
Backporting #49217 [Magiclysm] More magical loot in wizard towers
ZhilkinSerg Aug 14, 2021
4d167d0
Backporting #49729 Sword cane should fit in the hollow cane
ZhilkinSerg Aug 14, 2021
febf03a
Backporting #49764 Reordered magazine type for M17/M18
ZhilkinSerg Aug 14, 2021
6c73abf
Backporting #49613 Changed time and energy to create a washboard.
ZhilkinSerg Aug 14, 2021
37cb201
Backporting #49871 Makes flammable arrow components reflect the damage.
ZhilkinSerg Aug 14, 2021
be03766
Backporting #49883 Increased volume and length of western holster to …
ZhilkinSerg Aug 14, 2021
91de948
Backporting #49861 fix meatarian/vegetarian text
ZhilkinSerg Aug 14, 2021
c063bc4
Backporting #49805 Fix weight of wild yeast
ZhilkinSerg Aug 14, 2021
0ef9119
Backporting #49904 Fix weapons dropping without message on reload
ZhilkinSerg Aug 14, 2021
d7bc6e9
Backporting #49934 Allow MISSION_FREE_MERCHANTS_HUB_DELIVERY_1 to com…
ZhilkinSerg Aug 14, 2021
889cbed
Backporting #49946 Remove TRADER_AVOID flag from mre containers
ZhilkinSerg Aug 14, 2021
fbb5a54
Backporting #49931 Hide vehicle UI when pouring on the ground
ZhilkinSerg Aug 14, 2021
7e8a026
Backporting #49962 fixed reload times of guns
ZhilkinSerg Aug 14, 2021
426e239
Backporting #49442 Change Hobo Stove to deployable furniture
ZhilkinSerg Aug 14, 2021
9e07fe4
Backporting #49997 Use positional arguments for 'It should take %d mi…
ZhilkinSerg Aug 14, 2021
80b8887
Backporting #50003 Chainlink fence posts now require pipe fittings to…
ZhilkinSerg Aug 14, 2021
8b19e25
Backporting #48662 When telling NPCs to read something, include all c…
ZhilkinSerg Aug 14, 2021
f4a6024
Backporting #50032 Changed Humvee jerrycans to use JP8 fuel (#50008)
ZhilkinSerg Aug 14, 2021
3896380
Backporting #49995 Fix ammo capitalization
ZhilkinSerg Aug 14, 2021
573aea9
Backporting #49919 [Dinomod] Duplicate entry caused CTD
ZhilkinSerg Aug 14, 2021
417ee01
Backporting #49879 Dogs zombify
ZhilkinSerg Aug 14, 2021
c250845
Backporting #49957 Improve chance to find hidden lab in MISSION_SCIEN…
ZhilkinSerg Aug 14, 2021
35d7289
Backporting #48930 Butchering use best tool in crafting radius
ZhilkinSerg Aug 14, 2021
9ae4fd4
Backporting #49377 Prevent overmap mongroups from spawning on top of …
ZhilkinSerg Aug 14, 2021
1a5545a
Backporting #50043 Hatchets aren't melee durable
ZhilkinSerg Aug 14, 2021
1557248
Backporting #49949 Prevent UB passing 0 to LIGHT_RANGE
ZhilkinSerg Aug 14, 2021
3741814
Backporting #50044 Change stone chopper requirement from fab (3) to f…
ZhilkinSerg Aug 14, 2021
cc47a76
Backporting #50061 Changed morphine description to naturally occurrin…
ZhilkinSerg Aug 14, 2021
2df3253
Backporting #50053 Require hemostatic powder to require *powdered* ch…
ZhilkinSerg Aug 14, 2021
5f74856
Backporting #50006 vehicles: helicopters do not have 100% load in idle()
ZhilkinSerg Aug 14, 2021
06f2210
Backporting #50086 Update cordage and cordage ropes crafting time.
ZhilkinSerg Aug 14, 2021
105d897
Backporting #50096 Added batch cook times to Granola and Cookies (#50…
ZhilkinSerg Aug 14, 2021
b7decca
Backporting #50046 Recompute overmap::safe_at_worldgen during unseria…
ZhilkinSerg Aug 14, 2021
718816c
Backporting #50114 Fix disappearance of CRIT vest on activation
ZhilkinSerg Aug 14, 2021
9b52ea2
Backporting #48462 Colorize spells in spellbooks
ZhilkinSerg Aug 14, 2021
6f5e946
Backporting #47257 Stand up peek
ZhilkinSerg Aug 14, 2021
c2ac25e
Backporting #48794 Ability to configure user-defined map extra symbols
ZhilkinSerg Aug 14, 2021
5a8be3a
Backporting #50074 Check skill requirements for vehicle most_repairab…
ZhilkinSerg Aug 14, 2021
09f9e52
Backporting #50165 Added condom to item restriction on travel wallet …
ZhilkinSerg Aug 14, 2021
5567139
Backporting #50182 Fix wind not updating
ZhilkinSerg Aug 14, 2021
cfbbeee
Backporting #50134 Modified mass ratio of sheep wool on harvest to gi…
ZhilkinSerg Aug 14, 2021
1931f38
Backporting #50180 Fix multitile variations
ZhilkinSerg Aug 14, 2021
2bb04c9
Backporting #50132 Fix armor pen from martial arts buffs not working
ZhilkinSerg Aug 14, 2021
d06496c
Backporting #49595 Target to Mac OS X 10.12+ in release build workflow
ZhilkinSerg Aug 14, 2021
b0c0d52
Backporting #49593 Raise the proportional AP value of handloaded 5.7mm
ZhilkinSerg Aug 14, 2021
d875153
Backporting #50107 [Aftershock] Increase volume/weight of lichen, fix…
ZhilkinSerg Aug 14, 2021
b9b7f36
Backporting #50170 Add permeable flag to appropriate windows
ZhilkinSerg Aug 14, 2021
76eff7b
Backporting #50243 Add Boxing to Self-Defense Classes
ZhilkinSerg Aug 14, 2021
3096e24
Backporting #49769 Remove CROWS turrets from irradiator overmap special
ZhilkinSerg Aug 14, 2021
a7521fb
Backporting #50184 [DinoMod] wilderness spawn counts and fixes
ZhilkinSerg Aug 14, 2021
31a9445
Backporting #50230 Bondage mask layer mismatch
ZhilkinSerg Aug 14, 2021
ee7d7eb
Backporting #50272 Display kicking monster name
ZhilkinSerg Aug 14, 2021
46fa896
Backporting #50222 Fix layer ordering of demon skin
ZhilkinSerg Aug 14, 2021
3deb02e
Backporting #50216 ASCII tileset QoL changes
ZhilkinSerg Aug 14, 2021
e92e3de
Backporting #49953 Serialize moves_total
ZhilkinSerg Aug 14, 2021
587c439
Backporting #48864 Don't add magazines to all guns, don't show '(empt…
ZhilkinSerg Aug 14, 2021
217e48e
Backporting #50100 Fix resuming mass disassembly not working
ZhilkinSerg Aug 14, 2021
513313a
Backporting #50403 fix strong stomach granting nausea immunity
ZhilkinSerg Aug 14, 2021
eb45251
Backporting #50172 Reduce River weight to under 1k
ZhilkinSerg Aug 14, 2021
8bd75a6
Backporting #50251 Fix NPC claiming to eat FROZEN food without EDIBLE…
ZhilkinSerg Aug 14, 2021
03f35cd
Backporting #50381 Prevent stacking AIM windows when moving NO_UNWIEL…
ZhilkinSerg Aug 14, 2021
4ab2b3e
Backporting #50401 Change armored car to use JP8 (#50252)
ZhilkinSerg Aug 14, 2021
e9e2b65
Backporting #50309 Added barred window with no glass (#48453)
ZhilkinSerg Aug 14, 2021
39fb5db
Backporting #50174 Modified stained glass description to reflect the …
ZhilkinSerg Aug 14, 2021
f8374c8
Backporting #50353 Fixed safe spawning on top of shrub in one of the …
ZhilkinSerg Aug 14, 2021
e89cfd8
Backporting #50416 set number to 1 if no charges
ZhilkinSerg Aug 14, 2021
5da5a0b
Backporting #50240 Fix inconsistencies on all sleeveless dusters
ZhilkinSerg Aug 14, 2021
0edac6e
Backporting #50371 Update Crowbars with DURABLE_MELEE
ZhilkinSerg Aug 14, 2021
aac395c
Backporting #50443 [DinoMod] dinos don't hear great
ZhilkinSerg Aug 14, 2021
ad514d1
Backporting #50000 Bugfixes 'Port fix for 'phantom fuel' from Catacly…
ZhilkinSerg Aug 14, 2021
b652f34
Backporting #50460 Modified the Batwing Zombie Description (#50383)
ZhilkinSerg Aug 14, 2021
444a03c
Backporting #50536 Fishing spears can be stored in spear strap
ZhilkinSerg Aug 14, 2021
2c22bb5
Backporting #50543 Avoid division-by-zero in lerped_multiplier
ZhilkinSerg Aug 14, 2021
ac0566e
Backporting #50525 Fixes crash during save due to invalid ammo_location
ZhilkinSerg Aug 14, 2021
a747ab6
Backporting #50508 Balance 'Rebar cage breaks into concrete floor, no…
ZhilkinSerg Aug 14, 2021
443fd2a
Backporting #50471 Atomic headlamp should not have DURABLE_MELEE
ZhilkinSerg Aug 14, 2021
1e8c6ac
Backporting #50556 Make ironshod quarterstaff looks like quarterstaff
ZhilkinSerg Aug 14, 2021
f769731
Backporting #50555 Add missing dot and the end of the sencence
ZhilkinSerg Aug 14, 2021
6c0bb4c
Backporting #50487 Audit lawn mower length
ZhilkinSerg Aug 14, 2021
da9d9d5
Backporting #50448 Prevent display of martial arts traits as traits
ZhilkinSerg Aug 14, 2021
6ea3bbb
Backporting #50550 Avoid placing hospitals in the woods during MISSIO…
ZhilkinSerg Aug 14, 2021
007f136
Backporting #50564 cmake: don't use PREFIX variable
ZhilkinSerg Aug 14, 2021
33f911e
Backporting #50562 cmake: install core and help directories
ZhilkinSerg Aug 14, 2021
8c63794
Backporting #50528 random cosmetic traits respect scenario (#50224)
ZhilkinSerg Aug 14, 2021
b7f19fe
Backporting #50385 Spawn correct underwear for female True Foodperson
ZhilkinSerg Aug 14, 2021
21c9e66
Backporting #50494 Fix the mission 'Visit the Isherwoods' that was im…
ZhilkinSerg Aug 14, 2021
4c7c136
Backporting #50478 Clarify the mission descriptions in the pizzaiolo …
ZhilkinSerg Aug 14, 2021
fc2858f
Backporting #50588 Fix the wooden privacy gate name
ZhilkinSerg Aug 14, 2021
aca8518
Backporting #50581 cmake: set RELEASE variable to generate install ta…
ZhilkinSerg Aug 14, 2021
d23d0a6
Backporting #50546 Avoid crashing when the player's gun is destroyed …
ZhilkinSerg Aug 14, 2021
4bfa503
Backporting #50607 Fixed density of legume products
ZhilkinSerg Aug 14, 2021
059e11a
Backporting #50598 Camp NPCs will refuse to eat inedible animal food
ZhilkinSerg Aug 14, 2021
c3df285
Backporting #50602 Add a crafting recipe for skirts
ZhilkinSerg Aug 14, 2021
2a5958a
Backporting #50601 Fix Bathroom scale symbol
ZhilkinSerg Aug 14, 2021
f95dc0c
Backporting #50620 iwyu cuboid_rectangle.h
ZhilkinSerg Aug 14, 2021
33753c8
Backporting #50616 Add repairs_like to runner pack
ZhilkinSerg Aug 14, 2021
855f7f5
Backporting #50618 Billous Soldier Zombie acid-attack description fix
ZhilkinSerg Aug 14, 2021
f0a6766
Backporting #50610 Fix duplicate unitfont.ttf in config/fonts.json
ZhilkinSerg Aug 14, 2021
5a34702
Backporting #50609 Disable Terminus.ttf on Mac
ZhilkinSerg Aug 14, 2021
d5b87fb
Backporting #50606 Backport BN's MSVC sound fix
ZhilkinSerg Aug 14, 2021
0dddd5f
Backporting #50547 Do not remove vehicle label when canceling input
ZhilkinSerg Aug 14, 2021
58ccc0a
Backporting #50646 Recolor the blackjack oak
ZhilkinSerg Aug 14, 2021
70df41c
Backporting #50577 Fixed unpack leaving containers invalid
ZhilkinSerg Aug 14, 2021
af75733
Add missing flag
ZhilkinSerg Aug 15, 2021
8c7366e
Remove excessive flag
ZhilkinSerg Aug 16, 2021
4047cbb
Backporting #50877 Catch SecurityException in SDL getSerialNumber
ZhilkinSerg Aug 31, 2021
8d4ab32
Backporting #50452 Fix dropping worn items from AIM
ZhilkinSerg Aug 31, 2021
54eb564
Backporting #50814 Prevent endless loop during butchering
ZhilkinSerg Aug 31, 2021
58b9625
Backporting #51035 Resolve a bug in partial stack dropping/using and …
ZhilkinSerg Aug 31, 2021
bd09f28
Backporting #51147 Fix crash resulting from NPC activity migration (l…
ZhilkinSerg Aug 31, 2021
a1c1be5
Update 0.F translations
BrettDong Sep 2, 2021
6b031ae
Update 0.F translations (#51742)
BrettDong Sep 20, 2021
4d9914c
Update 0.F translations (#53037)
BrettDong Nov 26, 2021
f1cfff8
Backporting #47253 Unlimited map memory
BrettDong Nov 26, 2021
cc20c94
Backporting #49906 Return an invalid mm_submap if the map_memory is n…
BrettDong Nov 26, 2021
9fee330
Backporting #50360 Handle window events during long operations
BrettDong Nov 26, 2021
289696c
Backporting #49772 Autodrive v2
BrettDong Nov 26, 2021
09b0ff2
Backporting #50637 Offroad autodrive
BrettDong Nov 26, 2021
1439253
Backporting #50695 Overmap path fixes
BrettDong Nov 26, 2021
935f08d
Backporting #50670 Make autowalk more like autodrive
BrettDong Nov 26, 2021
adde31e
Backporting #50803 Render one frame per turn during autodrive
BrettDong Nov 26, 2021
fd74395
Backporting #50835 Improved overmap pathfinding in 3D
BrettDong Nov 26, 2021
25590f4
Remove strong stomach section of effects test
anothersimulacrum Aug 2, 2021
8ed5ce4
Add translations for the new auto drive system
BrettDong Nov 26, 2021
a7edd2c
Backporting #53019 Fix pathfinding hash functions for 32-bit systems
BrettDong Nov 27, 2021
6487fb5
Backporting #51580 Fix stair navigation
BrettDong Nov 27, 2021
b9e47b6
Backporting #51257 Allow multitile sprites to be animated
BrettDong Nov 27, 2021
44be7a3
Backporting #51407 Workaround for heavy slowdown caused by eager eval…
BrettDong Nov 27, 2021
9717911
Backporting #52133 Verify font can be rendered successfully at runtime
BrettDong Nov 27, 2021
5140ff9
Backporting #51385 Fix bug when grabbing a vehicle
BrettDong Nov 27, 2021
ad0a57d
Backporting #51287 Animated background
BrettDong Nov 27, 2021
a1d3ee8
Backporting #51458 Add the "mayfail" flag to the fire spreading test
BrettDong Nov 27, 2021
c0089f6
Backporting #51439 Display name of loaded ammo instead of ammo type
BrettDong Nov 27, 2021
a1bcf20
Backporting #51447 Change item list highlight color to white
BrettDong Nov 27, 2021
55758b8
Backporting #51710 Reset whitelist flag on scenario blacklist reset
BrettDong Nov 27, 2021
bc3cd26
Backporting #51711 Reset scenarios unconditionally
BrettDong Nov 27, 2021
c9d5737
Backporting #52413 Fix tabbing in character creation saving info
BrettDong Nov 27, 2021
f7eb341
Backporting #51199 Fix horde indicators showing in elements outside o…
BrettDong Nov 27, 2021
7c0357d
Backporting #51100 Fix clerical errors about Demihuman
BrettDong Nov 27, 2021
c54f141
Backporting #51519 Fix poppies unharvestable in Dark Skies mod
BrettDong Nov 27, 2021
8c653d2
Backporting #51406 Make Gozu and Amigara yield demihuman meat
BrettDong Nov 27, 2021
7d100dd
Backporting #51131 Adds missing knives to the Krav Maga list
BrettDong Nov 27, 2021
f7c4c23
Backporting #49828 Fix health test
BrettDong Nov 27, 2021
91a528e
Backporting #50881 Silence warnings reported from inside SDL header
BrettDong Nov 27, 2021
67c9272
Backporting #50834 Added fruit as a material in fruit wine
BrettDong Nov 27, 2021
ac38b1e
Fix compile error from backporting #47253 Unlimited map memory
BrettDong Nov 27, 2021
7606834
Backporting #50760 Fix for WEBWALK flag
BrettDong Nov 27, 2021
4e5233e
Backporting #50933 Fix siphon from and fill to the same tank
BrettDong Nov 27, 2021
8e58c8f
Revert Terminus blacklist on Mac (#50609)
BrettDong Oct 1, 2021
0e6679d
Backporting #51498 Make paper soft so it will fit in small pockets
BrettDong Nov 27, 2021
9799bea
Backporting #51441 If want successful test output, include messages
BrettDong Nov 27, 2021
539d1c2
Backporting #51295 Limit zombie_fuse, other size change to within tin…
BrettDong Nov 27, 2021
dfe37d4
Backporting #51411 Adjust cannibal trait cost
BrettDong Nov 27, 2021
5b7b0b2
Backporting #51250 Capping shakes duration to prevent month-long shak…
BrettDong Nov 27, 2021
0d755db
Backporting #51136 Fix spammy warning in string_formatter.h when usin…
BrettDong Nov 27, 2021
4c58201
Backporting #51096 Prevent inserting an item with NO_UNWIELD into a c…
BrettDong Nov 27, 2021
57af603
Backporting #51086 In crafting every tool is displayed only once
BrettDong Nov 27, 2021
7e14402
Backporting #51129 Fix infinitely falling vehicle
BrettDong Nov 27, 2021
1048093
Backporting #51226 Fix choppy vehicle animation
BrettDong Nov 27, 2021
4547c69
Backporting #51124 Street facing churches
BrettDong Nov 27, 2021
2d42991
Backporting #51220 Ice cream is edible frozen
BrettDong Nov 27, 2021
9ca0b05
Backporting #51227 Fix: inedible MELTS while FROZEN (milkshake)
BrettDong Nov 27, 2021
51f819f
Backporting #51205 A few microoptimizations
BrettDong Nov 27, 2021
100ccda
Backporting #51275 Iridescent cats now visible at night
BrettDong Nov 27, 2021
9e3c288
Backporting #51262 Fix sealed containers being targets for pickup act…
BrettDong Nov 27, 2021
600a2ed
Backporting #51319 Fixed Filter Paper Always Hitting
BrettDong Nov 27, 2021
b92facb
Backporting #51282 Invalidate weight carried cache
BrettDong Nov 27, 2021
2bb3708
Backporting #51362 Add DESTROYS, PUSH_MON to albertosaurus
BrettDong Nov 27, 2021
698ecfd
Backporting #51460 Actually throttle monster thinking
BrettDong Nov 27, 2021
16f47f5
Backporting #51381 Fix NC_JUNK_SHOPKEEP item list
BrettDong Nov 27, 2021
8320c3d
Backporting #51529 Make monster::power_rating() use is_ranged_attacker()
BrettDong Nov 27, 2021
fb00770
Backporting #51524 Fix eating demihuman not affecting morale
BrettDong Nov 27, 2021
ba65d73
Backporting #51754 Fix: Force stereo when opening audio device
BrettDong Nov 27, 2021
9c8fd03
Backporting #51911 Don't allow swapping places with NPC while grabbin…
BrettDong Nov 27, 2021
edb0ef5
Backporting #52063 Fix NPCs cannot climb chickenwire fences but playe…
BrettDong Nov 27, 2021
d8682b4
Backporting #52010 Fix insect flesh vitamins
BrettDong Nov 27, 2021
46e0eb9
Backporting #52257 Fragile television
BrettDong Nov 27, 2021
8f53b24
Backporting #52197 Fix crash when getting related recipes with no com…
BrettDong Nov 27, 2021
d384037
Backporting #52247 Fix compile errors on LLVM/Clang 13
BrettDong Nov 27, 2021
c5f9b90
Add translations for backported #51096, #51100, #51911
BrettDong Nov 27, 2021
fb7ce81
Backporting #52656 Fix compile error on LLVM/Clang 13
BrettDong Nov 27, 2021
d6b7274
backporting tilesets from I-am-Erk/CDDA-Tilesets
esotericist Nov 27, 2021
9adb9a7
Backporting #50021 Translate monster death function messages
BrettDong Nov 27, 2021
54113a5
Backporting #52243 Add missing translation in aiming UI
BrettDong Nov 27, 2021
32943e7
Backporting #52289 Add omitted translation calls
BrettDong Nov 27, 2021
c83633d
Backporting #52356 Add more missing translations
BrettDong Nov 27, 2021
58f5dd5
Backporting #52580 Fix an untranslated message in ATM deposit menu
BrettDong Nov 27, 2021
3841434
Backporting #52612 Fix more untranslated messages
BrettDong Nov 27, 2021
5decd88
Add translations for backported translation bugfixes
BrettDong Nov 27, 2021
ef85f3c
Backporting #52847 Remove duplicate ATM spawn from movie theater palette
BrettDong Nov 27, 2021
69d80c6
Can succesfully build and emrun, but errors on start.
rameshvarun Nov 26, 2022
eec057e
Don't start fullscreen on emscripten.
rameshvarun Nov 26, 2022
c28553c
Emscripten user directory
rameshvarun Nov 26, 2022
f317786
Some stuff working
rameshvarun Nov 26, 2022
328998c
Can now browse main menu
rameshvarun Nov 26, 2022
179d8c2
Keep exceptions
rameshvarun Nov 26, 2022
2b28c96
Can browse main menu, but can't launch game.
rameshvarun Nov 26, 2022
f5e74f6
Can generate world but then runs into exceptions.
rameshvarun Nov 26, 2022
4ed08b0
Re-add exception message tool
rameshvarun Nov 26, 2022
ce75b49
Don't link libraries normally on Emscripten
rameshvarun Nov 26, 2022
1d84b02
Works on Firefox
rameshvarun Nov 27, 2022
c8ca59f
Load data from IDBFS
rameshvarun Nov 27, 2022
42e33c1
For now disable HighDPI support, which makes the game a little blurry
rameshvarun Nov 27, 2022
68d6fdd
Custom HTML page.
rameshvarun Nov 27, 2022
cf3633c
HTML changes
rameshvarun Nov 27, 2022
0b6dd29
Increase stack trace limit
rameshvarun Nov 28, 2022
d64cffe
Works on Chrome
rameshvarun Nov 28, 2022
6c7d533
Show loading progress
rameshvarun Nov 28, 2022
e168c1e
Saving / loading now works.
rameshvarun Nov 28, 2022
11b3594
Prepare web build scripts
rameshvarun Nov 28, 2022
cc17ab9
Resizing sort of works, but crashes under some aspect ratios.
rameshvarun Nov 28, 2022
7b2db37
Add min-width and min-height to prevent crashing on menu layout code.
rameshvarun Nov 28, 2022
656e305
Can't quit in emscripten version.
rameshvarun Nov 28, 2022
3bbd0be
Support high-dpi using a CSS hack. Probably better to fix this at som…
rameshvarun Nov 28, 2022
4a83301
Basic save exporting
rameshvarun Nov 29, 2022
7351d35
Added a menu for toggling fullscreen and exporting save files.
rameshvarun Nov 29, 2022
671dd15
Use LZ4 compression on data bundle.
rameshvarun Nov 29, 2022
c832e93
Add github link
rameshvarun Nov 29, 2022
3b77983
Strip out some tilesets and obsolete mods in the web build;
rameshvarun Nov 29, 2022
056af62
Web meta info
rameshvarun Nov 30, 2022
9444e1f
Updated README.md
rameshvarun Nov 30, 2022
101228e
Update README.md
rameshvarun Dec 13, 2022
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
Prev Previous commit
Next Next commit
Backporting CleverRaven#49279 Remove additional spawns from Wander Ho…
…rdes
  • Loading branch information
ZhilkinSerg committed Aug 14, 2021
commit 9c3b8f26ef11e6903f079cf4e10c2bce2aa7c5d3
16 changes: 0 additions & 16 deletions src/overmap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4373,22 +4373,6 @@ void overmap::place_specials( overmap_special_batch &enabled_specials )

void overmap::place_mongroups()
{
// Cities are full of zombies
for( city &elem : cities ) {
if( get_option<bool>( "WANDER_SPAWNS" ) ) {
if( !one_in( 16 ) || elem.size > 5 ) {
mongroup m( GROUP_ZOMBIE,
tripoint_om_sm( project_to<coords::sm>( elem.pos ), 0 ),
static_cast<int>( elem.size * 2.5 ),
elem.size * 80 );
// m.set_target( zg.back().posx, zg.back().posy );
m.horde = true;
m.wander( *this );
add_mon_group( m );
}
}
}

if( get_option<bool>( "DISABLE_ANIMAL_CLASH" ) ) {
// Figure out where swamps are, and place swamp monsters
for( int x = 3; x < OMAPX - 3; x += 7 ) {
Expand Down