1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
454 Commits 9 Branches 6 Tags
6d117f5c06348b13237b175a3e101dc092d34adb
Commit Graph
454 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lalien 6d117f5c06 - Added rooftop CtH fix from AndroidXP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@812 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-30 18:08:32 +00:00
lalien 127c4933f5 - Fix for VS 2005 in German and Russian versions 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@805 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-29 11:43:29 +00:00
lalien 9467b5b6a7 - Added CtH fix from AndroidXP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-29 11:00:22 +00:00
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
SpaceViking 060a09ead0 Code changes to allow more slots for IMPs. 
Allow dead IMPs to be replaced.
Add another way to progress in the game (sectors visited).


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@798 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-26 01:47:14 +00:00
lalien 6664b92b25 - Added AndroidXP fixes for Sniper Deadlock and Grenade AP loss 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@797 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-25 15:20:25 +00:00
lalien c2528cab4f - changed UINT16 to wchar_t for VS 2005 compliance 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@781 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-13 20:01:02 +00:00
Wanne 073b8d0af3 Declared a local variable that was missing. Project did not compile in VS 2005. I wonder how this could ever compile in previous versions ... 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@767 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-10 22:46:31 +00:00
lalien 3f37673034 - added VS2005 compability fix from Space Viking 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-10 18:46:57 +00:00
lalien 9971b56b0e - externalized game progress weights 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-10 17:13:23 +00:00
lalien 1d00e73866 - fixed "end move & LOS bug" ('END' button has two different actions) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@751 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-04 18:04:07 +00:00
Sergeant_Kolja 29052abd73 Fixed again more bugs which occurred when loading a 1.13 savegame which was saved under an older 1.13 build or under different XML-files. The bug is now better fixed than before. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@750 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-03 17:27:17 +00:00
lalien 431b92c26e - moved ja2.set (game settings file) to a custom data directory defined in ja2.ini 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@748 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-01 21:10:55 +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
lalien b0ef70dbb8 - Tactical militia command: stopped merc from moving to militia in combat if he doesn't have a headset (radio) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-24 10:13:46 +00:00
Sergeant_Kolja 035e6d5caa Added new, optional JA2.INI parameter to select windowed mode instead of Fullscreen ([Ja2 Setting] SCREEN_MODE_WINDOWED=1). To keep Fullscreen, simply omit this swith or set it to 0. Also, added a cmdline switch for the same effect, but with higher prio. /FULLSCREEN overwrites INI/SCREEN_MODE_WINDOWED=1 while /WINDOW overrides INI/SCREEN_MODE_WINDOWED=0. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@734 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-23 21:13:20 +00:00
Sergeant_Kolja e40b062672 fixed some crashes when loading 4xx built savegames. The game can continue, but You'll probably loose your vehicles. The Team in the Laptop/Personel also consist only of Your AVATAR, but in strategic map the team is complete. 
This is not a very well finished fix. Only glued some NULL assigned pointers. I recomend to NOT load too old savegames.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@733 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-23 20:59:37 +00:00
MaddMugsy a9059e3570 New build (728) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-22 22:38:14 +00:00
lalien ae9b49436a - menu descriptions fixed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@727 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-22 13:51:19 +00:00
lalien 81f5b6e748 - new menu option: Low CPU Usage (patch from MTX/defrog) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@725 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-21 17:17:00 +00:00
MaddMugsy ff2aa4f8e1 -increased inventory capacity for IMP items doled out in ImpItemChoices.xml 
-changed ammo given to IMPs so they have at least two clips for their main gun

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-17 06:13:52 +00:00
MaddMugsy c8b4cbe8d9 -skip the CompatibleFaceItem check if either item is Nothing. This will let us trim some lines from compatiblefaceitems.xml that are screwing up the xml-editor. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-09 23:54:20 +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
lalien 21c2464a43 - AP costs for reloading a GL or RL by attaching an item are taken now from weapons.xml (still buggy, allows cheating) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-26 17:01:03 +00:00
lalien b46f47cb04 - bug fix: no explosion if the rocket launcher was reloaded manually (with attaching a rocket/grenade) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-24 12:07:39 +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
Lesh 355f10fb18 - set max number of towns, town sectors and sam sites on strategic map to 50, 260 and 50 accordingly (saved game breaking stuff) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@671 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-21 17:08:26 +00:00
Lesh bf199071d7 - exploit bugfix: invalid APs deduction when shooting - player could win 1 AP, if he raises weapon first and then shoots 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@670 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-21 16:59:33 +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
Lesh c239e693b5 - fix: militia always has equipment one level lower than enemy when slow progress is on (slight re-balance of militia involved battles) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@665 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-18 18:41:58 +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
lalien e4d8bfa058 - bug fix: when merging an item to a stack of items all of them were converted to a new item 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-17 19:42:32 +00:00
Lesh a6a2307c56 - fix: militia, came as reinforcements, tend to stop at a halfway, if main battle is at the opposite side of map, they are coming from. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@662 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-17 15:26:01 +00:00
lalien f96b4374f1 - new menu option: silent Skyrider 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@661 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-12 18:45:43 +00:00
Lesh 5fa61e8f11 - feature: enemies and militia can have ambidexterous skill and a second gun (elites and regular troops/milita only) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@660 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-08 15:13:35 +00:00
Lesh 8008aa726d - another memory leaking fix 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@659 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-08 13:47:27 +00:00
Lesh 3188c0ef8e - slow progress for enemy items choice added 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@658 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-08 13:45:34 +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
lalien bcfa50e793 - The queen should try to get the cities back after they were liberated, just like the SAM's 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@654 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-05 21:13:43 +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