1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,624 Commits 9 Branches 6 Tags
69764e445997285e936cfa6d3bf44f047103ad28
Commit Graph
7624 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
silversurfer e4ef716d91 Bugfix: When using a vehicle to move to an enemy sector mercs will force exit the vehicle. In this case the team panel sort order was random depending on which merc was last selected. This problem occurred because the sort function for the squad was not called for this scenario. It is now called whenever a merc is added to a squad. 
Because of this the call for the sort function was removed from function SetAssignmentForList(). We do not need to call it twice.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7724 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-01 22:14:33 +00:00
silversurfer c1e0793c8f This GameDir revision requires at least exe 7722 or you may end up with no weapon at start! 
- new option for automatic IMP item distribution:
uiIndex 52 "Sidearm" in IMPItemChoices.xml is used to give the IMP a standard sidearm based on random selection. All items were removed from marksmanship based distribution. Special weaponry now comes from traits (e.g. SMGs for auto weapons, shotgun for ranger).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2201 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-01-31 14:40:46 +00:00
silversurfer 46b34e55d1 - new option for automatic IMP item distribution: 
uiIndex 52 "Sidearm" in IMPItemChoices.xml is used to give the IMP a standard sidearm based on random selection. It is encouraged to remove marksmanship based gun choices and instead add special weaponry for traits.

- The following changes are supposed to remove useless items from vendors and other lists:
Function ItemIsLegal now filters out food items if the food system is off. The same applies to cleaning kits if the dirt system is off.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7722 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-31 14:36:36 +00:00
silversurfer 19809481b6 added missing FOOD_SYSTEM parameter to 1.13 Ja2_sp.ini 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2200 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-01-23 15:21:47 +00:00
Flugente 29a132a2dd Added xml explanations 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2199 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-01-22 21:17:45 +00:00
Flugente 4ba64556bf Fix: no morale/loyalty penalty if a killed civilian was a member of a group 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7721 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-22 21:13:30 +00:00
Flugente 4c46054977 If a person kills someone on the same side, they curse instead of laugh. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7720 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-18 02:50:53 +00:00
Flugente 33316bcac8 A gun only counts as mounted if it is raised. This does not alter shooting mechanics and removes unnecessary code changes. As a sideeffect, mercs will complain less often about other mercs using them as weapon racks. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-17 22:21:34 +00:00
Flugente 3f7bbdc423 Radio Operators can now use their skills while using Old Inventory. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-17 21:02:22 +00:00
Wanne fd1ecb2edf Merged from revision: 7716 
- Improved message prompt when launching game in fullscreen mode on unsupported screen resolutions instead of just those that's set to larger than primary desktop resolution (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7717 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-07 20:05:23 +00:00
Flugente bb95be057b Replaced reinforcement functions to allow non-enemy movement groups to reinforce battles 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7712 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 21:11:36 +00:00
Flugente 474df6ffb5 - removed UINT8 NumFreeMilitiaSlots() 
- militia groups can reinforce battles in neighbouring sectors

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 19:54:29 +00:00
Flugente 097c33815d Altered group movement draw function 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7710 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 19:42:28 +00:00
Flugente 34a8b22f54 Removed unused code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 17:09:09 +00:00
Flugente cc572651c0 Replaced 
UINT8 CountAllMilitiaInSector(INT16 sMapX, INT16 sMapY);
with
UINT8 NumNonPlayerTeamMembersInSector( INT16 sSectorX, INT16 sSectorY, UINT8 ubTeam );

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7708 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 01:22:07 +00:00
Flugente c8eda14e2b Work has begun to enable strategic movement for other teams than just player and enemy. 
- I've changed the GROUP struct - instead of BOOLEAN fPlayer we now have UINT8 usGroupTeam.
- To further simplify the code, I've replaced 
UINT8 NumEnemiesInSector( INT16 sSectorX, INT16 sSectorY ); 
with 
UINT8 NumNonPlayerTeamMembersInSector( INT16 sSectorX, INT16 sSectorY, UINT8 ubTeam );

In the next days, more strategic functions will be simplified, merged and replaced.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7707 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 00:50:25 +00:00
Flugente 57f6e41d47 Merged revision(s) 7694 from branches/Flugente/BaseTable: 
IMP gear images can be shown without background if required


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7706 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:58:28 +00:00
Flugente 0ecfe1109c Merged revision(s) 7701 from branches/ja2_source_official_2014: 
Merged revision(s) 7692 from branches/Flugente/BaseTable:
Merged AssignMinorTraitHelpText(...) and  AssignSkillTraitHelpText(...) into AssignPersonnelSkillTraitHelpText(...)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:53:26 +00:00
Flugente 209ba22b49 Merged revision(s) 7700 from branches/ja2_source_official_2014: 
Merged revision(s) 7690 from branches/Flugente/BaseTable:
Improved required stats for IMP creation.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7704 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:40:39 +00:00
Flugente 8cfdddddc4 Merged revision(s) 7699 from branches/ja2_source_official_2014: 
Merged revision(s) 7688 from branches/Flugente/BaseTable:
- moved hair & skin enums to header
- moved hair colour choosing function to header


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7703 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:39:35 +00:00
Flugente 72809ac09f Merged revision(s) 7698 from branches/ja2_source_official_2014: 
Merged revision(s) 7685 from branches/Flugente/BaseTable:
no need for each dropdown to have its own image library

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:33:38 +00:00
Wanne 134b534718 Merged from revision: 7683 
Fixed a few errors in Russian translation (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-28 09:37:06 +00:00
Wanne 5153adf285 Merged from revision: 2195 
Fix for the Large Holster silhouette being in the wrong position (by Off_Topic)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2196 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-12-28 09:33:25 +00:00
Wanne 4fd1ad6e7a Merged from revision: 2198 
Fixed a few errors in XMLs (thx to ATigersClaw)
- Fixed text "Combat instructor" -> "Combat Instructor"
- Fixed too long text "New Age Spiritualist" -> "Spiritualist"
- Changed Blood's nationality from American to South African

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2194 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-12-22 17:51:22 +00:00
Flugente 3a61f680da Merged revision(s) 7680 from branches/ja2_source_official_2014: 
Fix: crash on IMP creation if selected voiceset uses .ogg files instead of .wav


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7681 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-18 16:52:51 +00:00
Wanne e4c512e9f0 Merged from revision: 2189 
Fixed incorrect sound names in Sounds.xml (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2190 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-12-15 20:13:25 +00:00
Wanne eebb57ed38 Merged from revision: 7678 
Editor Fixes (by Buggler):
- '~' (tilde) hotkey to toggle level cursor if applicable; CTRL hotkey for placing objects on roof removed 
- Fixed missing roof cursor for non-vanilla size maps
- Updated editor popup text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-09 15:57:15 +00:00
Wanne efb9e700da Merged from revision: 2187 
Features (by anv)
- new Ja2_Options.ini setting - HIDE_EXPLORED_ROOM_ROOF_STRUCTURES (e.g. sandbags) at ground level view

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2188 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-12-07 18:02:41 +00:00
Wanne eaa153b310 Merged from revision: 7676 
Features (by anv)
- new Ja2_Options.ini setting - HIDE_EXPLORED_ROOM_ROOF_STRUCTURES (e.g. sandbags) at ground level view
- Hold CTRL hotkey in mapeditor to place any object on roof

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7677 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-06 13:37:25 +00:00
Wanne bb264d6815 Merged from revision: 7674 
- Fixed merc lighted movement popup text in options screen (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7675 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-06 12:57:40 +00:00
Wanne de99bcdb4f Merged from revision: 7672 
Increased MAXATTACHMENTS size from 30000 to 40000 which is needed for the amount of attachments in AIMNAS mod (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7673 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-05 19:13:54 +00:00
Wanne 62287f7672 Merged from revision: 7670 
Updated _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7671 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-04 16:51:53 +00:00
Wanne 0ef41fffd7 Merged from revision: 7668 
- Externalized hardcoded TownInfo text which shows the number of Total # of prisoners/capacity, to language text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-01 20:57:11 +00:00
Wanne 5064e59785 Merged from revision: 7666 
- Updated _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-29 17:20:31 +00:00
Wanne 561f630ea4 Merged from revision: 7664 
Fixed typos in language GameDir files (thx to ATigersClaw)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7665 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-24 17:35:22 +00:00
Wanne 6e0823d5d1 Merged from revision: 7662 
Fixed typos in Source Code texts (thx to ATigersClaw)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-24 17:13:16 +00:00
Wanne 604e2f7eba Merged from revision: 2185 
Fixed typos (thx to ATigersClaw)
- Dr. Mitch (AIM Bio)
- Backgrounds.xml
- LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2186 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-24 16:56:12 +00:00
silversurfer d9badabaf6 EDB now displays morale modifier for food. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7661 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-20 12:17:13 +00:00
Flugente 4f00ce2ffd Merged revision(s) 7659 from branches/ja2_source_official_2014: 
Fix: memory corruption in CalcChanceToGetThrough() causes game crash


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7660 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-18 20:53:39 +00:00
Wanne 7b700ac5c2 Merged from revision: 7657 
Fixed missing "," for pHelicopterEtaStrings[] for Dutch, Italian, Polish and Russian Version (thx to Woquit)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7658 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-17 19:51:08 +00:00
silversurfer 71546b5cc8 Fix (by Ocular): departed personnel stats and help text where not shown correctly 
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/337768/[PATCH]_Fix_departed_personnel#Post337768


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7655 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-16 19:53:50 +00:00
Wanne 7031d30c31 Merged from revision: 7653 
Fixed and translated missing MercEdt files for Russian version (by Valiant)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7654 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-14 10:49:30 +00:00
Flugente 3a015ed1e6 Fix: dynamic opinions: mercs will only complain about the killing of civilains if they aren't hostile at the moment of their death 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7652 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-12 21:08:08 +00:00
Flugente ee27a3864c Fix: removed unnecessary display cover updates (by Ocular) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7651 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-11 19:33:26 +00:00
Wanne 3bdcfc8226 Added missing entry 11 and 12 for explosion types in ExplosionType.xml. Now the XML Editor starts again without any errors (thx to JMich) 
- I just added placeholders "???" for the 2 new explosion names. Feel free to change them to the correct names :)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2184 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-09 20:18:44 +00:00
Wanne 3d99a7d6cf Merged from revision: 2182 
- Fixed militia not trainable in SAM sectors when playing "Vanilla" (thx to Johnny & Scheinworld)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2183 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-08 12:31:46 +00:00
silversurfer 633c242953 Fix: added missing options to Ini Editor and some typo fixes. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2181 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-07 12:30:07 +00:00
Flugente b5ed7df390 DISEASE_CONTAMINATES_ITEMS controls wether contaminated food/blades/throwing knifes can infect people. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7649 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-05 22:01:14 +00:00
Flugente cd18967530 DISEASE_CONTAMINATES_ITEMS controls wether contaminated food/blades/throwing knifes can infect people 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2180 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-05 21:51:57 +00:00
Flugente 291985c022 ROOF_COLLAPSE controls whether roofs can be destroyed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-04 20:37:42 +00:00