1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
f8582530ab87c66ff68508fb5e82d835d4e295f7
source/Tactical
T
History
MaddMugsy 56c6f4d9eb -additional code for item merges: 
--prohibited attachments are removed from the new item 
--guns used as a merge target have their ammo removed if the magazine size or caliber don't match, or if the resulting item is no longer a gun

This code change should allow for conversion kits for weapons (ie: Steyr Aug 5.56mm conversion kit to 9mm Steyr Aug Para)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@455 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-18 18:16:38 +00:00
..
Action Items.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Air Raid.cpp
- re enabled strategic event NPC_ACTION_SEND_SOLDIERS_TO_DRASSEN and increased amount of troops
2006-06-17 20:34:23 +00:00
Air Raid.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Animation Cache.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Animation Cache.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Animation Control.cpp
-ammo weights affected by # bullets remaining
2006-08-03 23:55:44 +00:00
Animation Control.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Animation Data.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Animation Data.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Arms Dealer Init.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Arms Dealer Init.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
ArmsDealerInvInit.cpp
-externalized assignment (repair, doctor, training) constants to ja2_options.ini, and added a few for good measure ;)
2006-08-13 17:03:12 +00:00
ArmsDealerInvInit.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Auto Bandage.cpp
Data and Source v1.13 Mod High Resolution version from 2006-03-01
2006-04-19 17:10:53 +00:00
Auto Bandage.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Boxing.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Boxing.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
bullets.cpp
-added explosive ammo code from Callahan
2006-06-26 16:12:05 +00:00
Bullets.h
*********************************************************
2006-05-04 13:29:18 +00:00
Campaign.cpp
-externalized assignment (repair, doctor, training) constants to ja2_options.ini, and added a few for good measure ;)
2006-08-13 17:03:12 +00:00
Campaign.h
-externalized assignment (repair, doctor, training) constants to ja2_options.ini, and added a few for good measure ;)
2006-08-13 17:03:12 +00:00
Civ Quotes.cpp
Data and Source v1.13 Mod High Resolution version from 2006-03-01
2006-04-19 17:10:53 +00:00
Civ Quotes.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Dialogue Control.cpp
*********************************************************
2006-04-26 23:41:05 +00:00
Dialogue Control.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
DisplayCover.cpp
- increased max size of visible range and cover display
2006-06-11 12:42:54 +00:00
DisplayCover.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Drugs And Alcohol.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Drugs And Alcohol.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
End Game.cpp
- bug fix: CTD in endgame when killing Deidrana
2006-06-09 20:35:59 +00:00
End Game.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Enemy Soldier Save.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Enemy Soldier Save.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Faces.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
faces.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
fov.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
fov.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
GAP.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
GAP.H
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Handle Doors.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Handle Doors.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Handle Items.cpp
-externalized assignment (repair, doctor, training) constants to ja2_options.ini, and added a few for good measure ;)
2006-08-13 17:03:12 +00:00
Handle Items.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Handle UI Plan.cpp
-continuation of last update
2006-06-03 06:23:46 +00:00
Handle UI Plan.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Handle UI.cpp
- fix for HE ammo
2006-07-17 16:39:48 +00:00
Handle UI.h
-added scifi tag to items.xml
2006-08-10 22:39:13 +00:00
Interface Control.cpp
*********************************************************
2006-05-01 20:59:34 +00:00
Interface Control.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Interface Cursors.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Interface Cursors.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Interface Dialogue.cpp
-added ENABLE_CREPITUS flag to options ini file to enable/disable crepitus even in sci-fi mode
2006-08-11 19:29:50 +00:00
interface Dialogue.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Interface Items.cpp
-ammo weight calculation changes from pulmu
2006-08-08 17:10:10 +00:00
Interface Items.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Interface Panels.cpp
-ammo weights affected by # bullets remaining
2006-08-03 23:55:44 +00:00
Interface Panels.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Interface Utils.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Interface Utils.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Interface.cpp
- added more stats to soldier tool tip
2006-06-24 23:08:14 +00:00
Interface.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Inventory Choosing.cpp
-fixed guns being chosen from too high a level in "Normal Guns" mode
2006-07-07 05:40:20 +00:00
Inventory Choosing.h
Data and Source v1.13 Mod High Resolution version from 2006-04-15
2006-04-19 18:16:27 +00:00
Item Types.h
-fixed integral bipods not working properly
2006-08-14 15:58:56 +00:00
Items.cpp
-additional code for item merges:
2006-08-18 18:16:38 +00:00
Items.h
-tested and fixed new camouflage types and ammo weights
2006-08-04 05:21:14 +00:00
Keys.cpp
- externalized settings for mobile militia
2006-05-31 20:04:47 +00:00
Keys.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
LOS.cpp
-tested and fixed new camouflage types and ammo weights
2006-08-04 05:21:14 +00:00
LOS.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Map Information.cpp
- fixed freeze after loading any saved game at a second time
2006-08-18 15:37:52 +00:00
Map Information.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Merc Entering.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
merc entering.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Merc Hiring.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Merc Hiring.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Militia Control.cpp
- fixed strings for Auto Resolve
2006-05-31 21:39:26 +00:00
Militia Control.h
*********************************************************
2006-05-01 20:59:34 +00:00
Morale.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Morale.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
opplist.cpp
- bug fix: visual range was very big (should be 0) when VISUAL_DISTANCE_DECREASE_PER_RAIN_INTENSITY was set to > 50%
2006-07-25 00:27:31 +00:00
opplist.h
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-05-31 03:55:50 +00:00
Overhead Types.h
-added underslung/attached GLs to AI inventory and enabled AI to use them :)
2006-06-10 07:22:16 +00:00
Overhead.cpp
-increased chance of damage from gas by 5%
2006-08-13 23:04:39 +00:00
Overhead.h
Data and Source v1.13 Mod High Resolution version from 2006-04-15
2006-04-19 18:16:27 +00:00
PATHAI.cpp
Fix: Correct offsets in laptop zoom in/out animation in all 3 resolutions
2006-07-20 17:54:52 +00:00
PATHAI.H
-CTD fix in Tixa in function FindBestPath in PathaAi.cpp
2006-07-07 20:37:08 +00:00
PathAIDebug.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Points.cpp
-added ammo weight fixes from Pulmu, including dynamic ammo weight option in ini file
2006-08-04 15:48:16 +00:00
Points.h
- new feature: manual reload
2006-06-05 22:37:34 +00:00
QARRAY.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
qarray.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Rain.cpp
Little Alien
2006-05-10 22:31:33 +00:00
Rain.h
Data and Source v1.13 Mod High Resolution version from 2006-03-16
2006-04-19 17:22:20 +00:00
Real Time Input.cpp
*********************************************************
2006-05-01 20:59:34 +00:00
Rotting Corpses.cpp
-added ENABLE_CREPITUS flag to options ini file to enable/disable crepitus even in sci-fi mode
2006-08-11 19:29:50 +00:00
Rotting Corpses.h
-ammo weights affected by # bullets remaining
2006-08-03 23:55:44 +00:00
rt time defines.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
ShopKeeper Interface.cpp
-fixed negative ammo prices
2006-08-14 03:04:43 +00:00
ShopKeeper Interface.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
ShopKeeper Quotes.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
SkillCheck.cpp
Data and Source v1.13 Mod High Resolution version from 2006-03-01
2006-04-19 17:10:53 +00:00
SkillCheck.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Soldier Add.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Soldier Add.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Soldier Ani.cpp
- dying soldiers don't fallback into obstacles anymore. but they still fallback through wall
2006-08-17 16:54:13 +00:00
Soldier Ani.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Soldier Control.cpp
-externalized assignment (repair, doctor, training) constants to ja2_options.ini, and added a few for good measure ;)
2006-08-13 17:03:12 +00:00
Soldier Control.h
-ammo weights affected by # bullets remaining
2006-08-03 23:55:44 +00:00
Soldier Create.cpp
-fixed camo not working on enemy soldiers
2006-08-16 17:27:20 +00:00
Soldier Create.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Soldier Find.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Soldier Find.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Soldier Functions.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Soldier Init List.cpp
- moving militia bug fix: militia was not in sector at battle start
2006-05-31 17:43:34 +00:00
Soldier Init List.h
Little Alien
2006-05-10 22:31:33 +00:00
Soldier macros.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
soldier profile type.h
-ammo weights affected by # bullets remaining
2006-08-03 23:55:44 +00:00
Soldier Profile.cpp
-added ENABLE_ALL_WEAPON_CACHES and ENABLE_ALL_TERRORIST flags (requires new game to use)
2006-08-12 00:56:26 +00:00
Soldier Profile.h
Data and Source v1.13 Mod High Resolution version from 2006-03-01
2006-04-19 17:10:53 +00:00
Soldier Tile.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
soldier tile.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Spread Burst.cpp
-small change to autofire spread bursts to enable selection of # of rounds fired
2006-08-11 04:44:21 +00:00
Spread burst.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Squads.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Squads.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Strategic Exit GUI.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Strategic Exit GUI.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Structure Wrap.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Structure Wrap.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Tactical All.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Tactical Save.cpp
Changes to make things harder:
2006-06-16 19:47:03 +00:00
Tactical Save.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Tactical Turns.cpp
Little Alien
2006-05-10 22:31:33 +00:00
Tactical Turns.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Tactical.dep
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Tactical.dsp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Tactical.mak
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Tactical.vcproj
Little Alien
2006-05-21 14:08:28 +00:00
TeamTurns.cpp
-externalized assignment (repair, doctor, training) constants to ja2_options.ini, and added a few for good measure ;)
2006-08-13 17:03:12 +00:00
TeamTurns.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Turn Based Input.cpp
-madlab no longer allowed to set fingerprintid on rocket rifles
2006-08-05 00:05:24 +00:00
UI Cursors.cpp
Fix: Correct offsets in laptop zoom in/out animation in all 3 resolutions
2006-07-20 17:54:52 +00:00
UI Cursors.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Vehicles.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Vehicles.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Weapons.cpp
-re-added equipment bonus application code removed earlier. Turned out the new code isn't called in the strategic map.
2006-07-31 23:40:36 +00:00
Weapons.h
- fixed the bug fix from build 365: Smoke grenade has the same effect as mustard gas grenade (need to run in gas cloud to reproduce)
2006-07-22 20:10:55 +00:00
World Items.cpp
Data and Source v1.13 Mod High Resolution version from 2006-04-15
2006-04-19 18:16:27 +00:00
World Items.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_AmmoStrings.cpp
Data and Source v1.13 Mod High Resolution version from 2006-04-15
2006-04-19 18:16:27 +00:00
XML_AmmoTypes.cpp
*********************************************************
2006-05-01 19:19:45 +00:00
XML_Armour.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_AttachmentInfo.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_Attachments.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_BurstSounds.cpp
Data and Source v1.13 Mod High Resolution version from 2006-04-15
2006-04-19 18:16:27 +00:00
XML_ComboMergeInfo.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_CompatibleFaceItems.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_EnemyItemChoice.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_EnemyWeaponChoice.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_Explosive.cpp
-changed light and smoke effect durations back to UINT8s
2006-06-08 23:48:25 +00:00
XML_IMPItemChoices.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_IncompatibleAttachments.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_Launchable.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_Magazine.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_Merge.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_Sounds.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_TonyInventory.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML.h
-tested and fixed new camouflage types and ammo weights
2006-08-04 05:21:14 +00:00