Commit Graph
107 Commits
Author SHA1 Message Date
Wanne 344eb9498c - Separated the ammo types from the interface from the file infobox.sti.
This is needed, because different interfaces should not depend on the ammo types. Ammo types should ship with the MOD and not with the interfacec!
The ammo types are still in the infobox.sti. The interface is in the new file infobox_interface.sti
The file infobox.sti still contains the interface graphic, but does not use it anymore. Older builds will use the interface graphic. But we should never delete the interface graphic from infobox.sti, otherwise the ammo graphics offset are wrong!
 


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@800 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-27 17:29:49 +00:00
Wanne 8e5f803fc4 - updated credits screen to the 1.13 Credits
- translated "low cpu usage" option text for german version
- improved existing "escorting kulbas" bugfix

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@741 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-25 13:41:15 +00:00
Wanne 98f8fe6030 Correct wrong (some pixels) strategic map buttons alignment
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@739 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-24 19:55:01 +00:00
Wanne 793bde64ee - bugfix: CTD when Skyrider is escorted to his heli in drassen (before Skyrider talks to the mercs)
- changed: Location of the Heli information box in Strategy Screen in High Resolution

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-06 16:25:08 +00:00
Wanne c5fce58380 - bugfix: CTD in German Version if you press 'q' in tactical (-> Missing strings in _GermanText.cpp)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@694 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-31 21:45:05 +00:00
Wanne 15e1435dea New Map Editor exe build
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@691 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-31 09:40:44 +00:00
Wanne 01b0d31144 New Release / Update build
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@687 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-28 21:27:19 +00:00
Wanne 06a9541f24 Updated mapscreen.h and strategicmap.h (number of town, sams, ...) see revision 671
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@686 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-28 20:07:40 +00:00
Wanne 0ae307a316 - bugfix: German "Umlaute" were not displayed correctly for short item names
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-28 20:02:05 +00:00
Wanne 99b30d0c18 - bugfix: If queen retakes mine sector, player still gets income (money) from the mine although the "Daily Income" string on Strategic Screen is shown correctly.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@674 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-21 20:35:43 +00:00
Wanne fd849275b2 - bugfix: CTD when tooltip should be displayed on militia and no merc is in that sector
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@673 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-21 19:31:48 +00:00
Wanne 6760b2d177 Reverted save game breaking stuff for the purpose of bugfixing savegames. I will change them back before I build the new Release (This will be in one week)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@672 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-21 19:07:50 +00:00
Wanne 243ed1bac7 Translated "Silent Skyrider" option text for German version
Added some missing option texts for Dutch, Polish, ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-21 10:20:34 +00:00
Wanne 805e9de8d7 new exe 656
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-18 19:02:29 +00:00
Wanne 4477006e57 - bugfix: Turning APs were not deducted (wrong bugfix in version 653)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@664 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-18 18:11:41 +00:00
Wanne 358fc9e31c - feature: Added filter buttons for Misc items to Bobby Rays
new exe build (656)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-07 21:03:32 +00:00
Wanne 3d1337ebeb - feature: Added armor filter buttons (helm, vest, legging, plate) to Bobby Rays
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@655 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-07 15:56:55 +00:00
Wanne 238993745e - bugfix: Wrong AP deduction if a merc punches the enemy
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@653 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-01 21:25:48 +00:00
Wanne 7a1987665d - bugfix: Ira invisible bug in rebel basement
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@652 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-31 12:06:35 +00:00
Wanne 6049d1dda5 new exe build (650)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@650 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-17 13:47:14 +00:00
Wanne 8ffc401690 - bugfix: Gabby did not show up in Sci-Fi mode. Now Gabby is randomly located in sector H11 or I4
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@649 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-16 23:36:59 +00:00
Wanne 189196eb79 - bugfix: Tracer bullets animation starts some tiles away of where the shooter is
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-16 20:38:37 +00:00
Wanne 7bcba64bf2 - new exe build (645)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@645 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-04 21:58:16 +00:00
Wanne af63c20214 - bugfix: Mary & John cannot be escorted if you have 16 mercs in your team
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@644 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-03 21:09:49 +00:00
Wanne 5615c2a075 - bugfix: Wrong text placement in the florist gallery website
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@639 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-29 23:49:44 +00:00
Wanne 0e8afa6c7a git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@634 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2006-11-15 21:10:38 +00:00
Wanne c351c27e37 - bugfix: Endless clock after stealing
- changed: APs for stealing from 10 to 14 (because stealing is more than simple picking enemies gun)
- changed: You cannot steal items from head, body, leg or face until the enemy is collapsed (lying on the ground)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@631 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-13 08:36:36 +00:00
Wanne ac117f7143 - bugfix: CTD after talking to Darren in San Mona (in the boxing club)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@630 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-12 17:36:50 +00:00
Wanne b5601c78d9 updated soldier tooltips
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@629 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-12 16:24:53 +00:00
Wanne c0d8db06ed - updated solier tooltip again
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@626 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-09 19:38:29 +00:00
Wanne 9fac33fe18 - updated Soldier tooltips
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-09 19:23:22 +00:00
Wanne 447ba8cbf7 - tooltips on the enemy are only displayed if the enemy can be seen by the selected merc. This only takes effect if tooltip detail level = 1 (limited) or 2 (basic)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-08 21:27:13 +00:00
Wanne 099ce17225 - bugfix: Wrong APs deduction from stealing
- bugfix: Prevent Nada objects from stealing

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@622 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-07 21:25:26 +00:00
Wanne b53eec588d - reseted IMP activation text box after creating an IMP
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-06 21:09:37 +00:00
Wanne f839dcbe73 - bugfix: CTDs after you have placed your mercs before the attacking occurs
- added notification when you try to create a new IMP and you already have the maxium number of mercs (18) in your team.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-05 21:21:51 +00:00
Wanne 1b25b0f093 - bugfix: CTD when trying to recruit John & Mary and there is only one free place left in the whole team.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@617 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-05 00:32:06 +00:00
Wanne b09673988a new exe build (614)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@616 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-02 22:53:52 +00:00
Wanne 941d745247 - moved hardcoded tooltip strings to the existing language string files
- translated tooltip strings for German Version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@611 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-31 11:31:00 +00:00
Wanne 20178663c7 New exe build (609)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@609 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-30 20:25:11 +00:00
Wanne 4ae5382557 - bugfix: Got a "misplaced" I.M.P email on day 3
- bugfix: Laptop -> Personnel -> Inventory scroll buttons 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@605 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-24 20:00:12 +00:00
Wanne a9b21bda21 - updated language defines (thx to Sergeant_Kolja)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@603 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-22 19:59:46 +00:00
Wanne cdf263093a - build of the new release & update (602)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@602 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-13 12:42:10 +00:00
Wanne 1a1af6b52a - updated some editor files for the high resolution
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@601 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-12 15:59:33 +00:00
Wanne 10817d380e - updated most of the editor screens to the high resolution. Editor should now work with high resolution.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@600 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-12 10:26:25 +00:00
Wanne 755e811293 - bugfix: Average column in laptop->profiles was not correct calculated
- feature: Moved Auto save to option  screen
- feature: German.Items.xml can now use "Umlaute". It is now correct displayed in the game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@592 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-05 09:58:01 +00:00
Wanne 4341409ded git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@590 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2006-10-04 12:24:10 +00:00
Wanne 43942dea96 - new exe build (579)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@579 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-29 05:43:30 +00:00
Wanne cf64eeebfc - bugfix: CTD when loading auto savegame
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@577 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-28 21:29:19 +00:00
Wanne 2169585abb - bugfix: Removed the serious bug that was added in exe build 568
- feature: Re-enabled auto save (USE_AUTO_SAVE in ja2_options.ini)



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@576 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-28 15:23:45 +00:00
Wanne 137e12d6b4 - added Captain J's coverage armor mod
- updated some German strings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@568 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-27 20:20:08 +00:00