Commit Graph
139 Commits
Author SHA1 Message Date
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
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
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 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
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 8e36b221c2 - removed inventory choice from "start new game" screen in multiplayer mode -> now the inventory choice is defined in "ja2_mp.ini"
- added new headline text in the "start new game" screen for multiplayer mode

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-06-08 13:10:17 +00:00
ChrisL bab3a586d7 Added new weapon jam code from SpaceViking (think that's who wrote it).
Updated the text files and moved a static phrase into the language specific files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2207 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-30 15:32:54 +00:00
lalien 15cdb9fb6b - Fixed the wrong texts for portrait, voice, skills and attributes in the I.M.P creation screen
- Translation of multi player text


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2201 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-26 11:30:47 +00:00
Wanne 720bd2a6ae updated _RussianText.cpp (thx to inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2197 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-24 20:32:52 +00:00
Wanne 24dc505faf Fixed the wrong texts for portrait, voice, skills and attributes in the I.M.P creation screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2195 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-22 20:24:49 +00:00
lalien d64ed11205 Fixed Russian text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2188 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-20 11:45:55 +00:00
Wanne cceb340a05 Externalized "starting turn for client #"
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-19 16:02:26 +00:00
haydent 947dcb7e5d synced merc collapse
'resolved' timer cursor lockups
add new server ini variable: DISABLE_SPEC_MODE = 0 
possible lessening of chance for AI to Lockup.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2184 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-19 11:17:48 +00:00
haydent 70c6e61334 added sync for bandaging anim and ability to heal other teams
add names to end turn dialog.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2182 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-19 03:13:19 +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
Wanne 28e9276006 - bugfix mp: Wrong savegame folder name for german version that leaded to a CTD when saving a multiplayer game.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2163 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-14 04:41:48 +00:00
Wanne 1b5393014d - added INI option for new tracer bullets (USE_BULLET_TRACERS)
- corrected some german spelling mistakes
- new release build (2147)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2147 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-12 10:57:06 +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 9308131d17 - replaced wrong text for ironman in german version in the start new game screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-13 14:35:15 +00:00
ChrisL fbf63c8af0 Setup failsafe to block NIV Mode if "Data" is specified as the CUSTOM_DATA_LOCATION.
Setup language specific files to be optional.
Setup code to accept all language specific files for items.xml, pockets.xml and ammostrings.xml.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1953 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-31 19:02:34 +00:00
ChrisL bdcc920c63 Build1936
Minor adjustments to some of the rendering functions to grant a bit more control to the code.
Adjusted the mouse areas for key and item popup windows.
Added the pocket capacity indicator to sector inventory when using NewInv mode.
Added the right click option to sector inventory so you can view/manipulate stacks and view item descriptions without first equiping an item.
Updated sector inventory so that capacity values appear in all pockets.  Not just currently filled one.
Updated sector inventory so that newly placed items could be right-clicked on for details.
Increased the mouse region for the various stack popups so there is always room to close the popup without activating the description box.
Fixed a bug in the sector inventory description panel that caused a crash when trying to remove an attachment.
Fixed sector inventory so you can add attachments to weapons.
Fixed some weight issues.
Fixed a crash resulting from right-clicking in sector inventory while Item Desc window was already open.
Fixed the "Active Squad" message so it displays the squad that is actually activated.
Fixed a bug that allowed you to start a new game in NewInv mode while in 640x480 resolution.
Updated the Item Description windows so you can load a gun as well as unload.
Added new CTRL+SHIFT+D hotkey to delete all items in sector.
Added new CTRL+SHIFT+S hotkey to sell all items in sector, assuming you have the ALT+LMB option turned on in your INI file.
Fixed a problem with sector inventory item description where the status did not appear for items that couldn't stack.
Fixed a problem with Nails so he always starts with his leather jacket, even if you don't buy his gear.
Incorporated a failsafe so that NewInv mode can't be selected, nor NIV saves loaded, when no custom data path is set.
Add new IC_BELTCLIP item class.
Update pocket definition restrictions to use bitwise compare.
Add failsafe so that you can't merge LBENODEs.
Reset VC2005 so it doesn't point to a specific drive.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1936 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-29 20:35:03 +00:00
Wanne 50377c2bae - updated _Ja25RussianText.cpp (thx to Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1886 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-13 19:18:09 +00:00
Wanne fab0aae9da Updated _RussianText.cpp (thx to Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1882 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-12 18:33:11 +00:00
Wanne 844c3445aa - translated some missing german texts, added one missing german text string for militia command
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1880 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-11 21:02:22 +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
ChrisL 6d31772abd Altered the pName field from Pockets.xml to a CHAR16 value so it will support multilingual code.
Updated the Pockets.xml reader function so that we can include a german.pockets.xml and russian.pockets.xml (and any other language we eventually choose to support) just like we have with Items.xml.
I moved the "Sold Item" and "Delete Item" phrases to the language specific cpp files.
I updated the SHIFT+N hotkey so that it will now work from the strategic screen.  On tactical it handles the entire team.  On strategic, it handles only the one merc who is currently active.
I fixed a problem with the ALT+W cheat key so that it cycles properly.
I fixed a problem with the backpack buttons where the button key wasn't being properly deleted.  This could sometimes cause an "overload" which would result in a crash.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1873 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-09 17:26:55 +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
Wanne 411fdd1584 - bugfix: Bug #79: Creatures are gone if you compress time in strategic and select auto battle
- bugfix: Bug #51: Speck sends wrong mail if any of the 4 new guys (Text, Stogie, Biggens, Gaston) level up.
- added missing description texts for IMP skill rooftop sniping and camouflage (also translated in german and russian)



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1796 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-12 18:56:38 +00:00
Wanne 8232957994 - Enabled music in windowed mode (was missing in windowed mode)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-07 09:37:12 +00:00
lalien 56e3a24535 - changed Russian descriptions
- bug fix for bug #50 'Monsters win auto battle'

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1757 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-24 12:39:50 +00:00
lalien 77e2b4e176 - changed Russian descriptions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-15 11:12:06 +00:00
Overhaul 6049e8da5a Added property pages to make it easy to change build language (at least with VS2K5)
Added support for Russian city names and Items
Fixed contract length exploit (hire merc for 2 weeks for the price of 1 day)
Fixed insurance emails repeating when you choose "delete" but then say no
Corrected UTF-8 to wide char translation on Windows platforms (Windows doesn't handle mbstowcs correctly)
Moved UTF-8 to Wide Char translation for item descriptions and names so it happens at XML load time (fix bug that Russian has half the description space)
Fix overflow when combining two items with high counts (such as 200-round boxes of ammo)
Path AI fixes
Fixed issues with non-interruptable animations causing infinite clock
Fixed some issues with soldiers not reaching their plotted destination
Fixed escorted players who were cowering, being unable to move after joining party
Only allow militia to climb roofs if their orders allow them to move
Fix bug where AI might climb the wrong roof on the way to the destination roof
Allow AI who have gone outside their patrol grid, to return to the Grid


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-09 02:08:39 +00:00
lalien 144426e896 - fixed Russian text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1674 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-17 18:18:21 +00:00
lalien 45b492c94a - replaced Russian characters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-14 11:24:32 +00:00
bugmonster c33b00d6ff - additional text moved to _*Text.cpp for localisation purposes
- refined Russian text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-12 18:21:35 +00:00
bugmonster 574b8e3218 - Improved compatibility with different russian JA2 distribs' resources
- International/russian *.npc file format unified, performed conversion on-the-fly
- New 1.13 messages' text moved to Text.h/_*Text.cpp
- Russian translation fixed/refined

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-12 18:40:15 +00:00
Overhaul b170dbb1e5 Fixes to reduce the number of compile warnings. Still many more to fix
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 08:32:53 +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
Wanne ce31084ae7 Removed most of my thousands "WANNE" comments which goes back 2 years when I changed to higher resolutions. These were only internal comments for me, so they didn't include any useful meaning for others.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-07 21:39:23 +00:00
SpaceViking a778a657b9 Fixes for more structures not being initialized.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-17 03:07:12 +00:00
Wanne 089e08f202 Small fixes for compiling different language versions (German, Russian)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 11:12:27 +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 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
lalien 6cf3fbbe5a - added new militia control command
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-29 21:19:11 +00:00
Overhaul e6024e5151 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1017 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2007-06-29 10:40:05 +00:00
SpaceViking ac41de3515 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@972 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 03:01:57 +00:00
Wanne df9d9e6c00 PROJECT CHANGES (already done for VS 2003):
- Added "lua" project folder to the "Additional Include Directories" for each project
- Added "lua51_vs2003.lib" to the "Additional Dependencies" for project "ja2" 
Project should now compile in VS 2003 without any errors.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 18:48:46 +00:00
lalien e78b4ea242 - fix for Russian version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@934 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 15:47:03 +00:00