7623 Commits
Author SHA1 Message Date
KittyandGitHub e415201f64 Merge pull request #63 from kitty624/gamedir-dev
[Fix] missing attachment for G36C
2023-09-25 00:36:10 +02:00
kitty624 a28f6dabad [Fix] missing attachment for G36C
item 664, the G36C, has two default attachments defined in items.xml (1746, Folding Stock and 1322, in-build 2x Scope)

It missed 1322 in attachments.xml and  when using the Folding Stock (fold/unfold) it resulted in an error for not finding 1322 attached after the transformation

Added entry for 1322 (in-build 2x Scope) on 664 (G36C) in attachments.xml to fix that
2023-09-25 00:31:39 +02:00
Xiaoxun92andGitHub 4ebae982dd Downgrade startup ini errors to warnings (#229) 2023-09-22 18:10:08 -07:00
sun-alfandGitHub 8a241d277d Merge pull request #228 from 1dot13/master_1dot13
[Fix] One of optimizations in (2482234e) commit is not suitable for M…
2023-09-14 00:37:04 +02:00
sun-alf 5bfd19e5a8 [Fix] One of optimizations in (2482234e) commit is not suitable for MOLLE stuff in 1.13
It is revealed, MOLLE things in 1.13 are configured in XMLs using both NAS and OAS (old attachment system) methods even if NAS is enabled in New Game Options. Given this, logic of SetAttachmentSlotsFlag() cannot be splitted onto NAS and OAS parts, and both Attachment[] and AttachmentPoints must be checked disregarding the NAS option.
2023-09-14 01:04:55 +03:00
KittyandGitHub b7d960ec0e Merge pull request #11 from zwwooooo/master
Chinese translation update(by TBS)
2023-09-11 17:09:12 +02:00
KittyandGitHub 07591e50f5 Merge pull request #225 from zwwooooo/master
Chinese translation update(by TBS)
2023-09-11 17:07:21 +02:00
zwwooooo ea6b214c1d Chinese translation update(by TBS) 2023-09-10 22:42:57 +08:00
zwwooooo 556641377c Chinese translation update(by TBS) 2023-09-10 22:31:47 +08:00
zwwooooo 985dace82e Merge branch 'master' of github.com:1dot13/source 2023-09-10 22:03:41 +08:00
sun-alfandGitHub bb73a458ee Merge pull request #224 from 1dot13/master_1dot13
Master 1dot13
2023-09-10 10:21:03 +02:00
sun-alf f8637e5972 [~] Performance optimizations around Attachment[] and Launchable[] arrays
AIMNAS with its ~50K elements in Attachment[] suffered of performance drop when MOLLE stuff is in the visible inventory. To resolve it the following is done:
* Introduce gMAXATTACHMENTS_READ with actual number of elements in Attachment[]; according refactoring.
* Introduce gMAXLAUNCHABLES_READ with actual number of elements in Launchable[]; according refactoring.
* Introduce std::multimap AttachmentBackmap for quick access to attachments using itemId as a key.
* Sort Attachment[] by attachmentIndex right after loading from XML. According order in XML is not needed anymore.
* Introduce FindAttachmentRange() for quick access to attachments using attachmentId as a key (binary search in Attachment[]).
In a few words, GetHelpTextForItemInLaptop(), ValidAttachment(), SetAttachmentSlotsFlag() were heavily optimized.
2023-09-08 21:58:14 +03:00
sun-alf 4c861e441a [Fix] Revive FPS drawing overlay
To enable built-in FPS, change gbFPSDisplay to SHOW_FULL_FPS (1) in debugger (or change it in src code and rebuild).
2023-09-08 21:58:13 +03:00
FunkyFr3shandGitHub 9c730d5dcf fix low fps issue (#60) 2023-09-07 22:48:40 +03:00
KittyandGitHub 3fa6a4bd45 Merge branch '1dot13:master' into Backgrounds 2023-09-06 03:28:47 +02:00
AsdowandGitHub fc5573f73d Correct check for stance (#222)
Same issue as in commit 23ceb0f
2023-09-05 18:57:40 +03:00
AsdowandGitHub 23ceb0fa4c Fix bug in OCTH prone CTH calculation (by Seven) (#221)
GetToHitBonus() expects BOOLEAN for fProneStance argument, with no comparison to ANIM_PRONE, the ubEndHeight ends up adding bipod bonuses to *all* stances
2023-09-05 17:33:42 +03:00
KittyandGitHub 1c11c88598 Merge branch '1dot13:master' into Backgrounds 2023-09-03 13:36:35 +02:00
rftrdevandGitHub 28aa73a859 Clamp coolness to valid values when generating ARC ammo cache (#220)
Fixes #217
2023-09-02 23:01:17 -07:00
KittyandGitHub cd186a2b1c Merge pull request #218 from andrzejfalkowski/loading-screens-multi-res
Loadscreen - Multiple resolutions and stretch modes
2023-09-02 16:13:52 +02:00
KittyandGitHub ebfa26cd73 Merge pull request #58 from andrzejfalkowski/loading-screens-multi-res
Loadscreen - Multiple resolutions and stretch modes
2023-09-02 16:12:25 +02:00
Andrzej Fałkowski 019b9c4907 Merge branch 'master' into loading-screens-multi-res 2023-08-31 23:29:21 +02:00
Andrzej Fałkowski f2c4a7e0bd Merge branch 'master' into loading-screens-multi-res 2023-08-31 23:29:07 +02:00
kitty624 0962319a43 Fix skill checks for backgrounds during IMP creation
fixed checks for major and minor traits determining available IMP backgrounds

edited disability trait case HEAT INTOLERANT

added case DEAF at disability traits
2023-08-31 02:55:51 +02:00
KittyandGitHub 5740a0af08 Merge pull request #214 from andrzejfalkowski/face-gear-offset-fix
Face gear offset fix
2023-08-30 19:42:55 +02:00
KittyandGitHub 9a46abe394 Merge pull request #215 from kitty624/Backgrounds
Fix character check for backgrounds during IMP creation
2023-08-30 19:40:31 +02:00
kitty624 7910be0ab7 Fix personality check for backgrounds during IMP creation 2023-08-30 19:34:30 +02:00
Andrzej Fałkowski ee3d2472e7 Removed unnecessary offset for face gear 2023-08-29 21:25:14 +02:00
Andrzej FałkowskiandGitHub 7edecd6849 Fixed vehicle body not properly removed when destroyed during ramming (#210) 2023-08-28 16:26:46 +03:00
Andrzej FałkowskiandGitHub d56288e313 Fixed incorrect vehicle group id after reloading the game and vehicle movement plot issues. (#207) 2023-08-28 16:26:34 +03:00
Andrzej FałkowskiandGitHub 3ddacf1a44 Fix vehicles consuming fuel after instant movement cancel (#213) 2023-08-28 16:26:02 +03:00
rftrdevandGitHub 8ec02b2d40 Add version info to main menu (#209) 2023-08-23 01:21:22 -07:00
rftrdevandGitHub 6bae48658e Fix personality check for backgrounds during IMP creation (#208) 2023-08-23 00:34:54 -07:00
KittyandGitHub e15f3c14a0 Merge pull request #57 from kitty624/mercprofiles
added possible nationalities to mercprofiles

- code has more posabilities as comment in header of mercprofiles
- added the missing ones to comment
2023-08-23 06:43:32 +02:00
kitty624 b04c594b35 added possible nationalities to mercprofiles
- code has more posabilities as comment in header of mercprofiles
- added the missing ones to comment
2023-08-23 06:41:59 +02:00
KittyandGitHub 664edef41c Merge pull request #56 from kitty624/ExtraItemsDir
adjustments to ExtraItems

- currently only works on ground-level
- adjusted readme to inform that it doesn't work at  underground levels
- replaced the former example file that happened to be underground with one at groundlevel
2023-08-22 09:45:33 +02:00
kitty624 f5372b8e4f adjustments to ExtraItems
- currently only works on ground-level
- adjusted readme to inform that it doesn't work at  underground levels
- replaced the former example file that happened to be underground with one at groundlevel
2023-08-22 09:44:14 +02:00
KittyandGitHub 7a986cbe92 Merge pull request #55 from kitty624/ExtraItemsDir
Update Extra Sector Items readme.txt
2023-08-22 03:53:50 +02:00
kitty624 7e560bcb30 Update Extra Sector Items readme.txt
- small fix on Extra Items readme
2023-08-22 03:52:27 +02:00
KittyandGitHub 96fbd1564d Merge pull request #54 from kitty624/ExtraItemsDir
Extra Items by difficulty

- sector specific xml that allow to add extra items
- based on difficulty level
- as I understand, it's realtime
- an old forgotten feature, now revived
- added a few examples, nothing realy fancy, just to show the idea
- when novice the stuff is slightly usefull, when insane it's bonkers
- the readme informs about details
2023-08-22 03:01:46 +02:00
kitty624 c15ff19673 Extra Items by difficulty
- sector specific xml that allow to add extra items
- based on difficulty level
- as I understand, it's realtime
- an old forgotten feature, now revived
- added a few examples, nothing realy fancy, just to show the idea
- when novice the stuff is slightly usefull, when insane it's bonkers
- the readme informs about details
2023-08-22 03:00:01 +02:00
KittyandGitHub 28a5c76775 Merge pull request #206 from kitty624/ExtraItems
Update XML.h

- added path to sub-directory for Extra Items
- to avoid cluttering up the parent directory when using this feature
- it allows to place extra items in sector via xml and based on difficulty level
- the new directory "ExtraItems" will contain more details on how-to-use
2023-08-22 00:36:01 +02:00
kitty624 1289c399ce Update XML.h
- added path to sub-directory for Extra Items
- to avoid cluttering up the parent directory when using this feature
- it allows to place extra items in sector via xml and based on difficulty level
- the new directory "ExtraItems" will contain more details on how-to-use
2023-08-22 00:22:20 +02:00
Andrzej FałkowskiandGitHub 1e1d456fd2 Prevent deadlocks due to self-healing interactive spots and self-attacking (#205) 2023-08-21 19:44:02 +03:00
KittyandGitHub dbc799de9d Merge pull request #53 from kitty624/gamedir-dev
Update Items.xml

added usAdministrationModifier-tag to items.xml
it already exists in code and feature description at forum indicates that it just was forgotten to be added
used the tag for item 1021 "Laptop", just as picture in feature description shows
2023-08-21 16:45:34 +02:00
kitty624 d456d7d8ad Update Items.xml
- added  <usAdministrationModifier>-tag to items.xml
- it already exists in code and feature description at forum indicates that it just was forgotten to be added
- used the tag for item Laptop, just as picture in feature description shows
2023-08-21 16:38:29 +02:00
KittyandGitHub 8bc8b9a584 Merge pull request #52 from kitty624/mercprofiles
updated mercprofiles25.xml

 - edited to match recent changes to merc traits in mercprofiles.xml
    to ensure UB-1.13 and ja2-1.13 mercprofiles are in sync

-  fix to manuel in mercprofiles.xml (ja2-1.13)
    I had previously neglected to delete athletics after he gained covert ops, did that now
2023-08-21 10:46:23 +02:00
kitty624 165e38bc2a updated mercprofiles25.xml
- edited to match recent changes to merc traits in mercprofiles.xml
- to ensure UB-1.13 and ja2-1.13 mercprofiles are in sync

- fix to manuel in mercprofiles.xml (ja2-1.13)
I previously neglected to delete athletics  after he gained covert ops, did that now
2023-08-21 10:33:49 +02:00
rftrdevandGitHub 41902f0605 Replace evolution with growth modifiers in MercProfiles25.xml (#51) 2023-08-21 00:40:05 -07:00
KittyandGitHub 17cadcf425 Merge pull request #50 from kitty624/gamedir-dev
updates to documentation


- deleted Starter documentaion.md no need for .md-file, there are several links to it in other docs here
- deleted folder about additional UB campaigns, the svn-link inside wasn't working anymore
- updated links in other  files
- added some comments in other files
- added link to discord
- updated link for download latest 1.13 and deleted outdated or unofficial ones (i.e. maeyeanie)
2023-08-21 06:23:26 +02:00