1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,636 Commits 9 Branches 6 Tags
89671c218b35a95af90428d6d3e23b752f575c90
Commit Graph
7636 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 1611613bd3 - Removed EnemyTaunts.xml fro UB 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1864 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-11 09:51:07 +00:00
Wanne ef9ca4eaa7 - Added localized version of EnemyTaunts.xml (currently all texts are in English) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6580 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-11 09:50:54 +00:00
Wanne eaadd70ada - Added <uiIndex> Tag to the EnemyTaunts.xml, because of localized version support 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1863 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-11 09:47:49 +00:00
Wanne 294b67ce22 Enemy Taunts 
- Added support for localized version of the EnemyTaunts.xml file
- Added <uiIndex> tag

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6579 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-11 09:46:50 +00:00
Wanne ecdff8e24c Added localized version of Backgrounds.xml 
- Currently all files have English texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6578 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-11 07:52:12 +00:00
Flugente 6ac2d94e5f Fix: included <cmath> in case std::sqrt is unknown 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6577 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-10 20:17:16 +00:00
Flugente 7e5cbd126a - New Feature/exploit enhancement: enter hostile sector with helicopter and land mercs anywhere (see http://www.bears-pit.com/board/ubbthreads.php/topics/327879.html#Post327879) 
- MP entry points are now much more and scale with mapsize

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6576 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-10 19:35:13 +00:00
Flugente 7b57c3c865 - New Feature/exploit enhancement: enter hostile sector with helicopter and land mercs anywhere 
- MP entry points are now much more and scale with mapsize

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1861 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-10 19:32:30 +00:00
Wanne 5b712a8ab7 New Feature: Externalized Enemy taunts (by anv) 
- Taunts will be shown in the tactica log, once enabled (TAUNT_SHOW_IN_LOG = TRUE)
- Enemies will randomly choose their taunt from an pool of applicable ones
- All taunts can be stored in TableData/EnemyTaunts.xml
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/327830/Externalised_taunts.html#Post327830

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1860 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-10 08:27:54 +00:00
Wanne 899d0f15a0 New Feature: Externalized Enemy taunts (by anv) 
- Taunts will be shown in the tactica log, once enabled (TAUNT_SHOW_IN_LOG = TRUE)
- Enemies will randomly choose their taunt from an pool of applicable ones
- All taunts can be stored in TableData/EnemyTaunts.xml
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/327830/Externalised_taunts.html#Post327830


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6575 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-10 08:26:05 +00:00
Wanne 896c1e3e24 Reworked Briefing Room Feature (mission based JA2) (by Jazz) 
- Briefing room feature must be enabled in ja2_options.ini (BRIEFING_ROOM)
- Briefing room can be accessed from the laptop. Enter key "SN5631" and then click the exit button

- see: http://www.bears-pit.com/board/ubbthreads.php/topics/327839/Reworked_Feature_Mission_based.html#Post327839
- see: https://ja2svn.dyndns.org/source/ja2/trunk/Documents/1.13%20Modding/Modding%20Examples/Briefing%20Room%20Modding.txt


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6573 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-10 08:03:47 +00:00
Kriplo b997811a5d -in previous version committed wrong files :-} 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-09 20:55:11 +00:00
Kriplo 4104fbb248 Brief: //dnl ch76 
- Debug performance improvement when working with inventory and UDB.
Details:
- Open UDB was quite slow and then clicking at some attachment slots halted game for few seconds.
- Moving mouse over opened inventory slots with hundreds of items jerking and halting mouse for moment.
- Fix CTD in rare occasions after attach and then remove GL and try attach some improper attachment.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6570 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-09 20:49:40 +00:00
Wanne 12d65e8eba Deleted empty unused 7z folder (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-08 17:00:07 +00:00
Wanne b44716d8af 7z-Library Update to version 7z 9.22 (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6568 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-08 16:59:09 +00:00
Kriplo c9b913127c - Thanks to @Moa suggestions and links for iterators problem under VS2010 debug which throws exceptions after qsort is applied on objects with std::list members, decide to return std::sort for debug version of VS2010 and later although is much much slower. However qsort will remain under all release version and debug versions of older VS as they seems to work fine. 
- Put more comments under my previous inventory changes and throw out altering contents of the array under qsort compare function MapScreenSectorInventoryCompare.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6567 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-07 20:52:02 +00:00
Flugente 1122203771 Fix: radio listening did not work 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-07 20:43:55 +00:00
silversurfer 6c9d6cec68 - fixed bug with CAMO_REMOVING = TRUE 
Too much of a camo kit was used when the character was wearing an outfit with different camo bonus.

- fixed bug with DYNAMIC_IMP_PROFILE_COST = TRUE
The game was always one step behind in cost display but charged the correct price. Now charged price and display match.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-07 19:11:35 +00:00
silversurfer d054395b59 some fixes for NCTH recoil handling 
- first bullet will now always return 0 recoil
- following bullets should now count correctly depending on single or dual wielding shots

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-07 15:13:05 +00:00
Wanne a05bb3ad5b I.M.P. Screen Adjustments 
- Fixed wrong X/Y coordinates of some title positions
- Externalized hardcoded "I.M.P. Prejudices" and "I.M.P. Background" texts to the language cpp files
- A few more minor cosmetics

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6563 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-07 14:34:20 +00:00
Wanne f7f07d4897 - Fixed wrong x-location of IMP title texts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6562 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-07 13:42:05 +00:00
Flugente c55cb02a6a Backgrounds.xml can now be localized. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6560 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-05 19:06:29 +00:00
Flugente 26dfbe9b55 Skill Menu target marker did not refresh correctly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6559 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-05 18:18:36 +00:00
silversurfer 16a7217c21 updated battle sounds for Manuel (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1858 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-05 12:48:50 +00:00
Wanne beecb2d138 Externalizations (by Buggler) 
- Strategic AI garrisons and patrol main spawning sector (thanks to Moa)
- Tixa Sector; separated from Dynamo captive sector to allow modding flexibility 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1857 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-05 12:39:40 +00:00
Wanne ee44781fbe Externalizations (by Buggler) 
- Strategic AI garrisons and patrol main spawning sector (thanks to Moa)
- Tixa Sector; separated from Dynamo captive sector to allow modding flexibility 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6557 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-05 12:39:35 +00:00
Flugente 86a2967508 new radio operator settings: RADIO_OPERATOR_ARTILLERY disables artillery for all teams, RADIO_OPERATOR_ARTILLERY_DISTRIBUTED_OVER_TURNS causes artillery to not fire one massive barrage, but to fire over multipe turns 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6556 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-04 22:32:44 +00:00
Flugente 5d795b50cb new radio operator settings: RADIO_OPERATOR_ARTILLERY disables artillery for all teams, RADIO_OPERATOR_ARTILLERY_DISTRIBUTED_OVER_TURNS causes artillery to not fire one massive barrage, but to fire over multipe turns 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1856 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-04 22:31:47 +00:00
Flugente d3f5d3d9b0 If USE_AIMED_BURST and AIMED_BURST_ALTERNATE_KEY are TRUE, then [Alt] + [t] over a target will toggle aiming. This is for people who have no working mousewheel and thus couldn't aim with auto-only weapons. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6555 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-04 18:25:31 +00:00
Flugente 6796d086d8 If USE_AIMED_BURST and AIMED_BURST_ALTERNATE_KEY are TRUE, then [Alt] + [t] over a target will toggle aiming. This is for people who have no working mousewheel and thus couldn't aim with auto-only weapons. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1855 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-04 18:25:00 +00:00
Kriplo b91bc7b209 Brief: //dnl ch75 
- More map editor fixes and map inventory pool performance improvement for big maps.
Details:
- Fix not showing expected messagebox on exit (ALT+x) which also throw exception and goes to improper mapeditor exit.
- Fix second annoying sticky message which shouldn't popup during map loading and performing RemoveProhibitedAttachments.
- Fix CTD when delete all enemies or civilians or all of them in map.
- Fix some std exception when reporting for missing optional xml file.
- Fix memory and map corruption in old mapeditors if loaded old map has item with invalid attachment and we try to attach something else.
- As years ago pInventoryPoolList had migrated from WORLDITEM* array to std::vector<WORLDITEM> it was time to do that with gWorldItems too, all necessary functions which need to be adopted to gWorldItems std::vector type are also changed.
- Resize code for gWorldItems is changed hoping will lead into less corruption problems as now could occur in mapeditor and game when code automatically doing attachment changes.
- Change code for handling map inventory which now should be fast enough to support AIMNAS project which will probably deal with thousands of items per map.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6554 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-03 16:26:30 +00:00
silversurfer 0c82c1845f Fixed overlapping camo values for armor and LBE vests 
New item property modifier for armor:

CAMO_LBE_OVER_ARMOR_MODIFIER sets the amount of camouflage from armor vests that is used when we wear LBE over them. Default is 0.2. That's basically the arms sticking out of the LBE.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6553 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-02 10:49:29 +00:00
silversurfer aff4f09278 New item property modifier for armor: 
CAMO_LBE_OVER_ARMOR_MODIFIER sets the amount of camouflage from armor vests that is used when we wear LBE over them. Default is 0.2. That's basically the arms sticking out of the LBE.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1854 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-02 10:48:32 +00:00
Wanne ff820a5c45 - Added new items for Radio Operator feature 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-01 13:31:33 +00:00
Wanne 24be2cbd6a Reworked JA1/DG mercs (by anv) 
- Animated new Smoke faces
- Revised Postie, Reuban, Leon and Bud's dialogues (replaced 11khz battle sounds with better quality equivalents, replaced some quotes with better fitting, unlocked 045s, etc.)
- Leon now immediately hates all of his progeny, including both drunk and sober Larry
- Replaced some default nationalities/sexism/racism values for DG mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1853 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-11-01 13:21:51 +00:00
Wanne 7440dd5745 Enhancements (by Buggler) 
- Allows all mercs cover display view by using hotkey '='; multi-selected mercs view only possible in realtime mode

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6551 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-01 13:00:44 +00:00
silversurfer abbf792a76 - added missing flags to ItemFlag.xml 
- added missing explosion type 10 to ExplosionType.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1852 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-10-31 20:56:05 +00:00
Wanne 1588a04ff3 - Deleted unused files from old encyclopedia 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1851 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-10-31 12:13:43 +00:00
Wanne e7bd32dad9 Reworked Encyclopedia (by Moa) 
- Access Encyclopedia from laptop screen
- Encyclopedia can be enabled/disabled in the ja2_options.ini: ENCYCLOPEDIA
- more infos:  http://www.bears-pit.com/board/ubbthreads.php/topics/327315/Re_Ingame_Encyclopaedia.html#Post327315


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6550 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-10-31 11:42:05 +00:00
Wanne 1cca337fa0 Reworked Encyclopedia (by Moa) 
- Updated INI options, INIEditor xml files
- Updated other game dir files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1849 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-10-31 09:22:42 +00:00
Wanne 5872d264f7 Additional Mobile Militia improvements from Rev: 6544 (by Moa) 
- popup for training mobiles allowed training when above maximum

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6548 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-10-31 09:04:11 +00:00
Flugente f17829fac9 New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills. 
Also includes mechansim for easy implementation of new skills.

For more info see http://www.bears-pit.com/board/ubbthreads.php/topics/327348.html#Post327348

Requires GameDir >= r1848.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-10-30 23:05:37 +00:00
Flugente 210658e382 New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1848 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-10-30 22:20:39 +00:00
Flugente bef4e7b52b Fix: DropDown tooltip text was copied 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6545 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-10-30 19:50:00 +00:00
Wanne 397e764983 Mobile Miltia improvements (by Moa) 
- ja2_options.ini: MOBILE_MILITIA_MAX_ACTIVE_MODE, MOBILE_MILITIA_MAX_ACTIVE_MODIFIER
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/325103/2.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1847 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-10-30 19:49:09 +00:00
Wanne 923327ca14 Mobile Miltia improvements (by Moa) 
- ja2_options.ini: MOBILE_MILITIA_MAX_ACTIVE_MODE, MOBILE_MILITIA_MAX_ACTIVE_MODIFIER
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/325103/2.html


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6544 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-10-30 19:48:45 +00:00
Wanne cf06aed52a Bugfix: AP deduct is different then shown (by Moa) 
- no more jump with backpack (keys 'j' and 'J'). This is more consistent. Sometimes the soldier got stuck in the fence as some functions did not allow jumping and others did.
- Pickup items from ground will now cost AP.
- Backpack, Scubba fins and swimming background AP modificattion is now shown in path and is considered when calculating new path. No pathing through fences when wearing backpack. More likely to create path through water when wearing scubba fins.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-10-30 19:36:15 +00:00
Flugente cb53f7bb91 Fix: text outside of laptop boundary on first use of IMP Prejudice webpage 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-10-30 18:55:20 +00:00
silversurfer 27faf8d763 Bugfix: Enemy/Militia Profiles will not overwrite tanks anymore 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-10-30 11:25:54 +00:00
silversurfer 5582f09537 Bugfix for crash with attachment popups and hidden attachments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-10-30 10:22:45 +00:00