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
5b24d136f2078db3a977f24cc77b093c30e9bc13
source/Strategic
T
History
Shadooow 90d5230c6e fixes for combining items with CTRL + LMB 
- fixed regression causing this to substract APs in mapscreen even with no enemies in sector causing this to fail after several merges
- a "Not enough APs!" error will now show when doing this in turn based mode without enough APs
- fixed merc APs on portrait not being updated when doing this in mapscreen during fight
- fixed merged items not updating their graphic when doing this in mapscreen with stack of items in hand

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9069 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-06-09 20:10:39 +00:00
..
AI Viewer.cpp
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
ASD.cpp
ASD deployment fix (by rftr):
2021-04-27 04:00:07 +00:00
ASD.h
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
Assignments.cpp
Fixed function PickPocket to work with MOLLE type of LBEs (by Shadooow).
2021-05-11 04:40:54 +00:00
Assignments.h
Fixed function PickPocket to work with MOLLE type of LBEs (by Shadooow).
2021-05-11 04:40:54 +00:00
Auto Resolve.cpp
Fix for Dynamic Opinions feature not respecting ini setting and not allowing it to be disabled easily (by Shadooow).
2021-05-05 03:40:57 +00:00
Auto Resolve.h
New feature: bloodcat/zombie/bandit raids on player-controlled sectors
2018-04-15 14:42:01 +00:00
Campaign Init.cpp
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
Campaign Init.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Campaign Types.h
Build 21.04.04
2021-04-04 17:40:11 +00:00
Creature Spreading.cpp
Fix: compiler warnings
2020-05-30 14:26:16 +00:00
Creature Spreading.h
- Fix: creature attack variables are not always cleaned up properly
2018-05-14 19:08:17 +00:00
Facilities.cpp
Fix: mercs staffing a facility for global propaganda cause mine income to drop to 0%
2020-07-06 22:36:56 +00:00
Facilities.h
Merged from revision: 7199
2014-05-11 05:58:07 +00:00
Game Clock.cpp
Bugfix for game clock mouse region in map screen (by Moa)
2013-09-25 06:47:17 +00:00
Game Clock.h
Game clock improvements (by Moa)
2013-08-25 13:38:21 +00:00
Game Event Hook.cpp
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
Game Event Hook.h
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
Game Events.cpp
New feature: the refilling of the queen's army resevere now requires her to train recruits, which the player can disrupt to some degree (by sun_alf)
2020-06-29 20:12:53 +00:00
Game Events.h
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
Game Init.cpp
Fix: crash after heli landing in UB (by Asdow)
2020-06-01 20:53:22 +00:00
Game Init.h
- New Feature: Enemy Generals are unique enemies whose location randomized and unknwon to the player. As long as they are alive, the enemy gets signifiant strategic boni. The player must learn of their location and take take them out, preferrably without alerting them prior.
2014-05-01 13:28:33 +00:00
Hourly Update.cpp
Fix for Dynamic Opinions feature not respecting ini setting and not allowing it to be disabled easily (by Shadooow).
2021-05-05 03:40:57 +00:00
Ja25 Strategic Ai.cpp
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
Ja25 Strategic Ai.h
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
Luaglobal.cpp
The following options have been moved from the campaign the campaign start screen to JA2_Options.ini:
2018-09-02 15:14:01 +00:00
Luaglobal.h
New Lua Externalization (Quests.lua) (by Jazz)
2013-06-19 11:19:57 +00:00
LuaInitNPCs.cpp
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
LuaInitNPCs.h
Fix: various compile warnings
2020-07-24 19:27:34 +00:00
Map Screen Helicopter.cpp
Use macro where appropriate for easier maintenance
2020-07-07 19:47:52 +00:00
Map Screen Helicopter.h
- New Feature: Arulco special division controls other features to fight the player. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343706&#msg_343706
2016-01-09 19:45:30 +00:00
Map Screen Interface Border.cpp
Fix: noticable lag on slow machines or while debugging when plotting a path in strategic view
2020-07-02 21:58:45 +00:00
Map Screen Interface Border.h
New feature: quest & intel map overlay
2018-05-14 21:26:37 +00:00
Map Screen Interface Bottom.cpp
Fix: noticable lag on slow machines or while debugging when plotting a path in strategic view
2020-07-02 21:58:45 +00:00
Map Screen Interface Bottom.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
Map Screen Interface Map Inventory.cpp
fixed bug when manually placing item from soldier/vehicle inventory to not currently loaded sector inventory bugged the items and made them inaccesible after the sector got loaded
2021-05-29 04:16:46 +00:00
Map Screen Interface Map Inventory.h
New Feature: gear templates allow us to save and load a merc's equipment, thereby speeding up the equipment process.
2017-08-06 21:06:49 +00:00
Map Screen Interface Map.cpp
Fixed vs2010 compilation errors.
2020-11-01 05:01:11 +00:00
Map Screen Interface Map.h
Fix: noticable lag on slow machines or while debugging when plotting a path in strategic view
2020-07-02 21:58:45 +00:00
Map Screen Interface TownMine Info.cpp
New feature: quest & intel map overlay
2018-05-14 21:26:37 +00:00
Map Screen Interface TownMine Info.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Map Screen Interface.cpp
Allowed moving items between mercs in map screen during combat for mercs that are not in the sector where battle is occurring (by Shadooow).
2021-05-07 17:45:35 +00:00
Map Screen Interface.h
New militia order: Move to (works in realtime only, switches militia soldier to DTATIONARY/DEFENSIVE).
2021-02-26 12:14:11 +00:00
MapScreen Quotes.cpp
- UB Improvements / Cleanup (by Jazz)
2013-08-28 17:06:43 +00:00
MapScreen Quotes.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
mapscreen.cpp
fixes for combining items with CTRL + LMB
2021-06-09 20:10:39 +00:00
mapscreen.h
Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
2018-03-10 15:31:11 +00:00
Meanwhile.cpp
Use macro where appropriate for easier maintenance
2020-07-07 19:47:52 +00:00
Meanwhile.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Merc Contract.cpp
partial revert of 9063 - less code, same functionality
2021-06-05 06:28:44 +00:00
Merc Contract.h
New Trait: Snitch (Trait 22) (by anv)
2014-01-01 12:02:23 +00:00
MilitiaIndividual.cpp
New feature: turncoats can be created from enemies and ordered to switch sides
2020-05-30 00:13:42 +00:00
MilitiaIndividual.h
New feature: turncoats can be created from enemies and ordered to switch sides
2020-05-30 00:13:42 +00:00
MilitiaSquads.cpp
Use macro where appropriate for easier maintenance
2020-07-07 19:47:52 +00:00
MilitiaSquads.h
Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
2018-03-10 15:31:11 +00:00
Player Command.cpp
Fixes by Shadooow:
2021-04-19 05:37:36 +00:00
Player Command.h
- New Feature: Arulco special division controls other features to fight the player. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343706&#msg_343706
2016-01-09 19:45:30 +00:00
PreBattle Interface.cpp
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
PreBattle Interface.h
New feature: bloodcat/zombie/bandit raids on player-controlled sectors
2018-04-15 14:42:01 +00:00
Queen Command.cpp
More turncoat-related fixes and tweaks (by rftr):
2021-04-29 06:28:40 +00:00
Queen Command.h
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
Quest Debug System.cpp
Store the profile type in the profile structure and remove superfluous code
2018-09-24 19:36:28 +00:00
Quest Debug System.h
**********************************************************
2010-02-28 18:38:52 +00:00
Quests.cpp
Use macro where appropriate for easier maintenance
2020-07-07 19:47:52 +00:00
Quests.h
In order to prevent conflicts, Facts set by stock NPC conversations are now noted in the facts-enum
2018-06-09 19:13:33 +00:00
QuestText.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Reinforcement.cpp
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
Reinforcement.h
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
Scheduling.cpp
cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman)
2013-05-27 21:01:04 +00:00
Scheduling.h
**********************************************************
2010-02-28 18:38:52 +00:00
Strategic AI.cpp
ASD deployment fix (by rftr):
2021-04-27 04:00:07 +00:00
Strategic AI.h
ASD deployment fix (by rftr):
2021-04-27 04:00:07 +00:00
Strategic All.h
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
Strategic Event Handler.cpp
New feature: the refilling of the queen's army resevere now requires her to train recruits, which the player can disrupt to some degree (by sun_alf)
2020-06-29 20:12:53 +00:00
Strategic Event Handler.h
New feature: bloodcat/zombie/bandit raids on player-controlled sectors
2018-04-15 14:42:01 +00:00
Strategic Merc Handler.cpp
fix: vehicles will also not count into number of mercenenaries died under player command
2021-05-23 20:55:10 +00:00
Strategic Merc Handler.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
Strategic Mines LUA.cpp
************************************************************
2011-01-18 09:11:09 +00:00
Strategic Mines LUA.h
************************************************************
2011-01-18 09:11:09 +00:00
Strategic Mines.cpp
Use macro where appropriate for easier maintenance
2020-07-07 19:47:52 +00:00
Strategic Mines.h
************************************************************
2011-01-18 09:11:09 +00:00
Strategic Movement Costs.cpp
Fix: militia can retreat to impassable sectors in autoresolve
2020-07-04 14:46:19 +00:00
Strategic Movement.cpp
Fix for leaving merc never reaching final sector until current battle is finished (by Shadooow).
2021-04-30 14:16:42 +00:00
Strategic Movement.h
Build 21.04.04
2021-04-04 17:40:11 +00:00
Strategic Pathing.cpp
Use macro where appropriate for easier maintenance
2020-07-07 19:47:52 +00:00
Strategic Pathing.h
- Fix: possible crash if enemy forces arrive via non-group (enemy heli)
2018-03-08 21:49:26 +00:00
Strategic Status.cpp
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
Strategic Status.h
Moving Tanks Feature (by anv)
2014-06-18 18:10:07 +00:00
Strategic Town Loyalty.cpp
Fix for Dynamic Opinions feature not respecting ini setting and not allowing it to be disabled easily (by Shadooow).
2021-05-05 03:40:57 +00:00
Strategic Town Loyalty.h
New feature: the refilling of the queen's army resevere now requires her to train recruits, which the player can disrupt to some degree (by sun_alf)
2020-06-29 20:12:53 +00:00
strategic town reputation.cpp
Store the profile type in the profile structure and remove superfluous code
2018-09-24 19:36:28 +00:00
strategic town reputation.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Strategic Turns.cpp
Improve loading speed of stash (by Moa)
2013-09-23 06:59:29 +00:00
Strategic Turns.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Strategic_VS2005.vcproj
Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
2018-03-10 15:31:11 +00:00
Strategic_VS2008.vcproj
Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
2018-03-10 15:31:11 +00:00
Strategic_VS2010.vcxproj
Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
2018-03-10 15:31:11 +00:00
Strategic_VS2010.vcxproj.filters
Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
2018-03-10 15:31:11 +00:00
Strategic_VS2013.vcxproj
Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
2018-03-10 15:31:11 +00:00
Strategic_VS2013.vcxproj.filters
Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
2018-03-10 15:31:11 +00:00
Strategic_VS2017.vcxproj
Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
2018-03-10 15:31:11 +00:00
Strategic_VS2019.vcxproj
Solution for Visual Studio 2019 (by Asdow).
2020-02-27 18:19:27 +00:00
strategic.cpp
fix: if merc dies off screen and is not between sectors, create his corpse and items at the last position he was, when the sector was loaded instead of random GridNo
2021-05-24 01:14:34 +00:00
strategic.h
Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
2018-03-10 15:31:11 +00:00
strategicmap.cpp
Fix: Re-enabled the condition check for mercs to enter tactical screen from map screen. Someone removed it, which made it possible to enter tactical with no mercs in the sector.
2020-08-01 15:22:26 +00:00
strategicmap.h
Cleaned up attachment removal code
2017-06-12 17:09:25 +00:00
Town Militia.cpp
Fix: No longer get individual militia email when individual militia is disabled (by noooooo).
2021-05-01 16:59:59 +00:00
Town Militia.h
New feature: bloodcat/zombie/bandit raids on player-controlled sectors
2018-04-15 14:42:01 +00:00
UndergroundInit.cpp
Add robots to enemy groups (by rftr).
2021-04-03 03:32:40 +00:00
UndergroundInit.h
************************************************************
2011-01-18 09:11:09 +00:00
XML_Army.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
XML_Bloodcats.cpp
************************************************************
2011-01-18 09:11:09 +00:00
XML_CoolnessBySector.cpp
Forgot to commit the source changes in the last commit. Sorry. So, here they are.
2013-04-14 15:54:56 +00:00
XML_Creatures.cpp
Merged from revision: 7270
2014-06-10 19:41:04 +00:00
XML_ExtraItems.cpp
removed obsolete code
2014-08-31 20:42:20 +00:00
XML_Facilities.cpp
*************************
2010-02-20 15:49:46 +00:00
XML_FacilityTypes.cpp
New feature: factories allows facilities to create items
2020-05-17 20:52:27 +00:00
XML_Minerals.cpp
New Feature: Different Mineral Types for Mines (by Jazz & Buggler)
2013-11-12 09:58:18 +00:00
XML_SectorNames.cpp
Revamped <scrounging>-tag of Backgrounds.xml: instead of hoarding items, mercs steal small amounts of money from the locals, which can lower loyalty.
2019-10-22 21:46:53 +00:00
XML_SquadNames.cpp
Fix: if no squad name is provided in xml, fall back on hardcoded name
2020-07-15 21:23:53 +00:00
XML_UniformColors.cpp
************************************************************
2011-01-18 09:11:09 +00:00