1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,615 Commits 9 Branches 6 Tags
7624daa9049fd0307133fc882aee68c8d44bb3f4
Commit Graph
7615 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 6c2273f4eb - Added support for new resolution: 960x540 
- Custom Resolution (25) can now set to any user specific resolution (X, Y) value, but must be at least 640x480 resolution

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-04 15:55:21 +00:00
silversurfer 19cf8d6518 Fix: From testing volatility was left at 0 for land mines. Changed back to 2. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2162 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-10-04 07:56:59 +00:00
silversurfer 2d3fc62bb6 Changed fragmentation explosives to emit fragments like they should. All values are experimental. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2161 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-10-03 10:51:35 +00:00
Wanne 22ed620084 Essence XWnd Shell - Tool (Version: (2014.09.28) ver 0.01 rev 011 build 14271) (by StaticZ) 
- This tool can upscale and use different graphic filters to display JA2 1.13 with better graphics
- For more infos see "Tools\ExShell\read_me.txt"
- Additional infos and screenshot results (for different filters) on the Bears Pit:
  http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336350/1
- INFO: Using upscaling and filters improves the graphics, but on the other side slows down the game!!

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2160 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-10-03 10:29:19 +00:00
silversurfer 9930b4d557 Fix: The game used an internal range multiplier for fragments giving them insane range. I changed that from 10 to 1. Fragment range defined in Explosives.xml already includes a x10 multiplier. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-03 10:04:19 +00:00
Wanne 19f1b82c84 Driveable Vehicles Tanks Update (by Ocular) 
- New ja2_options.ini entry: TANK_MINIMUM_PROGRESS
- This defines the progress (0-100), when the enemy can use tanks for attacks and patrols
- For Data-1.13, the progress value is set to 30.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2159 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-10-03 09:51:35 +00:00
Wanne a2b40cd51b Driveable Vehicles Tanks Update (by Ocular) 
- New ja2_options.ini entry: TANK_MINIMUM_PROGRESS
- This defines the progress (0-100), when the enemy can use tanks for attacks and patrols

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-03 09:47:15 +00:00
silversurfer 004cb3d482 Fix (by Ocular and Strohmann): 
wrong aim levels and handling for Sphinx pistol
wrong Need for sleep values for Lance Fisher and Turtle

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2158 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-10-03 07:44:48 +00:00
silversurfer 3704d9b8e4 cleanup of old code after move of difficulty settings to new file DifficultySettings.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-02 19:03:20 +00:00
silversurfer 3574c42c65 cleanup of old data after move of difficulty settings to new DifficultySettings.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2156 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-10-02 19:02:14 +00:00
silversurfer 384d0a36a4 Fix: Finishing different types of militia training in the same sector could lead to only one notification and also paying for only that one while both did continue. 
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336348/Re:_BUGZILLA_report_all_bugs_h#Post336348


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-01 14:54:51 +00:00
silversurfer 3bdf06c62d several fixes (by Ocular) 
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336357/[PATCH]_Minor_bug_fixes#Post336357

- wrong calculation for gear AP bonus
- wrong display for max health damage
- wrong use of TRAIN_MILITIA_MODIFIER modifier
- wrong calculation for breath regeneration with unused AP


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-01 10:51:16 +00:00
silversurfer cd786cf213 Fix: Key data wasn't set correctly when the swap merc faces feature was used so the game couldn't load the savegame anymore. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7534 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-29 00:24:19 +00:00
Flugente 299f8af314 Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2155 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-27 20:21:30 +00:00
Flugente fc861e0ba1 - Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER) 
- Fix: during dialogue, mercs did not agree often enough
- Fix: if no mercs were in any squad, Melody website did not show relations
- Dialogue has been reordered, this should make adding new ones slightly easier

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-27 20:19:49 +00:00
Wanne 0ae1570115 Merged from revision: 7531 
- Added missing German Merc EDT files. Those EDT files were taken from English Version and therefore the merc texts were in English

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7532 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-27 10:20:56 +00:00
Flugente 58d9cf0925 Fix: In Release built with VS2008 the game crashes when parsing xmls. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-24 23:29:07 +00:00
Flugente 7558c84bc2 New Feature: IMP gear selection allows choosing what items an IMP starts with instead of relying upon randomness. 
Requires GameDir >= r2152, as required images were added.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-23 22:46:10 +00:00
Flugente a0830b21ba New Feature: IMP gear selectino allows choosing what items an IMP starts with instead of relying upon randomness 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2152 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-23 22:10:26 +00:00
Wanne 6de39a6ff2 Merged from revision: 7525 
- Fixed bug with game selecting helicopter loading screen when reloading game (by anv)
- Fixed autoplace stacks logic from sector inventory on r7380 commit (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-17 18:46:09 +00:00
Flugente 12cf5396e9 Merged revision(s) 7523 from branches/ja2_source_official_2014: 
Fix: enemy radio operators called in artillery even though it could not fire

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7524 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-16 23:09:56 +00:00
Flugente 484f8572ca Merged revision(s) 7521 from branches/ja2_source_official_2014: 
Fix: Kingpin's assassins do not attack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-15 21:37:58 +00:00
Wanne d52318e636 - Fixed items lacking an outline in smp2 tilesets (by Off_Topic) 
- Fixed 7rd Shotgun Pocket to hold 3x 2 Shells and 1x 4 Shells (by Off_Topic)
- A slight change to Rifle Sling Pocket also (by Off_Topic)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2148 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-15 18:15:09 +00:00
Flugente 48819f860a Fix: Equipping militia with guns and ammo could lead to creation of ammo items with 0 bullets. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-14 21:23:16 +00:00
Wanne 77a645d362 Merged from revision: 2146 
- Updated Russian comments for INIEditor (by Valiant)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2147 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-14 17:10:43 +00:00
Flugente 5a0d93da94 Feature improvement: 
- If MILITIA_USE_SECTOR_EQUIPMENT is TRUE and you assign a merc to the 'MOVE ITEM' assignment, you can select wether gear that the militia can use should be ignored.
- To prevent confusion, 'MOVE ITEM' has been renamed 'GETITEM'.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7517 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-14 14:02:16 +00:00
Flugente f46083515d Externalised amount of debt to MERC at which Speck complains. 
Note: this does NOT affect wether MERC goes bankrupt, as this is independent of the amount of debt.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7515 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-13 15:08:30 +00:00
Flugente 7410ce875a Externalised amount of debt to MERC at which Speck complains. 
Note: this does NOT affect wether MERC goes bankrupt, as this is independent of the amount of debt.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2145 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-13 15:07:42 +00:00
Flugente a642ab500d Covert Ops trait improvements: 
- performing suspicious activities renders a spy easily identifiable for a short time (realtime) or until he ha spend enough AP (turnbased). This should make exploiting disguises harder.
- if a spy is closer than COVERT_ELITES_UNCOVER_RADIUS to an elite or officer, they can uncover the spy, depending on uniform worn an experience levels.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-13 13:12:46 +00:00
Flugente 309edbc80c Covert Ops trait change: if a spy is closer than COVERT_ELITES_UNCOVER_RADIUS to an elite or officer, they can uncover the spy, depending on uniform worn an experience levels. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2144 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-13 12:49:57 +00:00
Wanne 260f09356c Merged from revision: 7512 
- Translated skills menu entries for French version (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-12 16:21:36 +00:00
Flugente 029da88b51 Added missing translations. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7510 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-11 22:39:54 +00:00
Flugente 81644fef04 If walking with an aimed gun, do not return to standing animation but to aiming animation. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7509 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-11 22:23:10 +00:00
Flugente e3a94de7a3 Merged revision(s) 7507 from branches/ja2_source_official_2014: 
Fix: under certain circumstances, picking up LBE that could be worn, while slots this LBE would use were already in use, corrupted objects.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-11 20:14:43 +00:00
Flugente 68dbf0da05 Merged revision(s) 7505 from branches/ja2_source_official_2014: 
Increased maximum number of random items to 2000 (from 1000). These extra random items should NOT be placed in maps. They are intended to be used in other random items, in case a modder creates random items from other random items.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7506 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-10 20:03:11 +00:00
silversurfer a2be5b06c2 added new option to CTHConstants.ini: 
IRON_SIGHTS_MAX_APERTURE_MODIFIER = 3.0

This modifies how fast the aperture grows for iron sights when IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT = TRUE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7504 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-10 12:16:45 +00:00
silversurfer 72d642b292 set BASE_SIGHT_RANGE = 14 for Data-1.13 like the official 2014 release 
added new option to CTHConstants.ini:
IRON_SIGHTS_MAX_APERTURE_MODIFIER = 3.0

This modifies how fast the aperture grows for iron sights when IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT = TRUE


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2143 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-10 12:15:47 +00:00
Wanne 84089c3c0c Merged from revision: 7500 
- Fixed wrong camo type worn off message (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-08 19:32:17 +00:00
Wanne 724f738a74 Merged from revision: 2141 
- ja2_options.ini: Fixed wrong ";" after AIMING_LEVELS_REDUCTION_ON_ALTWEAPHOLD (thx to LootFragg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2142 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-07 14:46:07 +00:00
Wanne 7a6f3ec91a Merged from revision: 7495 
- Updated French MercEdt files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7496 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-07 13:56:19 +00:00
Wanne 4177e73aeb Merged from revision: 7493 
- Updated French MercEdt files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7494 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-07 12:53:42 +00:00
Flugente 760a1b16f1 Feature improvement: 
- via StructureConstruct.xml and StructureDeconstruct.xml, one can now define which structures can be removed and created via items and the fortifications feature.

For more information, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335557#Post335557

does not break savegame compatibility. Requires GameDir >= r2140.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7491 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-07 00:11:16 +00:00
Flugente 360bac0909 Feature improvement: 
- via StructureConstruct.xml and StructureDeconstruct.xml, one can now define which structures can be removed and created via items and the fortifications feature.
- added building materials to create wooden debris and walls

For more information, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335557#Post335557

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2140 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-06 23:58:11 +00:00
Flugente 3f4973b54c Fix: disease magnitude should be 0 if feature is off 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7487 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-04 20:00:35 +00:00
Flugente 5ad522e4a7 - Fix: disease notification should not be visible to the player 
- Fix: disease infection happened even though disease feaure was off
- Disease Improvement: infection chance by corpse is now affected by age of corpse

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7486 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-04 19:55:56 +00:00
Wanne d3100e3c4e Merged from revision: 7484 
Fixes (by Buggler)
- Commented code due to weird results when swapping filled LBE items that has pockets of the same size
- Fixed militia remains in loaded sector on using Unassign All button and then not assigning any militia to the loaded sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-03 16:29:19 +00:00
Flugente f07dbef356 Feature improvement (PMC): 
- when PMC militias arrive, loyalty in player towns can be lowered
- PMC militia arrival time is slightly randomized around the ETA

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-02 22:12:08 +00:00
Flugente e8412f6d9d Lowered duration of Trip Flare and Break Lights from 35 to 10 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2139 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-02 20:15:16 +00:00
Flugente 650deb67a5 Fix: light sources did not decay in turnbased mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7482 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-02 20:11:16 +00:00
Wanne 3f4f8004ec Merged from revision: 7478 
- Updated _RussianText.cpp (by Valiant)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-02 19:49:28 +00:00