1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,621 Commits 9 Branches 6 Tags
latest
Commit Graph
7621 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne a2b757d76a - Included missing XML_Clothes.cpp file to the project file for VS 2005 and VS 2008 
- Updated old text string for foreign languages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 22:11:09 +00:00
Flugente b7e5b324d1 simplified a few lines concerning traits 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 17:44:33 +00:00
Flugente 665917e043 fix: sometimes, wrong clothes were taken off 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5568 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 15:13:05 +00:00
Flugente 3e30b296cf - removed the CLOTHES_CIVILIAN-flag, as it is not needed anymore 
- the Strip function now removes the covert tags, or takes off custom clothes if already not covert
- fix: XML_Clothes.cpp was not included

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5567 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 14:56:45 +00:00
Flugente 86b72ab0fe - added an example clothes merge 
- added clothes to Keith's merchant inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1541 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-09-16 14:54:27 +00:00
Flugente 829c3140ae New feature: clothes items allow colouring of your mercs. See http://www.bears-pit.com/board/ubbthreads.php/topics/310208.html#Post310208 for more information. 
This feature requires GameDir r1540 or greater to work.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 02:57:45 +00:00
Flugente 92ff3c669c New feature: clothes items allow colouring of your mercs. See http://www.bears-pit.com/board/ubbthreads.php/topics/310208.html#Post310208 for more information. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1540 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-09-16 02:53:36 +00:00
Flugente da401b474a added action items for tripwire grenades 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1539 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-09-16 01:05:54 +00:00
Flugente 3d6bc97289 Feature improvement: tripwire, tripwire mines and directional eplosives can now be planted with the map editor. 
- The action item system has been repaired for this. It has never worked correctly prior to this, but the errors never occured.
- New items from GameDir 1538 are required for this to work. They are direct copies of existing items, except for a new tag, <usActionItemFlag>.
- The name of the new action items should clarify in the editor what an item does.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-15 02:28:18 +00:00
Flugente 894221c6f7 Feature improvement: tripwire, tripwire mines and directional eplosives can now be planted with the map editor. 
- The new Items tag <usActionItemFlag> is necessary for that. Necessary items tripwire and claymore have been added. These new items are intended for the map editor, they will however work like their original ingame.
- The action item system has been repaired for this. It has never worked correctly prior to this, but the errors never occured.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1538 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-09-15 02:26:12 +00:00
Flugente 3cc8153a61 - fixed an issue saving the map in vanilla mode (by DepressivesBrot) 
- fixed a minor cosmetic issue (loading wrong frame for the overhead map) (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-13 19:53:14 +00:00
Flugente 99bf161829 typo correction 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1537 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-09-10 18:47:38 +00:00
Flugente 3aa4718403 added 2 new food items (pics by Soto) that fit Arulco better 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1536 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-09-10 18:38:48 +00:00
Flugente 692fff36ed Fix: commented out a code section that altered morale events depending on our current height 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5555 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-05 19:23:13 +00:00
Flugente d0e27b0229 Enhancements of the MOLLE Feature (by DepressivesBrot): 
- Added: Separate message for 'no space' (used 'already there' as a placeholder before)
- Fixed: Exchanging attachments when we are near capacity for the carrier
- Fixed: The LBE shown in the description box now changes as well and as soon as you add/remove an attachment
- Changed: The attachment now transfers the first non-zero pocket to the carrier instead of simply the first
- Added: Tooltips now show the currently used and the available space of a carrier.

- Added: A modifier for the explosive damage in confined spaces (by DepressivesBrot). Implemented on a per-item basis using the new float tag <bIndoorModifier> in Explosives.xml (0.5 means 150% damage, 1.0 means 200% etc.)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-04 19:27:01 +00:00
Flugente 02c53cdf16 fixed a bug that caused crashes when using food system, external feeding or covert ops while TOPTION_SHOW_TACTICAL_FACE_ICONS was false 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-02 21:39:59 +00:00
Flugente 41bc80dc3c - reworked the tripwire nework flags. This will allow much more complex networks in the future. WARNING: planted tripwires in savegames from previous savegames will behave strangely with this version. 
- externalised texts for cleaning, food, corpse handling and covert ops
- tripwire can now be defused even if it does not have a blue flag. When having a wirecutter in the main hand, click on the planted tripwire while crouched, the defuse dialogue will show up.
- corpses spawned from items will behave according to the zombie spawn rules
- fixed a few glitches with the covert ops trait
- fixed a bug that gave the 'mounted' bonus on a roof

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-02 20:38:17 +00:00
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