Commit Graph
782 Commits
Author SHA1 Message Date
Wanne c467ab629a Updated WinFont.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2434 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-25 22:15:22 +00:00
Wanne 9d08dd56a1 Updated VS 2008 Project Optimizations to VS 2005 Project Optimizations (Result: Build smaller Executables)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-24 19:26:52 +00:00
ChrisL c1fed7af99 Fixed a CTD that occurs when you fail to attach an item.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-24 16:27:20 +00:00
Wanne 45301a79da Updated VS 2008 solution file. It now opens in Visual Studio 2008 by double clicking.
Updated chinese texts.
INFO: To display chinese fonts correct, you have to install eastern languages in windows.
Control Panel -> Regional Language Settings -> Language Tab -> Install Eastern languages (checkbox)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-22 10:55:30 +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
Wanne acac231089 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2425 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2008-11-20 07:44:35 +00:00
Wanne 032fd1f353 - Added Chinese language support (thx to Noword from TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2424 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-20 07:43:57 +00:00
ChrisL 55059caf3b Fixed some display values in EDB to properly switch between 100AP and 25AP.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2422 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-18 16:09:53 +00:00
lalien be9b2f47a7 Fixed polish letters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2421 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-17 22:36:04 +00:00
ChrisL 944dacd8a4 Fixed a 100AP conversion issue for morale and suppression fire.
Fixed a CTD caused by trying to "pickup" an item from sector inventory while simultaneously looking at that items description box.
Upgraded an INT8 to INT16 in training functions to try and catch a problem with INI values being set too high.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2419 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-15 00:12:34 +00:00
Wanne ac6de87d47 Multiplayer: Override panel key is now bound only to key "7" instead of 5, 6 and 7
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2418 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-14 15:23:34 +00:00
Wanne 8f2201afe4 - on-the-fly convertation of all codepages to unicode (by lalien and bugmonster). I think this is needed for a Polish release in the future.
BE SURE TO UPDATE FROM SVN GAME DIR (REV. 1050) TO GET THE NEEDED GAME DATA FILES FOR THIS SOURCE MODIFICATION 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2417 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-14 11:50:38 +00:00
Wanne 59f652c6a2 - Replaced all "Jagged Alliance 2" strings to "Jagged Alliance 2 v1.13"
- Added missing tooltip text for Enhanced Desription Box in the settings
- New Release build 2415

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2415 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-13 14:06:46 +00:00
ChrisL 905ce20125 Enhanced Description Box, v1.3. By Headrock
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2414 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-13 01:11:59 +00:00
ChrisL 3cd3ef39cb 100AP project integration
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-06 00:46:54 +00:00
Wanne d63ae7501b Bugfix: JA2 now shuts down without an error, if the desktop colors are not set to 16 bit color after the message box appears
Changed some text strings from "Jagged Alliance 2 v1.13" to "Jagged Alliance 2", so the game consistently used "Jagged Alliance 2".

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-04 19:44:03 +00:00
lalien ef24a2a2eb Fixed smiley position
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-02 21:08:47 +00:00
ChrisL 26f5a83bab Fixed attachments so that trying to attach a loaded UGL onto a weapon that already has 3 attachments will fail instead of causing an assertion error.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2391 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-30 19:58:26 +00:00
ChrisL 8c437af085 Resolved a Strategic AI.cpp assertion error resulting from army composition values totaling more then 100%.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2389 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-30 16:03:40 +00:00
ChrisL ef158c56cf Correction to the AutoBurst penalty, by Headrock
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2387 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-30 02:56:38 +00:00
ChrisL 2eb729ab31 Headrock found a bug in the CTH calculation with regards to autofire penalties.
Think I've fixed a glich where mercs who were already in a sector (but not active) could not be placed on the tactical placement screen (either because of an assertion error or simply being told the placement wasn't valid).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2385 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-28 18:41:22 +00:00
ChrisL 7bd9d49e7c One more change to BRs to display the correct AP label.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2382 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-21 17:09:37 +00:00
ChrisL e7049a63db Fixed a glitch with the AP display in BRs.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2380 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-21 16:55:32 +00:00
ChrisL 33a9f17760 Bugfix to resolve an assertion error relating to the helicopter.
Change to BobbyRays information as proposed by Headrock.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2379 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-17 15:56:58 +00:00
Wanne 260b2bc4fd New Map Editor and Game Exe Build (Build: 2377)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2378 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-15 21:00:53 +00:00
ChrisL 26201b3816 Updated build number
--Editor fixes from Kriplo
Implementation for mouse wheel support
Implementation for mouse middle button support
Fix for adding on roof tiles
Fix assertion when leave editor mode
On saving map check of entry points are add
Fix for to many ToolTip messages in place walls
Fix assertion on loading map without entry points
Fix assertion in Sector Summary if DevInfo directory not exist
Fix for problem of losing map edgepoints
Fix problem with losing stuff from LBE
Fix crash in meanwhile
--Fixes from Headrock
Fixed a typo in the Health experience calcuation for strategic movement
Added "Draw" cost to weapons help data


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-13 21:05:28 +00:00
ChrisL fa21f87a59 Tron and Kriplo's fix for the "off-by-one" bug.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2373 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-10 22:47:07 +00:00
ChrisL 1278c52d9a Bugfix for IMP attributes.
Fixed loop/crash that occurred when handing MADLAB a weapon with a permanent attachment.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-07 22:35:48 +00:00
ChrisL 7e1d4a2d89 Fixed a capitalization error that was stopping the editor from compiling.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-30 16:21:02 +00:00
ChrisL 92b1865817 Map editor changes from Kriplo (DNL).
Adding roads from “Draw Roads” selection will first remove exact the same road tile object before placing the same again at the same location.  
Adding roads from “Place banks and cliffs” option now will not put same road in same map element just once.  
Whenever you chose to place rocs,bu ches,tree,junk, or any what call PasteStructureCommon() will first remove exact element before it put again.  
“Fill area” will not go to endless recursion loop when try to fill inside buildings, ending with stack overflow.  


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-26 23:41:37 +00:00
ChrisL 6f2af55cba Fixed assertion error caused when switching from strategic to tactical with a dead merc in the current team.
Fixed a bug where hired RPCs would not get items stored in their gunsling or knife pockets.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-23 23:14:49 +00:00
Wanne 52a28a8268 Updated _DutchText.cpp (from Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-22 17:18:40 +00:00
ChrisL f7ffba090e Fixed an assertion error that occurs if you try and save a game immediately after an autobattle has completed.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-19 18:25:17 +00:00
ChrisL 87fbb6f4d9 Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor. (part 2)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-19 16:28:13 +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
lalien 226992e00b Fixed Russian translation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-19 09:03:58 +00:00
ChrisL 0e4c2ab79c Updated the shopkeeper display so that items being offered for sale by the shopkeeper display their highest unit cost instead of the stack cost.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-15 20:43:49 +00:00
ChrisL e6f9406ffe Fix sector inventory so that right-click closes the panel when ALLOW_SECTOR_DESCRIPTION_WINDOW is FALSE.
Removed the "Major Version Update" system from the map editor.  Now, maps will be updated only when they are actually loaded.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-11 14:57:12 +00:00
Wanne eae98df88d - externalization: Restrict female enemies from being in the queens army (except Female Elite enemies)? -> RESTRICT_FEMALE_ENEMIES_EXCEPT_ELITE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-09 16:26:51 +00:00
Wanne 3951568f8c Updated _RussianText.cpp (by Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-31 15:24:00 +00:00
Wanne 602713f0ca Updated build version number for new exe to 2322
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-30 15:07:32 +00:00
ChrisL feb713ff0e Another tweak to the language system for cities.xml.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2321 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-29 22:59:38 +00:00
ChrisL 0a1b40237d Updated code to support language specific cities.xml.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2319 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-29 16:12:08 +00:00
lalien 3ae10505f4 Fixes for new fonts
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-27 21:45:39 +00:00
Wanne e3dd3f5487 First step in making the Cities.xml useable with other languages (Russian.Cities.xml, ...)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-18 12:49:34 +00:00
ChrisL 7e37a07476 Fixed the sector inventory so that you can right click to look at an item's description even if you don't have an On Duty merc in the sector. You still need a merc in sector, but they can be involved in another activity where before they also had to be part of an active unit.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2306 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-12 17:09:29 +00:00
lalien 4180a3aa0d - fixed Russian text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-11 22:59:12 +00:00
ChrisL 382fff0437 Possible fix for the intermittent sector inventory right-click issue.
Fixed the display AP cost for shooting (when you also have to change facing and/or ready a weapon) so that it correctly matches the APs that are really charged.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-08 23:26:20 +00:00
ChrisL a1a00fbf59 Russian language updates.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-08 18:10:39 +00:00
Wanne 15e7e467e5 New exe build (2296)
- A* enabled

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-08-06 19:01:39 +00:00