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,603 Commits 9 Branches 6 Tags
858c149584bb07216cb488cd33b304ec5656b307
Commit Graph
7603 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 80bdeff0e4 drinking aclcohol causes less dynamic opinion events, as there were way too many if drinking in a large group 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7967 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-12 20:14:14 +00:00
Flugente 6fdde45807 - The 'Improve gear' function in the [Ctrl] + [.] menu improves the gear of all present mercs by replacing their items with sector items with higher status 
- Fix: AP costs for item consumption were not substracted

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7966 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-11 22:51:00 +00:00
Flugente 80cf6af0ce - Fix: opinion events on drinking alcohol did not happen 
- Fix: mercs in transit complain about mercs present in Arulco

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7965 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-09 22:21:37 +00:00
Flugente 13875810a4 minor code cleanup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7963 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-08 09:33:28 +00:00
Flugente 5e8ab2af31 Fix: possible access to invalid memory if waypoint is list was corrupted 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-07 20:16:15 +00:00
Flugente 929d15ec8a changed several variable names for body types to 'ubBodyType', as this is more consistent and allows wider use of macros 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-07 20:09:10 +00:00
Flugente 67fa865543 - Fix: Mike and Iggy could spawn as tanks 
- Tanks always get 100 HP
- replaced a few hardcoded values with enums


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7960 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-07 18:54:58 +00:00
Flugente 7dbff83e24 - Fix: VS2010 debug build issue with reading in StructureConstruct.xml 
- replaced a few hardcoded values with enums
- use TANK(...) macro instead of checking for bodytype by hand

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7959 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-05 19:01:11 +00:00
Flugente 90486b015b Oly start PMC hiring if > 0 militia have been selected 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7958 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-04 19:11:13 +00:00
inshy 2b45f79af9 Russian language files updated: 
-Updated 2 new lines for 169.EDT

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7957 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-02 20:02:02 +00:00
inshy b20997749b Russian language files updated: 
-Added missing WAV files for new IMP (#169)
-Added missing WAV files some other characters

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7956 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-02 20:01:01 +00:00
silversurfer abe7117231 Fix (by navaroe): The game could try to place more soldiers on the map than the map had slots which would cause the game to crash. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7955 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-02 13:59:07 +00:00
inshy 0c27f5f2c4 Russian language files updated: 
-Fixed grammar in Russian

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7954 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-30 18:39:42 +00:00
inshy 5474f16334 Russian language files updated: 
-Fixed some mistranslation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7953 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-29 20:19:37 +00:00
Flugente 0beda54c8d Fix: constructing/deconstructing a fortifiaction only worked if the tileset was part of the additonal tileset, not if it was a part of GENERIC 1 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7938 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-26 09:50:16 +00:00
Flugente 0a748a02b3 Message boxes can have a dropdown. For usage, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=341863&#msg_341863 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-25 17:34:18 +00:00
Flugente 6aa4e1e6c6 New background property: if <croucheddefense> is set, enemy CTH is modified if they fire on us while we are crouched against thick cover (size >= 2) in the direction of the shot. 
Backgrounds.xml tag was added in GameDir r2267.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-25 12:49:37 +00:00
Flugente f937364610 New background property: if <croucheddefense> is set, enemy CTH is modified if they fire on us while we are crouched against thick cover (size >= 2) in the direction of the shot. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2267 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-07-25 12:44:57 +00:00
Flugente d682b28a31 Fix: progress bar on dropdown menus was too small 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7932 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-24 22:23:13 +00:00
Flugente c7b2c2592a Fix: sandbags could only be jumped if their height was < 2. A structure with a .jsd-size of 1 barely offers protection, thus limiting the usefulness of sandbags. From now on, sandbags with a height of 2 can also be jumped. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2266 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-07-24 21:38:14 +00:00
Flugente 2ba4b77a84 - Fix: when jumping over fences or sandbags, a merc was occasionally moved inside the structure. 
- Fix: sandbags could only be jumped if their height was < 2. A structure with a .jsd-size of 1 barely offers protection, thus limiting the usefulness of sandbags. From now on, sandbags with a height of 2 can also be jumped. Note: This requires a changed sandbag.jsd in GameDir.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-24 21:20:17 +00:00
inshy d7e4d82f24 Russian language files updated: 
-Added WAV files for new SkyRider's speech
-Added WAV files for new Waldo's speech

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7930 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-24 19:59:05 +00:00
inshy cfdbf7c465 Russian language files updated: 
-Added and translated new missing letters in EMAIL.EDT
-Fixed variety of the names and nicknames spelling in EDTs
-Added new missing information about hot-keys in HELP.EDT
-Added and translated new missing text for mercs that referring to a new buddy
-Added and translated new missing text for NPCs
-Small changes in XMLs
-Added and translated missing snitch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7929 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-24 11:37:54 +00:00
Flugente f4f124c7b0 - Obliterating a sector will now destroy tanks as well. 
- Spawning a new enemy via [Alt] + [b] can create tanks.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7928 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-23 19:14:21 +00:00
Flugente e0dc813ea6 added missing text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-22 21:43:17 +00:00
Flugente f78d18ec10 Cheats are activated/deactivatesd by [Ctrl] + G. [Ctrl] + GABBI is longer in use. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7926 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-22 21:42:25 +00:00
inshy 1f51925fa1 Russian language files updated: 
-Added quests.edt with translated new quests.
-Fixed mistakes in Speck quotes
-Fixed grammar in Russian XMLs
-Fixed variety of the names and nicknames spelling in all XMLs.
-Fixed some mistranslation in XMLs
-Added new translations for items.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7925 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-22 12:35:13 +00:00
inshy 2e23ead512 Now Ivan's speech have Russian text, as it was in original Ja2. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2265 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-07-20 18:09:31 +00:00
inshy 76b1dba9d7 Restored broken text. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2264 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-07-20 17:57:45 +00:00
Flugente 28388681bd Fix: removed nada items from starting gear 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2263 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-07-20 17:24:58 +00:00
Wanne 88725a7be1 New Xml Editor 0.106 
- Removed reading and writing of "Items\Drugs.xml", because the structure changed and therefor the XML Editor could not start


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2262 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-07-19 15:17:11 +00:00
Flugente cbc64c3bdc added anti-tank mine (#1735) to Devin's selection 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2260 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-07-15 21:30:49 +00:00
Flugente b7f212b51b - Fix: attacking squadmates called OPINIONEVENT_CIV_ATTACKER in addition to OPINIONEVENT_FRIENDLYFIRE dynmic opinion event. 
- If a dynmic opinion event's opinion moifier is set to 0, this event is not used, thereby allowing to turn specific events off.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7919 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-15 18:51:08 +00:00
Wanne 56072fdd0f Updated JA2 1.13 Credits (thx to Scheinworld) 
Updated Version Number

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-14 20:17:33 +00:00
inshy 470e5276ae Update Russian translation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7916 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-14 19:23:26 +00:00
Flugente eee91c14a7 Fix: nationalities did not show up 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7915 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-14 18:52:49 +00:00
inshy edcf96756a Update translation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7914 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-14 14:00:56 +00:00
Flugente cc9a310aef added more nationalities 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-13 17:43:47 +00:00
Flugente 251b7b51f2 added missing line breaks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7911 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-12 21:24:28 +00:00
Wanne 02d52875c6 - Added missing texts for Chinese Version (gzDisplayCoverText[]) 
- Fixed invalid characters in some language texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7910 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-12 12:07:37 +00:00
inshy d69f1f98be Added missing lines for Russian language. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7909 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-12 08:59:30 +00:00
silversurfer 1d8136aa06 Fix: New IMP gear selection method didn't include the Sidearm category so mercs could be left without a gun if their trait selection didn't include one. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7908 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-09 16:19:47 +00:00
Flugente b8c3d26013 If an enemy group pursuits a player group that just retreated, make sure they don't arrive before or at the same time as the player group. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7907 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-08 21:06:31 +00:00
Flugente 457814265c New item tag: mines with <antitankmine> set to 1 will be activated by vehicles or robots. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7906 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-08 19:54:54 +00:00
Flugente 37d4a13bcd New item tag: mines with <antitankmine> set to 1 will be activated by vehicles or robots. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2259 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-07-08 19:53:50 +00:00
Flugente 25f04ef661 Added safety checks: 
MAX_NUMBER_OF_TRAITS must be higher than NUMBER_OF_MAJOR_TRAITS_ALLOWED at least by 1.
MAX_NUMBER_OF_TRAITS_FOR_IMP must be higher than NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP at least by 1.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7905 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-08 17:44:05 +00:00
Flugente d37db2432b Fix: possible crash if entering a sector with more enemies present than map placements 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7903 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-05 18:04:33 +00:00
Flugente 86e21d43a8 If the player retreats from an enemy attack that was targetted at this sector, the enemy group pursuits instead of being given new orders. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-05 12:44:12 +00:00
Flugente 54d202fc79 - Fix: mercs can consume items that shouldnt' be consumed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-05 10:37:27 +00:00
Flugente 48178ea56f - Fix: CHANCE_SAY_ANNOYING_PHRASE wasn't used in english when spotting enemies 
- removed obsolete drug code
- if health is changed by drugs, display that via damage floater

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-04 20:27:29 +00:00