Commit Graph
4117 Commits
Author SHA1 Message Date
Wanne 069f46d92f - Updated French Translation (by arkantos)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4707 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-13 18:00:36 +00:00
Wanne d74db4da3a - Updated French Translation (by arkantos)
- Fixed error in UDB description text in all languages (by arkantos)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-13 17:38:42 +00:00
Wanne 3e8885a3ea - Deleted 3 unused text variables
gzAmmoStatsFasthelp[ 20 ];
gzArmorStatsFasthelp[ 20 ];
gzExplosiveStatsFasthelp[ 20 ];


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4703 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-12 21:37:05 +00:00
Wanne f110b44770 - Deleted 3 unused text variables
gzAmmoStatsFasthelp[ 20 ];
gzArmorStatsFasthelp[ 20 ];
gzExplosiveStatsFasthelp[ 20 ];


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-12 21:31:46 +00:00
Wanne dc76f39c1c - Fixed text in _FrenchText.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-11 14:57:52 +00:00
Wanne dcaa44bdd2 - Fixed 'Subtotal' disappearing in BR when all items out of stock/not available yet (by Buggler)
- Added new shortcut 'u' which opens selected sector inventory screen when item filter is active in strategic screen (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4698 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-11 14:46:27 +00:00
Wanne 03b63f17dc - French text translations (by arkantos)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4697 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-11 14:44:00 +00:00
Wanne fa2af2de1a - Changed the encoding for ALL language texfiles to UTF 8
o Now we can also build FUNCTIONAL Polish version with VS 2005 instead of only building with VS 2008/VS 2010

- Multiplayer fixes and improvements
o Increased MP version to v1.9
o Added and info output text when the AI interrupts the pure client, that the game could hang and the server should press ALT + E
o Disabled the possibility, that the server could always give himself the turn with ALT + E. Now when pressing '1' on the dialog instead of giving the server the turn, the dialog closes without any action
o Disabled the possibility, that the server could kick himself from the game when pressing ALT + K and then selecting '1'. The '1' button now cancels the dialog without doing any action.
o Disabled the possibility, that the server could kick a client in the strategy screen
o When client gets kicked from tactical, the game automatically switches to spectator mode for the kicked client
o Disabled Encyclopedia and Briefing room links from the laptop

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4692 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-06 16:06:33 +00:00
Wanne b0697174bc - Improved the dirty bugfix "Out of memory bug", when loading a savegame with the wrong "data files" (original bugfix: revision: 4532)
o The problem is the wrong (too height) number passed to the resize() method which leads to "out of memory exceptions"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4683 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-04 16:51:35 +00:00
Wanne 262b05817a - Bobby Ray Bugfixes (by Buggler)
o Fixed enabling/disabling filter buttons
o Rearranged BR's Guns sorting buttons to have same layout as Ammo's, e.g. 'Heavy W.' becoming last button
o Shifted 'Subtotal' to accomodate 7 figures in browsing screen
o Reassigned weird cheatmode financing key. New key: '=' +10k; '+' +100k; '-' -10k; '_' -100k. Formerly: '=' +100k; '-' -10k


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4682 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-04 16:11:17 +00:00
Wanne 6b57a9a246 - Bugfix: GAME_PROGRESS_START_MADLAB_QUEST, GAME_PROGRESS_MIKE_AVAILABLE, GAME_PROGRESS_IGGY_AVAILABLE can now be set to 0 instead of minimum 1, like it is mentioned in the ja2_options.ini comment
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-04 11:20:54 +00:00
Wanne 73a7031c29 - Bugfix: Robot (from Madlab) was not shown in personnel screen. This is a very old bug which goes back to revision 2498, when Many Mercenary was included (thx to Scheinworld and DepressivesBrot for helping to fix the bug)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4678 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-04 10:31:12 +00:00
Wanne 8931270546 - Bugfix: Crash when entering D13 in DL 1.13 in a recent game. Improved bugfix (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4673 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 20:16:06 +00:00
Wanne 4826a326c8 - Bugfix: Sometimes save games generated by Assert have an invalid startup screen. Added a check to make sure the save game will at least go to the map screen on loading rather than stay on the main screen (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4672 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 20:08:17 +00:00
Wanne 5d278a3a77 - Bugfix: Encountered save somewhere that took a long time to load a sector. The problem was something like over 1400 items in a cell in the sector. I just changed the reallocation strategy to grow by 3/2 of current size rather than fixed 10 because the number of memcopy decrease significantly at risk of allocating a larger than needed array (13 resizes vs 140 resizes). That code had other problems but this helped quite a bit (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4671 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 20:06:19 +00:00
Wanne 4a72f0d75e - Bugfix: Crash when entering D13 in DL 1.13 in a recent game. Basically newLoc is greater than WORLD_MAX when path finding is used when the Drassen Mine map is first loaded in Tactical view (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4670 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 20:04:44 +00:00
Wanne 1d509e4d8a - Fix for Map Sector Inv keyboard shortcut (by Buggler)
o Map Screen Interface Map Inventory.cpp was not updated in 4647 revision resulting in no popup

- Heli ETA Box (by Buggler)
o Partial Graphical Fix on the Heli ETA Box for 1024x768 by correcting e coordinates due to larger font used
o Updated ETA_POP_UP.STI and POS2.sti for 1024x768 resolution (by Wanne)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 18:59:13 +00:00
Wanne e7feba6d69 - Added new running with pistol animation (by Sandro and PasHancock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 14:27:11 +00:00
Wanne bf864f4fdd - Improved tactical save code (by tazpn)
o After some investigation I determined that the one of the files in the temp folder was being written to repeatedly and on top of that opening and closing over a 1500 times
o Instead of writing to in memory arrays before writing to disk its opening many temporary files and appending data to them repeatedly
o I rewrote part of the code so that it only opened the files once and wrote to them and would create them fresh when it did.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4665 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-10-02 14:03:02 +00:00
Wanne 19d61e29cd MERGED source code from development trunk (revision: 4660)
- New big mercs with either Throwing trait or Show-Off personality use a slightly more fancy animation for throwing knives. (by Sandro & PasHancock)
o New animation files: M_K_THRO2.sti

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4661 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-25 18:14:26 +00:00
Wanne 613e59b2c6 MERGED source code from development trunk (revision: 4658)
- Bugfix: Militia do not stop enemy invasion on strategic map (fix by tazpn)
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290508#Post290508

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4659 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-25 09:17:45 +00:00
Wanne ab5faae677 MERGED source code from development trunk (revision: 4656)
- New "remote detonator animation" when using remote detonator (by Sandro & PasHancock)
o It replaces the "open door" animation when using remote detonator
o New animation files: M_USEREMOTE.sti, S_USEREMOTE.sti, F_USEREMOTE.sti

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-25 07:42:21 +00:00
Wanne 8828a3da3c - Bugfix: Allow "255" as valid in the JOIN-IP Address
o Fixed text problem in the "You must enter a valid ..."

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4654 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-21 08:42:33 +00:00
Wanne 72aaba9a5b - Chinese: Translated English Text (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4650 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-14 10:09:30 +00:00
Wanne 2403a81070 - Fixed German spelling mistake
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-12 18:00:07 +00:00
Wanne 9e40cee476 - New Shortcuts (by Buggler)
New Hotkeys
o Strategic Screen:
Hotkey 'r': Mobile Milita Restrictions

o Sector Inventory (with popup text):
Hotkey ',': Previous Page
Hotkey '.': Next Page
Hotkey 'Esc': Exit Sector Inventory 

o Addtional Changes:
Bobby Ray's button text 'Punch. W.' changed to 'Blunt W.' - more appropriate & consistent with XML Item Class name

o Cosmetic Corrections in Sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-12 17:44:05 +00:00
Wanne 1687c148f9 - New Feature: Added option to disable the automatic cursor swap (between exchanging positions and other actions eg. talking). (by tazpn)
o if enabled in the option screen, the cursor will not change periodically to the exchange position.
o if enabled, you can manually exchange positions by pressing 'x'
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290487#Post290487

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-09 06:50:17 +00:00
ChrisL 9b566f502c Fixed a NCTH bug where a negative PercentCap would not calculate properly because the uiCap variable it applies to could not support signed results.
Fixed a NCTH bug where a negative PercentTargetTrackingSpeed would not calculate properly because the uiTilesForMaxPenalty variable it applies to could not support signed results.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-06 21:19:52 +00:00
Wanne 829ce0b902 - Fixed wrong version number for Map Editor (45522 -> 4552)
- Increased MP version from 1.7 to 1.8 (because the grenade throwing crash should be fixed -> see Revision 4610)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4621 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-23 06:47:48 +00:00
Wanne c04c93857f - New Feature: Quick attachment selection (by The_Bob)
o The popup will list attachments available for the given slot on the current weapon. Ones not in sector inventory will be greyed out.
o It should show up after clicking on an empty attachment slot, provided these criteria are met:
--> we are on the mapscreen
--> the sector inventory is open
--> the selected merc is in this sector
--> there is no combat in this sector





git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-23 06:42:39 +00:00
Wanne e55fb6e54f - Changed codepage for Russian text files from 1252 to UTF 8 (so it is readable on all development PCs) (thx to Inshy for providing the files)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-18 14:10:10 +00:00
Wanne 7ab084838f - Added "PasHancock" to the official 1.13 credits
o PasHancock is working hard on new / updated animations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4616 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-14 21:27:27 +00:00
Wanne 068c67c78c - Bugfix: Multiplayer: Fixed crash when trowing items (by Realist)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-14 09:22:21 +00:00
Wanne 1a2c89eea1 - Improved Bugfix:
BUGZILLA #556: Fixed CTD if enemy bleeds to death at the end of a players turn

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4598 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 21:57:47 +00:00
Wanne f64fc4133c BUGZILLA #556: Fixed CTD if enemy bleeds to death at the end of a players turn
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4597 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 20:55:09 +00:00
Wanne ed2a8c4587 - Added possibility to use a new FONT\BLOCKFONT3.sti file in the code, which can be used for the 1024x768 map graphic texts
o Currently the variable used the FONT\BLOCKFONT2.sti, but we can change that later (once we have the STI file ready) easily in Font Control.cpp (Line 197)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4596 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 20:44:26 +00:00
Wanne fa20d0c079 BUGZILLA #557: Fixed CTD when entering Estoni I6 (fix by TheBob)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4595 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 20:41:58 +00:00
Wanne b16577d82a - Bugfix: Old IMP Creation
o Fixed bug with IMP Attributes selection, where you could lower value to 0 and get bonus points

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4593 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 12:09:03 +00:00
Wanne 17c2c76bdf - Bugfix: Old IMP Creation
o Fixed bug with IMP Attributes selection, where you could lower value to 0 and get bonus points

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4592 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 12:05:36 +00:00
Wanne 9773b338fd - Translated missing EDB Description Tooltip messages to German
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4585 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-22 10:24:40 +00:00
Wanne 20e1e49964 BUGZILLA #549: Fixed mercs not showing up on MERC website
o Workaround for old bugged savegames: If passed day 30, make merc available on MERC website
o Fixed problems with merc not showing up after Larry was added
o Fixed white background graphic when MERC website is down (broken link)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4583 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-21 16:38:11 +00:00
Wanne 9630f0f21f BUGZILLA #548: Fixed crash (division to 0) when finishing training of mobile militia
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4582 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-21 13:58:50 +00:00
Wanne 2170bd5b4e - Bugfix: Fixed incorrect email message text for new custom user merc (uiIndex >= 178), when merc is availabe for business on AIM
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-21 13:47:46 +00:00
ChrisL 75e797f9ae BUGFIX 551: Prior fix would allow items to be auto placed into the wrong sector if you had a sector inventory panel already open. The code should now realize that the wrong sector inventory screen is displayed, close that screen, switch to the correct sector, and then open the sector inventory panel before placing the item into sector inventory.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4573 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-14 16:46:14 +00:00
ChrisL 49a7405861 BUG 551: Items auto placed into world inventory might accidentally be dropped into the wrong sector. Now, when you're on the map screen, the sector inventory panel is closed, and you try to drop something into the world, sector inventory should automatically open so that items can be placed directly to the sector panel.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-14 16:07:41 +00:00
ChrisL af82df815b Corrected Vision Range Bonus display issue on UDB.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4567 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-12 19:23:31 +00:00
Wanne 085180af3d BUGZILLA #546: Fixed crash in InitPreBattleInterface()
- It seems the wrong 2nd parameter was passed to the method call InitPreBattleInterface(), when calling this method from from Dialogue Control.cpp (Line: 933)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-11 11:42:22 +00:00
Wanne 0c8aa89f08 - Bugfix: Disabled the experimental fix from Headrocks HAM 3.2, were enemies with 0 APs can enter the battle
o This experimental fix caused assertion errors in AddPossiblePendingMilitiaToBattle()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-11 10:39:47 +00:00
Wanne 02f7f2037c BUGZILLA #545: Enlarged font size in 1024x768 for strategy map screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4561 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-07 11:25:16 +00:00
ChrisL 69e0832a88 Bug 540: Fixed issue where CTRL + SHIFT + A was creating full ammo crates without consolidating any ammo.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4553 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-02 06:21:05 +00:00