7604 Commits
Author SHA1 Message Date
inshy be5f7b1e7f Added missing files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5545 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-31 20:22:18 +00:00
inshy 50c338639a Added missing line for UB mails
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1535 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-31 20:16:22 +00:00
inshy d86054b8d5 Added missing line for UB mails
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5544 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-31 19:58:56 +00:00
Wanne da441439ac - Added missing text entries to the _*Text.cpp files
- Removed unused gzWeaponStatsFasthelp[ 32 ] from text files
- Fixed compilation warning in LOS.cpp
- Translated a few text entries for Chinese Version (by zwwooooo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-31 09:00:45 +00:00
lalien a535c48c49 - fixed key ring icon position for all resolutions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-27 20:56:05 +00:00
Flugente 623dcca3ed fix: carrying corpses did not raise suspicion like it should
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5539 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-27 20:48:39 +00:00
Flugente 6a05d44d85 - added second weapon cleaning operation to clean all guns
- added missing texts
- cleaned up tripwire-related code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-27 20:25:50 +00:00
Wanne 42cacb0bf3 - Added new "Mercenary Stats.xls" file (by Dan)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1534 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-27 07:45:03 +00:00
Flugente 2ebe96ca59 New Attachment: the rifle grenade device (<AttachmentClass>33554432</AttachmentClass>) acts as a GL on the barrel slot, but blocks all other firing modes, and uses up one bullet.
It is strongly advised not to use this in combination with other underbarrel GLs.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5537 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-26 18:59:37 +00:00
Flugente a7651e3557 New Attachment: the rifle grenade device (<AttachmentClass>33554432</AttachmentClass>) acts as a GL on the barrel slot, but blocks all other firing modes, and uses up one bullet.
It is strongly advised not to use this in combination with other underbarrel GLs.

Currently allowed for WW2 rifles with 40mm grenades.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1533 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-26 18:48:52 +00:00
Flugente 3dbdd4b2ad added a global modifier to singleshot temperature (for those who feel the current values are too low or high).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-25 17:27:28 +00:00
Flugente 684893b98b added a global modifier to singleshot temperature (for those who feel the current values are too low or high).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1532 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-25 17:26:29 +00:00
Flugente e83afa8aa0 added stealing, cutting fences (and with that building fortifications) to the list of suspicious actions for the covert trait
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5534 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-25 16:45:42 +00:00
Wanne b5b5944363 - Updated UB ja2_options.ini
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1531 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-25 14:13:54 +00:00
inshy 071947d9da Translated to French speech for new MERCs
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5532 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-25 14:07:08 +00:00
Flugente dc815eabd1 restored Option descriptions that got lost
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1530 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-25 13:37:41 +00:00
Flugente fd445fe5ed New feature: Covert ops
- you can disguise members of your team as civilians or soldiers and, if careful, avoid detection by the enemy.
- For more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/309312/New_feature_Covert_operations.html#Post309312
- GameDir revision >= 1529 is needed for this feature

- fixed a bug that could cause inventory items to be treated like armed bombs
- bloodcats can now be skinned

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 23:52:55 +00:00
Flugente 242faa22a0 added data and new STI's necessary for the new covert ops trait
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1529 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 23:48:48 +00:00
lalien fa1586b22b - loading screen stretching for all resolutions fix
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 14:45:25 +00:00
Wanne 7e0ae436f7 - Added 2 missing properties in Ja2_Settings.INI
- UB: Added missing INI files


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1527 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 14:19:51 +00:00
lalien 3a599c1e2f - loading screen stretching for all resolutions fixed
- warning in GameSettings.cpp fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 13:55:06 +00:00
Wanne 18f2420a2e - Updated Version: 5520
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5521 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 13:31:48 +00:00
Wanne 79ad0085f8 - Deleted UB loadscreens (800x600 and 1024x768)
- Added UB loadscreens in PNG format
- Updated SectorLoadscreens.xml comments

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1523 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 13:11:21 +00:00
Wanne 7a8475fb45 - Bugfix: If loadscreen does not exist, the filename was not outputted
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5519 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 12:55:59 +00:00
Wanne 6671e0a8f8 - Bugfix: Fixed problem, that the correct loadscreen never was not found, although is exists
- Cleaned up the Loading Screen.cpp file

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 12:35:01 +00:00
Wanne 0308305d11 - The "Data-JA2Demo" MOD SVN trunk is located here:
https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2_113_Demo

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1522 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 09:14:24 +00:00
Wanne 82da158d85 - Moved the "Data-JA2Demo" MOD folder to its own SVN trunk:
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1521 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 09:13:25 +00:00
Wanne 114f0064c4 - Removed the "JA113NODEMO" define
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 08:15:20 +00:00
Wanne 061ea16cea - Removed the "ENABLE_DISPLAY_EXPLOSIVES" define
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 07:59:13 +00:00
Wanne 9fc9f09472 - Removed the "ENABLE_RIFLE_SLING" define
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 07:52:17 +00:00
Wanne 08eead9a2a - Updated GameDir for the UB Mods
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1520 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 01:58:21 +00:00
Wanne 306c4645b0 - Updated the file structure of the Unfinished Business 1.13 MOD
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1519 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 01:40:39 +00:00
Wanne 22bfe2a32c - Deleted the "Data-Files" and "Language" folder for the UB Mod
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1518 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 00:48:18 +00:00
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