Commit Graph

56414 Commits

Author SHA1 Message Date
paul_snoops
feaa0a63f4 modern 2022-04-10 16:22:28 +01:00
paul_snoops
d972b3c50c pioneer 2022-04-10 16:22:28 +01:00
paul_snoops
06845ebf51 name changes part 2 2022-04-10 16:22:27 +01:00
paul_snoops
acb83884c9 historic and alchemy 2022-04-10 16:22:26 +01:00
paul_snoops
6b5c86a677 blocks and new standard 2022-04-10 16:22:24 +01:00
paul_snoops
725566ff00 "Historic" formats re-work - Name tidy 2022-04-10 16:22:24 +01:00
Anthony Calosa
ac05891bf5 Merge branch 'kevlahnota-master-patch-90262' into 'master'
Update towashi_guide_bot.txt

See merge request core-developers/forge!6514
2022-04-10 12:28:39 +00:00
Anthony Calosa
0253caa2ac Update towashi_guide_bot.txt 2022-04-10 12:28:22 +00:00
Anthony Calosa
b7b5cf57b9 Merge branch 'NewMaster' into 'master'
fix New Game+ button on Portrait Mode

See merge request core-developers/forge!6513
2022-04-10 12:19:00 +00:00
Anthony Calosa
da4b9976ec fix New Game+ button on Portrait Mode 2022-04-10 20:18:12 +08:00
Anthony Calosa
a0bc78b633 Merge branch 'master' into 'master'
Adventure map fixes.

See merge request core-developers/forge!6512
2022-04-10 12:16:22 +00:00
Magpie
f28e907fbb Adventure map fixes.
Case sensitivity issues and some wrong names.
2022-04-10 08:56:53 +02:00
Anthony Calosa
47062b4b70 Merge branch 'kevlahnota-master-patch-02394' into 'master'
remove unused import

See merge request core-developers/forge!6510
2022-04-10 03:50:06 +00:00
Anthony Calosa
b7aab46134 remove unused import 2022-04-10 03:47:17 +00:00
Anthony Calosa
32a71f7d3a Merge branch 'master' into 'master'
Adventure fixes.

See merge request core-developers/forge!6509
2022-04-10 03:41:47 +00:00
Magpie
55362a9e79 Adventure fixes 3.
Use MyRandom for RNG.
2022-04-10 05:25:17 +02:00
Anthony Calosa
3408123302 Merge branch 'archfix' into 'master'
Fix Archangel of Strife

See merge request core-developers/forge!6508
2022-04-10 03:15:04 +00:00
Magpie
8e6a1ca046 Adventure fixes 2.
Adds a constant for Adventure mode folder, so it's consistent on Linux due to case sensitivity.
2022-04-10 04:29:30 +02:00
Magpie
c83031ed8b Adventure fixes.
Fixes loading of PoIs (Points of Interest) by making a list and picking one.
Fixes Green Castle boss.
2022-04-10 03:55:35 +02:00
tool4EvEr
3e020237b5 Fix Archangel of Strife 2022-04-09 22:32:04 +02:00
Michael Kamensky
990f691fe3 Merge branch 'adventure' into 'master'
added new game+

See merge request core-developers/forge!6506
2022-04-09 04:07:38 +00:00
Michael Kamensky
34a123e1f6 Merge branch 'snc_8_april' into 'master'
SNC - 08 April

See merge request core-developers/forge!6503
2022-04-09 04:07:17 +00:00
Michael Kamensky
96af83c414 Merge branch 'dayfix' into 'master'
Fix The Celestus overpowering Angel of Eternal Dawn

See merge request core-developers/forge!6505
2022-04-09 04:07:01 +00:00
Michael Kamensky
53e3899f95 Merge branch 'snc_8' into 'master'
SNC - 8 Apr II

See merge request core-developers/forge!6504
2022-04-09 04:06:38 +00:00
Tim Mocny
bd4958f323 SNC - 8 Apr II 2022-04-09 04:06:36 +00:00
Grimm
7fa4bab499 added new game+ 2022-04-09 01:02:40 +02:00
paul_snoops
0ac952c35f SNC edition 2022-04-08 20:33:28 +01:00
tool4EvEr
ce73613f53 Fix The Celestus overpowering Angel of Eternal Dawn 2022-04-08 20:55:51 +02:00
paul_snoops
67ec2b6633 fixes 2022-04-08 17:45:57 +01:00
paul_snoops
0998739254 fixes 2022-04-08 17:45:57 +01:00
paul_snoops
0dda6c6f70 incriminate,ziatora_the_incinerator 2022-04-08 17:45:57 +01:00
paul_snoops
70d0da7fa1 couriers_briefcase,ledger_shredder,maestros_theater,nimble_larcenist 2022-04-08 17:45:57 +01:00
paul_snoops
4d99a756c7 devilish_valet,gala_greeters,rumor_gatherer 2022-04-08 17:45:56 +01:00
paul_snoops
53d2a04243 halo_fountain.txt 2022-04-08 17:45:56 +01:00
paul_snoops
8b1f64a54d WIP: SNC - 08 April 2022-04-08 17:45:56 +01:00
Bug Hunter
56450b564c Merge branch 'bc' into 'master'
SNC: brokers_charm.txt

See merge request core-developers/forge!6500
2022-04-08 14:10:43 +00:00
Tim Mocny
6c1782ba6e SNC: brokers_charm.txt 2022-04-08 14:10:42 +00:00
Michael Kamensky
3bad5ff0db Merge branch 'rebalanced_blood_artist' into 'master'
Rebalanced Blood Artist and other changes

See merge request core-developers/forge!6494
2022-04-08 11:54:05 +00:00
Michael Kamensky
859d73d674 Merge branch 'formats_folder' into 'master'
Change custom formats path.

See merge request core-developers/forge!6497
2022-04-08 11:53:47 +00:00
Paul Hammerton
d0a09559e8 Merge branch 'snc_ncc_edition_updates' into 'master'
SNC and NCC edition updates

See merge request core-developers/forge!6502
2022-04-08 07:49:00 +00:00
paul_snoops
f22b7b75a8 SNC and NCC edition updates 2022-04-08 08:08:35 +01:00
Anthony Calosa
268a136c50 Merge branch 'NewMaster' into 'master'
fix green castle

See merge request core-developers/forge!6501
2022-04-07 17:07:46 +00:00
Anthony Calosa
9f51aeee2a fix green castle 2022-04-08 01:06:04 +08:00
Anthony Calosa
6c041a452b Merge branch 'NewMaster' into 'master'
Allow to load old saves to fail to regenerate a new correct world

See merge request core-developers/forge!6499
2022-04-07 15:50:14 +00:00
Anthony Calosa
4571edd9d1 Allow to load old saves to fail to regenerate a new correct world 2022-04-07 23:46:47 +08:00
Bug Hunter
4d132f03c5 Merge branch 'TRT-master-patch-24292' into 'master'
Update forge-gui/res/cardsfolder/h/horde_of_notions.txt

See merge request core-developers/forge!6498
2022-04-07 15:17:41 +00:00
Bug Hunter
a3c38b58bb Update forge-gui/res/cardsfolder/h/horde_of_notions.txt 2022-04-07 15:17:08 +00:00
Anthony Calosa
78744ded60 Merge branch 'master' into 'master'
Some Adventure improvements and tweaks.

See merge request core-developers/forge!6496
2022-04-07 14:12:52 +00:00
Paul Hammerton
c0afa686cc Update Jumpstart.txt 2022-04-07 12:14:41 +00:00
Magpie
d687088fd8 Quick fixes.
Made text wrap in item descriptions and reverted a test item.
2022-04-07 12:22:51 +02:00