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
b53fe0cd72ec02c12781aa676f37aba298b25619
source/Laptop
T
History
Wanne c74e13fb5c - Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv) 
o Added faces (except camo faces), speech, bio, ...
o All those 4 mercs are available at M.E.R.C
o Added INI options for enabling/disabling recruitable Speck, Kulba and natives
o If enabled, Kulba becomes available as a MERC merc after finishing escort quest, delay is configurable (two weeks by default). He won't be available earlier even if MERC_WEBSITE_ALL_MERCS_AVAILABLE is set to TRUE
see: http://www.bears-pit.com/board/ubbthreads.php/topics/298288/47.html

- Improvement: MERC mercs get unlocked according to their own availability conditions, not to their order in MercAvailability.xml


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6258 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-07-29 11:48:53 +00:00
..
aim.cpp
- Laptop features & Fixes (by Buggler)
2013-01-03 10:17:21 +00:00
aim.h
************************************************************
2011-01-18 09:11:09 +00:00
AimArchives.cpp
*** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***
2012-03-23 18:46:54 +00:00
AimArchives.h
*** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***
2012-03-23 18:46:54 +00:00
AimFacialIndex.cpp
BR Info Panel Enhancements (by Buggler)
2013-01-07 21:35:26 +00:00
AimFacialIndex.h
************************************************************
2011-01-18 09:11:09 +00:00
AimHistory.cpp
************************************************************
2011-01-18 09:11:09 +00:00
AimHistory.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
AimLinks.cpp
- Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv)
2013-07-29 11:48:53 +00:00
AimLinks.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
AimMembers.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
AimMembers.h
bug fixes from Overhaul:
2007-05-09 13:16:37 +00:00
AimPolicies.cpp
************************************************************
2011-01-18 09:11:09 +00:00
AimPolicies.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
AimSort.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
AimSort.h
Features (by Buggler)
2012-10-21 16:10:49 +00:00
BobbyR.cpp
Feature change - Bobby Ray Selection on New Game screen split into two items: Quality and Quantity. Selectors allow for full 1-10 range of quality (coolness) / quantity multipliers, instead of just 1,2,4,10.
2012-05-24 19:41:11 +00:00
BobbyR.h
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
BobbyRAmmo.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
BobbyRAmmo.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
BobbyRArmour.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
BobbyRArmour.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
BobbyRGuns.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
BobbyRGuns.h
New Misc filter buttons for Bobby Rays, by attachmentClass:
2012-05-18 04:36:52 +00:00
BobbyRMailOrder.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
BobbyRMailOrder.h
*** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***
2012-03-23 18:46:54 +00:00
BobbyRMisc.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
BobbyRMisc.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
BobbyRShipments.cpp
- Bobby Ray Fixes (by tazpn)
2012-04-09 10:24:30 +00:00
BobbyRShipments.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
BobbyRUsed.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
BobbyRUsed.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
BriefingRoom.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
BriefingRoom.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
BriefingRoomM.cpp
- Updated Briefing room / Encyclopedia (by Jazz)
2013-06-10 20:12:56 +00:00
BriefingRoomM.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
BrokenLink.cpp
BUGZILLA #549: Fixed mercs not showing up on MERC website
2011-07-21 16:38:11 +00:00
BrokenLink.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
CharProfile.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
CharProfile.h
************************************************************
2011-01-18 09:11:09 +00:00
email.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
email.h
- Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv)
2013-07-29 11:48:53 +00:00
Encyclopedia_Data.cpp
Fix: loading a savegame that was started with an exe without ENABLE_BRIEFINGROOM was impossible with an exe with ENABLE_BRIEFINGROOM enabled.
2013-07-07 11:10:12 +00:00
Encyclopedia_Data.h
- Encyclopedia / Briefing Room Updates (by Jazz)
2013-06-13 22:34:43 +00:00
Encyclopedia.cpp
- Encyclopedia / Briefing Room Updates (by Jazz)
2013-06-13 22:34:43 +00:00
Encyclopedia.h
- Encyclopedia / Briefing Room Updates (by Jazz)
2013-06-13 22:34:43 +00:00
files.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
files.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
finances.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
finances.h
- New Feature: The rosine system now allows to capture enemy soldeirs via using handcuffs on them. They can e transferred to a prison the player controls, and be interrogated there.
2012-12-03 00:50:48 +00:00
florist Cards.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
florist Cards.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
florist Gallery.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
florist Gallery.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
florist Order Form.cpp
- Externalized Florist Delivery Locations by tagging to externalized BobbyR locations (by Buggler)
2013-02-23 09:45:27 +00:00
florist Order Form.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
florist.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
florist.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
funeral.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
funeral.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
GunEmporium.cpp
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
GunEmporium.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
history.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
history.h
************************************************************
2011-01-18 09:11:09 +00:00
IMP AboutUs.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP AboutUs.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
IMP Attribute Entrance.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Attribute Entrance.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
IMP Attribute Finish.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Attribute Finish.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
IMP Attribute Selection.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
IMP Attribute Selection.h
Merged "Enhanced IMP Creation" (by Sandro)
2009-06-04 10:44:23 +00:00
IMP Begin Screen.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Begin Screen.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
IMP Character and Disability Entrance.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Character and Disability Entrance.h
Merged "Enhanced IMP Creation" (by Sandro)
2009-06-04 10:44:23 +00:00
IMP Character Trait.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
IMP Character Trait.h
************************************************************
2011-01-18 09:11:09 +00:00
IMP Color Choosing.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Color Choosing.h
************************************************************
2011-01-18 09:11:09 +00:00
IMP Compile Character.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Compile Character.h
************************************************************
2011-01-18 09:11:09 +00:00
IMP Confirm.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
IMP Confirm.h
*** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***
2012-03-23 18:46:54 +00:00
IMP Disability Trait.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
IMP Disability Trait.h
new disabilities:
2013-05-02 00:15:51 +00:00
IMP Finish.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Finish.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
IMP HomePage.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP HomePage.h
*********************************************************
2006-05-01 19:19:45 +00:00
IMP MainPage.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP MainPage.h
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
IMP Minor Trait.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
IMP Minor Trait.h
************************************************************
2011-01-18 09:11:09 +00:00
IMP Personality Entrance.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Personality Entrance.h
************************************************************
2011-01-18 09:11:09 +00:00
IMP Personality Finish.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Personality Finish.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
IMP Personality Quiz.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Personality Quiz.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
IMP Portraits.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMP Portraits.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
IMP Skill Trait.cpp
New feature: Covert ops
2012-08-24 23:52:55 +00:00
IMP Skill Trait.h
New feature: Covert ops
2012-08-24 23:52:55 +00:00
IMP Text System.cpp
BUGZILLA #573: IMP creation skills (by silversurfer)
2013-06-26 05:56:22 +00:00
IMP Text System.h
Merged "Enhanced IMP Creation" (by Sandro)
2009-06-04 10:44:23 +00:00
IMP Voices.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
IMP Voices.h
Code changes to allow more slots for IMPs.
2007-03-26 01:47:14 +00:00
IMPVideoObjects.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
IMPVideoObjects.h
Merged "Enhanced IMP Creation" (by Sandro)
2009-06-04 10:44:23 +00:00
insurance Comments.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
insurance Comments.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
insurance Contract.cpp
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
insurance Contract.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
insurance Info.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
insurance Info.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Insurance Text.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
insurance.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
insurance.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Laptop All.h
- fixed some compilation errors in VS 2003 (but not all)
2008-03-27 13:50:06 +00:00
Laptop_VS2005.vcproj
*** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***
2012-03-23 18:46:54 +00:00
Laptop_VS2008.vcproj
- Updated VS 2008 project files (by tazpn)
2012-04-02 08:53:05 +00:00
Laptop_VS2010.vcxproj
- Updated VS 2010 project files to allow different ways for building the executable (by tazpn)
2012-04-02 08:51:48 +00:00
Laptop_VS2010.vcxproj.filters
*** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***
2012-03-23 18:46:54 +00:00
laptop.cpp
- Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv)
2013-07-29 11:48:53 +00:00
laptop.h
New Misc filter buttons for Bobby Rays, by attachmentClass:
2012-05-18 04:36:52 +00:00
LaptopSave.h
- Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv)
2013-07-29 11:48:53 +00:00
mercs Account.cpp
New feature: The M.E.R.C. website now also has gearkits (by JMich)
2012-08-21 20:36:47 +00:00
mercs Account.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
mercs Files.cpp
- Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv)
2013-07-29 11:48:53 +00:00
mercs Files.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
mercs No Account.cpp
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
mercs No Account.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
mercs.cpp
- Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv)
2013-07-29 11:48:53 +00:00
mercs.h
- Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv)
2013-07-29 11:48:53 +00:00
personnel.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
personnel.h
************************************************************
2011-01-18 09:11:09 +00:00
PostalService.cpp
- Bugfix: Removed the static declaration of NV_AP_COST and BR_FAST_SHIP since they were not cleared (because of static) on a new game (by JMich)
2012-04-12 11:35:12 +00:00
PostalService.h
MERGED bugfixes from revision: 4917
2012-02-29 00:34:23 +00:00
sirtech.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
sirtech.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Speck Quotes.h
Added Speck as a playable merc (by anv)
2013-07-11 19:54:50 +00:00
Store Inventory.cpp
Feature change - Bobby Ray Selection on New Game screen split into two items: Quality and Quantity. Selectors allow for full 1-10 range of quality (coolness) / quantity multipliers, instead of just 1,2,4,10.
2012-05-24 19:41:11 +00:00
Store Inventory.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
XML_AIMAvailability.cpp
************************************************************
2011-01-18 09:11:09 +00:00
XML_ConditionsForMercAvailability.cpp
************************************************************
2011-01-18 09:11:09 +00:00
XML_DeliveryMethods.cpp
Bugfix: Game crashes at startup when Release version is compiled, ONLY with Visual Studio 2008 (by birdflu)
2009-05-03 08:59:07 +00:00
XML_Email.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
XML_EmailMercAvailable.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
XML_EmailMercLevelUp.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
XML_EncyclopediaLocation.cpp
- Updated Briefing room / Encyclopedia (by Jazz)
2013-06-10 20:12:56 +00:00
XML_IMPPortraits.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
XML_OldAIMArchive.cpp
*** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***
2012-03-23 18:46:54 +00:00
XML_ShippingDestinations.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00