7621 Commits
Author SHA1 Message Date
Wanne 9f613f348d git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1517 4f8fa57e-7814-0410-bad4-adc449f26b7c 2012-08-24 00:36:36 +00:00
Wanne 564f296bab - Removed "VFS" folder
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1516 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 00:36:14 +00:00
Wanne 8bc7673947 - Added new default executables for the ja2 1.13 game and the map editor
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1515 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 00:05:46 +00:00
Wanne 4e97b713f1 - Added new folder structure for the UB mods
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1514 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 00:02:42 +00:00
Wanne f4b50f79c7 - Deleted old executable files. New ones will be uploaded soon ...
- Deleted "Set JA2UB v1.13 Campaign.exe", because in the future the JA2 UB mods, demo and 1.13 can be started from the INI Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1513 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-23 23:43:48 +00:00
Wanne c29dcd7af0 - Updated ja2.ini, so each executable (113, ub, demo) has its own default executable file entry
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1512 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-23 23:40:10 +00:00
Wanne 2b98099a34 - Now every executable (1.13, UB and Demo) uses the ja2.ini file to initialize the game
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-23 23:33:26 +00:00
lalien e5d0e730e0 support for full screen main menu rev. 5498
- removed obsolete images
- add new images
- fix xml file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1511 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-23 19:23:04 +00:00
Wanne c7343fd2f5 - Updated the "LayoutMainMenu.xml" files to the new format
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1509 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-23 18:22:28 +00:00
lalien 1abd491d46 support for full screen main menu rev. 5498
- main menu background in png format


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1508 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-23 15:17:42 +00:00
Wanne 12517806c5 - Changed two MERC website options in the Data-1.13/Ja2_Options.INI
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1507 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-23 15:05:06 +00:00
Wanne 3961431e8d - Bugfix: Skyrider stuck in sector (Bugzilla #562)
o I reverted the changes from revision 4724 and hopefully this fixes the "skyrider stuck in sector" bug

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5499 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-23 14:54:23 +00:00
lalien e39afabcfd - support for full screen main menu rev. 5498
- added full screen main menu image for all resolutions
- added xml options mor main menu 
	- StretchImage		if 1 the image is stretched to the screen size
	- CenterImage		if 1 the image is centered in X
	- ImagePositionRelative	if 0 the image is displayed on the same place on any resolution, ignored when StretchImage is active
- obsolete xml tags not removed for compatibility with older versions
- only png images are functional




git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1505 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-23 14:16:46 +00:00
lalien 56ae482ee2 - added full screen main menu image for all resolutions
- added xml options mor main menu 
	- StretchImage		if 1 the image is stretched to the screen size
	- CenterImage		if 1 the image is centered in X
	- ImagePositionRelative	if 0 the image is displayed on the same place on any resolution, ignored when StretchImage is active
- removed obsolete tags
- new buttons in main menu: "n" new game, "q" quit



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-23 14:08:42 +00:00
Flugente 544314276c - grenaded can now also be armed in the inventory like bombs
- fix: underbarrel weapons no longer influence dirt generation


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5492 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-22 19:54:35 +00:00
Flugente 7029b31da5 - added INI editor descriptions
- added AP cost for arming boms in inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1504 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-22 19:52:31 +00:00
Flugente 30e13e1e26 New feature: The M.E.R.C. website now also has gearkits (by JMich)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-21 20:36:47 +00:00
Flugente 26df387c86 New feature: The M.E.R.C. website now also has gearkits (by JMich)
- in order have multiple gearkits for mercs, you have to create them

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1503 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-21 20:35:43 +00:00
lalien b3dcd89ab4 - removed not needed loadscreen images
- added images in png format


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1502 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-21 14:38:31 +00:00
Wanne b56d360c50 - Fixed the 3 workaround shooting animations (from revision: 1494 and 1499)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1501 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-21 12:02:12 +00:00
lalien 3136327c5a reapplied lost Russian letters fix from revision 4877
-Fixed some problems with russian letters in IMP page (by ViSoR)
-Added 2 letters for French (Ligatures Æ, æ, Œ, œ). Now we have support for all French alphabet
-Converted French text to UTF-8 for simple use in ather OS Language

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-21 10:31:12 +00:00
lalien 82bfc8d9f4 added loading screen stretching for all resolutions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5488 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-21 10:26:23 +00:00
Wanne 7e3b802ab6 - Fixed compilation error (in DecideAction.cpp), when ENABLE_ZOMBIES was enabled in builddefines.h
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5487 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-21 09:04:07 +00:00
Flugente 20b40ed761 - food system: auto consumption now starts at -10% instead of -25%
- Moved key commands: 'Ctrl' + '.' now opens a message box. The commands to fill canteens and to clean weapons can be called from there. In the future, similar commands can be placed here

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-20 20:57:07 +00:00
Flugente d430eb638e added cleaning kits as random loot to enemies
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1500 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-20 20:51:22 +00:00
Wanne a64d8a9323 - Fixed compilation error in Chinese version
- Translated a few texts for Chinese version (by zwwooooo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-18 16:25:38 +00:00
Wanne 22eb3f259f - Workaround for the missing animations (M_SR_HIP_AIM.STI) which fixes the crashes in tactical when the animation was not found
o Copy and renamed the animations (M_SR_HIP_AIM_ALT.STI to M_SR_HIP_AIM.STI)
o see: http://www.bears-pit.com/board/ubbthreads.php/ubb/showflat/Number/309190/Searchpage/1/Main/20195/Words/M_SR_HIP_AIM.STI/Search/true/Re_A_Small_Compilation_of_New_.html#Post309190

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1499 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-18 16:06:41 +00:00
Flugente 63a6fbb279 added pic for cleaning kit (pics by wil473)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1498 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-18 00:58:02 +00:00
Flugente a17266e7b8 added repair kit to a few shopkeeper's inventories
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1497 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-18 00:23:20 +00:00
Flugente 8275a1231b New feature: advanced repair/dirt system
- items now have an internal repair value that can be lowered through damage taken. They can only be repaired up to that value by your mercs, onyl smiths can fully restore it to 100%
- guns get dirty over time, especially when shooting. Thsi can cause them to jam. Use cleaning kits (item #1576) to clean them by pressing 'Alt' + '.'
- more on this feature in http://www.bears-pit.com/board/ubbthreads.php/topics/308926/New_feature_advanced_repair_di.html#Post308926
- this requires GameDir revision 1496 or higher

WARING! THIS BREAKS SAVEGAME COMPATIBIITY!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-18 00:03:40 +00:00
Flugente ecc8715b36 - added new icons, xml data and settings for the advanced repair/dirt system
- more under http://www.bears-pit.com/board/ubbthreads.php/topics/308926/New_feature_advanced_repair_di.html#Post308926

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1496 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-18 00:02:57 +00:00
Flugente 1c31f91963 fix: Game did not start because of unknown letter, replaced by simple 'e'
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1495 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-16 22:18:18 +00:00
Wanne 5f8718b3c7 - Workaround for the 2 missing animations (M_N_SHOT2.sti and S_N_SHOT2.sti) which fixes the crashes in tactical when the animation was not found
o Copy and renamed the base animations (M_N_SHOT.sti and S_N_SHOT.sti)
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/309138/Re_A_Small_Compilation_of_New_.html#Post309138

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1494 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-16 13:07:36 +00:00
Flugente 50b849997b - savegames prior to r5471 (Sandro's new features) are now compatible with the current version
- fix: incorrect group deletion caused crash when switching from assignment to truck

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-15 19:54:36 +00:00
Flugente cddfbcb9f9 fix: vehicles no longer digest food, and no longer auto-consume food
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-14 23:36:34 +00:00
Wanne 1f1e45d394 - Fixed a typo in Items.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1492 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-14 17:01:38 +00:00
Wanne 3d491cc57d - Added the new <CrowbarModifier> Tag to the Crowbar and Rambo Knife (by JMich)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1491 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-14 17:00:36 +00:00
Wanne cde4ce4229 4 new tags in Items.xml that modify skill checks. (by JMich)
- LockPickModifier modifies the lockpick chance by a specific number. If the number is positive, it is proportional to the locksmith kit's status, if the number is negative, it will always be the same. Tag is ignored if the item isn't a LocksmithKit. FindLocksmithKit should return the one that gives the biggest bonus, but it may have trouble with stacked lockpicks. Hovering over the "Locksmith Kit" icon in UDB should tell you how much of a bonus (or penalty) that item gives you.

- CrowbarModifier increases your chances to force open by using a crowbar by the number indicated. Default vanilla crowbar has a bonus of 20, so an item with a bonus of 10 will be worse than a crowbar (but possibly smaller). FindUsableCrowbar should return the item with the biggest bonus. Tag is ignored if the item isn't a Crowbar. Hovering over the "Crowbar" Icon in UDB should tell you by how much your chances are improved, though if the item is also a weapon, the icon isn't visible.

- RepairModifier modifies a toolkit's effectiveness by that percentage. If you try to repair with a shoddy toolkit that has a RepairModifier of -20, you'll be 80% as effective, while repairing with an excellent toolkit that has a RepairModifier of 20 means you are 120% as effective. When checking if you have a toolkit at hand, it should select the one with the biggest bonus. Tag is ignored if item isn't also a Toolkit. Hovering over the "Toolkit" icon in UDB should tell you how effective the repair kit is.

- DisarmModifier increases your chances to disarm a trap by the indicated amount, modified by the Diffusal Kit's status. The FindDisarmKit should return the item with the biggest bonus, though it uses the top item in a stack. Currently using the "Wirecutters" icon in UDB, hovering over it should tell you by how much your trap disarm chance is improved.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5472 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-14 15:04:02 +00:00
Wanne 7563ebda21 Sandro's feature pack (by Sandro)
- GameDir files for the features
- further infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/308884/A_Small_Compilation_of_New_Fea.html#Post308884

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1490 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-14 12:20:35 +00:00
Wanne 21dd880240 Sandro's feature pack (by Sandro)
- Dual Burst/Autofire Enabled
- Alternative Weapon Holding (firing from hip + pistol with one hand)
- Energy Cost on Weapon Manipulation (holding it shouldered, firing)
- Suppression Effectiveness Modified by Caliber and Gun Loudness
- No Enemy Auto-ready Weapon Option
- Fancy Big Merc Rifle Holding Animations
- More Random Idle Animations
- Kick in HtH Implemented
- Jumping Implemented
- (Included Fix for IIS with Martial Arts Bonus)
- further infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/308884/A_Small_Compilation_of_New_Fea.html#Post308884
- you also need the latest GameDir files!


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-14 12:19:57 +00:00
Flugente a61d724335 - fix: combo food/drug items have to be eaten if drug effect was already attributed
- new food situation level for the transition from food refusal to dangerous levels
- more useful stat damage warings for food

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5468 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-13 21:25:51 +00:00
Flugente 660d8d126f - added new item flag for camo-removing items, to remove hard-coded value (CAMO_REMOVAL, #1024)
- fixed a bug that caused incorrect deduction of kit points

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5467 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-13 20:53:50 +00:00
Flugente ecfbd4de1a - updated food values (by Slax)
- new item flag (CAMO_REMOVAL, 1024) for camo-removing items, added to rag (item 1022)
- added xml with current ItemFlag-values (Lookup/ItemFlag.xml)
- added small and medium pics for the masterkey (by wil473)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1489 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-13 20:20:08 +00:00
Wanne ef981b5342 - Bugfix: Finding and swapping shadow tiles when swapping a structure tile (by Realist)
o example: When cutting a fence tile, the proper shadow tile was not swapped and correctly updated

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5465 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-13 08:51:48 +00:00
Flugente 3cf0e5210c fix: sector entering still behaved weird
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5459 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-11 17:52:12 +00:00
Flugente 333633b782 - fixed a bug that caused bad pointers when accessing the sector inventory and then entering it
- fixed: reinforcements can happen in turnbased again
- codechange: stacks of ammo item scan now be used to feed a gun from the inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-11 17:07:28 +00:00
Flugente 7e8b51ad34 Fixes (by DepressivesBrot):
- fixed some text errors
- enabled 'mark remaining hostiles' for all resolution and maps

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5454 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-08 20:46:36 +00:00
Flugente e8a6d58175 fix: night vision bonus wasn#t given correctly when using scope modes
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5450 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-07 21:25:29 +00:00
Flugente 9c1b850881 new feature (by DepressivesBrot): a rough approximation of the position of the last enemy can be marked on the map
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1488 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-07 20:55:45 +00:00
Flugente 24708bcf2b Fix (by DepressivesBrot): draw AP costs were not calculated correctly
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5449 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-07 20:49:33 +00:00