1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,152 Commits 9 Branches 6 Tags
611fa2f82de63ea1f964e705b1455485973e8aae
Commit Graph
1152 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 611fa2f82d - Bugfix: Graphical Fix for 'Highlight Sector' showing before Sector Inv closes using hotkey (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4792 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-14 12:46:28 +00:00
Wanne 6357674c62 - Chinese text wrap bugfix (by zwwooooo) 
o Now Chinese Text don't need add " ± " to wrap (because Chinese Text don't need space to division word).


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4785 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-09 09:45:19 +00:00
Wanne 5e4380d766 - Expanded hotkey 'u' activation to strategic screen, not just only when item filter button active. (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-08 10:36:48 +00:00
Wanne 44840ad883 - A few minor bugfixes (by Buggler) 
o Tactical Real-time Retreat bugfix (Overhead.cpp)
o Enemy in pursuit mode bugfix (Strategy AI.cpp)
o History Log Entry for Autoresolve Retreat (Auto Resolve.cpp)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4781 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-07 09:20:18 +00:00
Wanne cfc3981342 - Fixed exclusive VS 2010 compilation error that was introduced in revision 4665 when making improvement to the tactical save code (thx to BirdFlu) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4779 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-04 11:18:22 +00:00
Wanne d828cdd25f - New Hotkeys for Bobby Ray (by Buggler) 
Hotkey LEFT ARROW: Previous Items
Hotkey 'Shift + LEFT ARROW': Jump 5 pages Back
Hotkey RIGHT ARROW: More Items
Hotkey 'Shift + RIGHT ARROW': Jump 5 pages Forward
Hotkey ENTER: Order Form

Hotkey '1' - '4': Purchase 1 item ('1' for first item, '2' for second item, ...)
Hotkey 'Shift + 1' - 'Shift + 4': Purchase all items
Hotkey 'Ctrl + 1' - 'Ctrl + 4': Unpurchase 1 item
Hotkey 'Shift + Ctrl + 1' - 'Shift + Ctrl + 4': Unpurchase all items


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4777 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-31 11:28:24 +00:00
Wanne bcfe230812 - Updated Chinese texts (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4775 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-29 09:32:27 +00:00
Wanne 8395d5d78a - Fixed line breaks in UDB tooltip text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4773 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-28 11:53:20 +00:00
Wanne 4fb6d788fc - updated _FrenchText.cpp (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4772 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-28 11:49:02 +00:00
Wanne 67812044b8 - Bugfix: Fixed assertion crash in UC-1.13 cutscene, when Deidranna wants to send troops to the SAM 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4769 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-28 09:18:30 +00:00
Wanne c1fe373866 - Fixed a few French translations (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4767 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-28 08:40:21 +00:00
Wanne a09ddf536e - Improved init code of language specific xml files 
o When the xml file contains an error an error is shown to the user instead of ignoring it

- Shortened text in _FrenchText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4763 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 19:57:10 +00:00
Wanne 91dfc2e5eb - Updated French texts (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4760 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 10:41:00 +00:00
Wanne 430ef7d00b - Translated missing UDB Description texts to German 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4758 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 08:16:44 +00:00
Wanne 47975235d5 - Removed the "// TODO.Translate" comments for texts, that are already translated 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4755 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 07:54:48 +00:00
Wanne b755a1758b - Removed the "// TODO.Translate" comments for texts, that are already translated 
- Added missing line to STR16 MPClientMessage[] =


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4754 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 07:45:50 +00:00
Wanne cb3956fe6e - Fixed compilation errors in _FrenchText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4751 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 07:00:25 +00:00
Wanne 9bae9e99b4 - Updated french texts (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4750 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 06:49:36 +00:00
Wanne 5207d85bc9 - New shortcuts for Laptop AIM detail member site (by Buggler) 
o LEFT ARROW: Previous Merc
o RIGHT ARROW: Next Merc
o ENTER: Contact Merc
New Starting Gear Interface only:
o '1' - '5': Kit 1 - Kit 5

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4747 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-26 12:43:07 +00:00
Wanne a2eaf80830 - Fixed text problems on money UDB popup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4746 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-26 12:26:24 +00:00
Wanne cf89b2119d - Fixed a few EDB description text mistakes (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4742 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-24 19:27:32 +00:00
Wanne c6093ce700 - Fixed a few text mistakes (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4740 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-24 11:08:24 +00:00
Wanne 4a17e1b580 - Multiplayer Improvements: 
o minor change

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4739 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-24 10:30:20 +00:00
Wanne 084da4e980 - Multiplayer Improvements: 
o Disabled a few ingame options, that does not work correctly with multiplayer. The user cannot enable those options.
-> TOPTION_ALLOW_REAL_TIME_SNEAK
-> TOPTION_ALLOW_CROWS
-> TOPTION_ALLOW_SOLDIER_TOOLTIPS
-> TOPTION_USE_AUTO_SAVE
-> TOPTION_TOGGLE_TURN_MODE
-> TOPTION_USE_NCTH
o When the server enters the strategy map, the airspace view is shown together with an info message how to switch sectors

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4738 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-24 10:24:00 +00:00
Wanne fbf7b14cf7 - Fixed string replacement problem (&s -> %s) in language text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-24 06:44:26 +00:00
Wanne f9d8e061e9 - Updated French translation (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4735 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-24 06:22:52 +00:00
Wanne b2fe384419 - Some code cleanup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4732 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-22 07:51:05 +00:00
Wanne c10d2a6ed7 - Bugfix: Updated unnecessary UpdateAirspaceControl (by Buggler) 
o The Patch fix was basically put there as a coder did not catch a scenario where Player can move into enemy SAM (& possibly other impt sectors) 'uncontested' aka player entered sector w no enemies but flagged as enemy controlled.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4729 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-21 06:00:22 +00:00
Wanne 0ec3d6a5e1 - Animation Bugfix: When merc is standing and equipped with one handed gun (pistol) in first hand slot and 2 handed gun in second hand slot, the animation model was showing 2 pistols (fix by Sandro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4727 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-21 05:56:02 +00:00
Wanne 05d6436935 - Bugfix: closed loophole for helicopter hovering forever (by Buggler) 
o See Bears Pit post: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=292033#Post292033 


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4724 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-20 08:39:03 +00:00
Wanne 25ecfdc6e1 - Multiplayer Bugfix: Fixed the bug, playing a "tilt" sound and showing the mini laptop graphic on the screen, when opening the laptop / option screen from map screen from map screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-16 19:02:26 +00:00
Wanne c17aeb2062 BUGZILLA #272: Fixed main music starting over again, when clicking a main menu selection (Start new game, Credits, ...) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4717 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-16 18:18:10 +00:00
Wanne 1af9037c1e - AI Improvements: Made enemies more likely to make a partial move toward the target if the chance to hit is really, really low (by tazpn) 
Now a more controversial change and perhaps unrelated now since its not in NCTH code. In line with my comment above I tried to make soldiers more likely to make a partial move toward the target if the chance to hit is really, really low and out of effective gun range but still reserving enough AP to make a partial shot. I also allowed this on Cunning soldiers instead of just aggressives figuring that target is in sight they are more likely to fight.

This with the other change has at least made them more aggressive and less likely to run in circles when armed with pistols and has actually made them quite a threat again. Not crazy about the implementation since I'd like a more accurate range check and AP calculation since AP to fire will change after movement. I figure the increased CTH by getting closer will counteract the cost to move.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4715 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-15 23:16:07 +00:00
Wanne 73dc6f250d - Bugfix: AI acts strange (does not shoot out of weapon range, ...) when NCTH is enabled 
o AICalcChanceToHitGun the change to hit is reduced to zero if the AI exceeds the gun range by 10% and is only 50% when in that range. 
o I've changed that code to use externalize the parameters to the CTHConstants.ini file. 
o The result is no change in how actual code runs but now those hard coded parameters should be modifiable.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-15 19:57:54 +00:00
Wanne b4f6c3e3ed - Bugfix: When we get 2nd robot from Madlab, 2nd robot did not have a weapon 
o How you can get the 2nd robot
--> Do NOT dismiss the dead robot from the merc list, otherwise you will not get a 2nd robot
--> Give Madlab another video camera and another rifle
--> Wait one day and Madlab gives you another remote control
--> Go back to the sector where first robot was destroyed and now the robot is back. It will be placed on map edge, fully functional :)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-14 16:52:56 +00:00
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