Commit Graph
37 Commits
Author SHA1 Message Date
Sevenfm a94a32aa97 Solution for Visual Studio 2019 (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-02-27 18:19:27 +00:00
Flugente 380d858d2c Added VS2017 solution and project files (by DepressivesBrot)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-02 13:00:46 +00:00
Wanne 5c062ff752 Extended "Merc Random Stats Feature" (by Jenilee)
- Added 4th option for MERCS_RANDOM_STATS (MERCS_RANDOM_STATS = 4)
  o full randomization of mercs, including traits, gear kits and all statistics
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/328769.html#Post328769

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6676 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-03 10:14:15 +00:00
Wanne 08236ee9f4 Added VS2013 solution and project files (by JMich)
- You can also open them with VS 2012
- I just changed the toolset for all projects to V100 (VS 2010) instead of V120 (VS 2013), because I don't have VS 2013 installed. If anyone can't compile with VS 2013, we simply switch back to V120 toolset

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6639 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-21 07:57:52 +00:00
Flugente 9bd26015e5 cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-27 21:01:04 +00:00
Flugente f92f70c78d cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-27 20:38:52 +00:00
Wanne ca873a8222 - Updated VS 2008 project files (by tazpn)
o Set /Zi to be standard for Release, ReleaseWithDebugInfo
o Enable PDB for Release builds so crash dump is more effective (have to deliver PDB with releases)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5137 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-02 08:53:05 +00:00
Wanne 0333be5eb2 - Updated VS 2010 project files to allow different ways for building the executable (by tazpn)
o Take a look in the comment header for the "Language Defines.h" file for further informations
o Enable PDF for Release builds, so crash dump is more effective (of course if we release a version we also have to release the PDB file)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5136 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-02 08:51:48 +00:00
Wanne da81430991 - Reverted the VS 2010 project file changes from development source trunk (Rev: 5081), because there were problems compiling foreign language executables
o Now it should work again

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5119 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-26 11:37:36 +00:00
Wanne 7ca53fadc7 *** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***
Development Trunk (now obsolete): https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

INFO: There will be no further development in the development source trunk, so is obsolete from now on!

This commit contains the following features (bugfixes are not listed):

- New Feature: Show merc ranks in Strategy Screen before merc name
o Toggle on/off in the ingame options screen
o For each experience level (0-10) there are defined rank names in the language specific text files
o Additional language text that is not translated yet is marked with // TODO.Translate

- New Feature: Faster Bobby Ray Shipments
o This feature is selectable in the ja2_options.ini
o When activated Bobby Ray shipments will be really fast
-> Overnight Express: 5 - 7 hours
-> Air Service: 10, 12 or 14 hours
-> Standard Service: 15, 18 or 21 hours
o In a multiplayer game, this feature is disabled (because shipment arrive immediately in the destination sector)

- New Feature: AP cost for manipulating the merc inventory
o This feature is selectable in the start new game screen
o For example, putting a weapon from hand in the backpack costs APs
o The AP costs are defined in the APBPConstants.ini
o In a multiplayer game, this feature is disabled

- New Feature: Added possibility to set individual Gear Kit names
o Set individual names in the optional new tag <mGearKitName> inside the <GEARKIT> root element (File: TableData\MercStartingGear.xml)

- New Feature: Externalized the maximum purchase amount (JA2 vanilla: 10) for Bobby Rays purchases per shipment
o Define the max. amount in the ja2_options.ini: BOBBY_RAY_MAX_PURCHASE_AMOUNT, Range: 10 - 100)
o Nice scrolling bars to scroll through all the purchases

- New Feature: Now it is possible to walk on "water" tiles or handle those tiles like "normal" tiles 
o (instead of showing the swimming animation and counting the APs for swimming), when the soldier is located on the second level (level > 0)

- New Feature: Externalized AIM Veterans laptop site
o Add maximum of 4 pages
o Add  new AIM to veterans page, and remove AIM from veterans page.
o New XML file: OldAIMArchive.xml (language specific XML files: *.OldAIMArchive.xml)

- New Feature: Added possibility to choose from 254 IMP faces
o Modified IMPPortraits.xml
o Added new GameDir folder "IMPFaces" which contains the IMP face portraits
o Moved IMP faces in the new "IMPFaces" folder

- New Feature: ARSP - All Resolution Support Project
o See here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=298698&page=1
o Support any kind of screen resolution. This works by choosing the matching full supported resolution (640x480, 800x600, 1024x768) and then centering the graphics
o See ja2.ini for defining the screen resolution

- New Feature: AI Turn Speed Up (FF-MOD)
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=298699#Post298699
o When this feature is activated it allows fast enemy turns
o New entry in ja2.ini to enable this feature: HIGHSPEED_TIMER = TRUE
o Turn on/off auto fast turns in ingame options
o New ja2_options.ini settings for fine tuning: [Clock Settings] ini block

- New Feature: "Lock" / "Release" mouse cursor in tactical windowed mode, so the mouse can stay within window boundary
o This is very helpful for doing scrolling with the mouse (by moving the mouse to the window edge) in windowed mode
o You can toggle on/off the feature by pressing CTRL + Z. It is also possible to press CTRL + Y. So the user can decide which fits better :)
o Whenever you toggle on/off a screen message appears on the tactical log to notify the player

- New Feature: Weapon overheating
o Basically, every shot fired from a gun increases its temperature. On higher temperatures, the gun jams more frequently
o On/off toggle in the ingame options
o Graphical thermometer indication on the weapon picture
o New ja2_options.ini section with a few options, Section: [Tactical Weapon Overheating Settings]
o XML changes (New Tags)
--> AmmoTypes.xml: <temperatureModificator>
--> Items.xml: <barrel>, <usOverheatingCooldownFactor>
--> Weapons.xml: <usOverheatingJamThreshold>, <usOverheatingDamageThreshold>, <usOverheatingSingleShotTemperature>
o Added a few barells to Items.xml (end of the file)
o more infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=301059&page=1

- New Feature: Resting weapons on a surfaces
o You can now rest your weapon on crates, low walls, rocks, debris, open windows etc. while you are crouched. Resting will give yu the superior gun handling modifiers from PRONE position.
o A little 'A' on your gun indicates if you are resting it or not.
o Both settings can be turned on and off in Ja2_Options.ini under 'Tactical Gameplay Settings'

- New Feature: Externalized option on whether mercs can exit sector using grid exit in turn based mode
o new ja2_options.ini property: GRID_EXIT_IN_TURNBASED
o This ini setting does not affect leaving sectors on map edges

- Rework/Update: Ammo boxes and Ammo crates
o Ammo crate items added for remaining calibers.  Tweaked prices to correspond to magazines, tweaked capacities and weights to be reasonable (~800 or less).
o Shift-R reload now looks at both boxes and crates in sector items and merc's inventory to reload, and tops off magazines in inventory as well.  Only possible outside of combat.
o Ctrl-Shift-A still creates crates as per usual, with some fixes to ensure all ammo is caught on the first press.
o Shift-A now creates ammo boxes in the same loop.  They mostly behave like crates, but fit in mercs inventories.
o Ammo boxes are available to purchase at BR and tony, sam, etc.  Individual magazines/drums/etc are no longer available.
o Removed ammo crate xml tag.  Added ubMagType tag to Magazines array.  This allows us to differentiate between magazines, bullets, boxes and crates.
o Changed ammo filtering in BR's to display boxes appropriately.  Added back the "Mag:" display (changed text to "Size:")
o Added ja2set.dat.xml file (WF map version in WF maps folder) to be used instead of ja2set.dat file (ja2.ini setting added) For now, if you want to play vanilla instead, just change the setting in the ini (see comments in file).
o Added P4-P9Items image files (up to 5k images each) and tileslots.  1.13 core items will continue to use Guns and P1-P3Items for the foreseeable future.  P4-P9 can be used by customizers/modders to avoid conflicts with Guns/P1-P3 items.  TODO: Need to discuss a strategy for this in the forums.
o Added in Ambient/0.bad and 32.bad to avoid an exception in the code.
o Updated the XML Editor
o Standardized the text on all the ammo items.

- New Multiplayer Feature: Sharing same FOV (field of view) in a coop/team-dm (for friendly teams) game
o You will also see enemies, that your teammate sees

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5108 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-23 18:46:54 +00:00
Wanne 6e2bdd557c ****************************************************************************
** Merged Source Code from Development trunk, for the Spring 2011 Release **
****************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
o This trunk (the official 1.13 source trunk) will only be used for fixing bugs. No new features will be added here.
  New Features are only included in the Development trunk
o !!! After we have fixed a bug here in this trunk, we should MANUALLY merge the bugfix in the development trunk !!!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-05-26 11:04:47 +00:00
Wanne d8d0af38e8 ************************************************************
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Deleted unused files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-01-18 09:18:46 +00:00
Wanne 91087ca8c0 ************************************************************
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-01-18 09:11:09 +00:00
Wanne 14750c6903 **********************************************************
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2010-02-28 18:38:52 +00:00
Wanne 5291e3b127 - Bugfix: Console now works in VS 2008 (by SpaceViking and The_Bob)
- Bugfix: Reset the ALT + \ keys after opening the console in the SGP

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-09 09:31:43 +00:00
Wanne e95d4b8bca VS 2008 project files update
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2453 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-12 20:21:32 +00:00
Wanne 599f658232 Updated VS 2008 Project Files (thx to BirdFlu)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2451 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-10 20:57:37 +00:00
Wanne 647afe10c8 Added VS 2008 solution and project files
To compile with VS 2008 you have to disable the fist line in "Standard Gaming Platform\input.cpp". Just look for comment "// VS2008"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-21 22:15:22 +00:00
ChrisL 3e8d006329 Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-19 16:27:07 +00:00
ChrisL a2c73aab6d Fixed the MapEditor configuration so that it will compile a "release" version of the editor instead of the "debug" version that had been created. People should use this updated configuration to generate the Map Editor instead of messing with the defines in the builddefines.h file.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-06-25 15:33:58 +00:00
Wanne d576fc6b99 - made a few project changes, so that the map editor exe can be compiled
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-16 18:12:15 +00:00
lalien 3e22dce318 Merged Multi Player Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-12 08:20:47 +00:00
Wanne bf368a0013 - suppressed all the deprecated insecure functions warnings for VS 2005 if you build a Release or MapEditor Version
For Debug version it is already set.
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1878 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-10 19:58:45 +00:00
lalien 43ca24dda8 Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-08 15:15:25 +00:00
Wanne c49af95ec6 - suppressed all the deprecated insecure functions warnings for VS 2005 if you build a Release veersion
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1852 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-25 19:32:42 +00:00
Wanne 72b9a847dd - suppressed all the deprecated insecure functions warnings for VS 2005:
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"
- Enabled PLAY_INTRO (defined in ja2.ini) property in source code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1834 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-24 17:55:49 +00:00
Overhaul 6ec2c5da7d Initialized many variables
Fix for enemy invasions and reinforcements


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-13 03:39:54 +00:00
lalien 8af1e04895 - added include dirs for debug config
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1079 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-20 07:03:46 +00:00
lalien e6ac001a61 - removed include dir
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1059 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 21:10:30 +00:00
Overhaul 8e75433dd1 Militia and friendly AI now mark mines for OUR side.
Related to above, militia deadlock fixed
Crash if console hasn't been brought up when text is sent to it fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 20:34:43 +00:00
Wanne 14340ad8ea Updated Project configuration for Release Build with VS 2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1057 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 15:54:46 +00:00
Wanne 1dc2cb5bc7 Changed console project from multi thread debug to single thread debug, cause otherwise it does not compile
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 15:38:33 +00:00
Wanne 1f337d9d51 Updated project files, because they did not compile on my machine under VS 2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1055 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 15:23:16 +00:00
lalien ee6980bc5d - added console project for VS 2003
- new shortcut: Ctrl+Y deletes all items of selected type from the sector inventory
- new shortcut: Alt+Y sells all items of selected type from the sector inventory






git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1051 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-14 13:51:39 +00:00
Overhaul 7384ae7268 Newly placed tanks now drag away old wreckage if present
Console line input only backspaces to beginning of line

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1050 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-14 08:09:59 +00:00
Overhaul 99e45d697e Fix to make soldier continue towards destination if previous path ended with a special move
Re-integrated LUA and console.  Still many things to finish though.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1048 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-14 04:25:07 +00:00
Overhaul d8145755c3 Added window around windowed JA2
Replaced Windows console with freeware console implementation.  Activate in windowed mode with \
Added error and quit if JA2 started in window mode in >16bpp color depth
Fix to enemy sector investigation:  Was deducting from redshirts when elites investigated
Fix AWOL militia (need additional fix to prevent them from being redistributed during after reinforcements)
Fix to tanks to add them in their original spot when a new one cannot be found.  Should modify to remove old wreckage in this case.
AI no longer tries to fire mortar when no room for it
Tanks no longer try to throw knives


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-08 07:02:56 +00:00