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,172 Commits 9 Branches 6 Tags
c42d68ff0fa8987b167f52fc12b3c4ac74e8b404
Commit Graph
1172 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne c42d68ff0f - Fixed possible assertion in Scheduling.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4881 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-01-09 11:13:25 +00:00
Wanne a68e81086b - Bugfix: Allow the game to use 0 KB files for faking missing WAV speeches 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4879 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-01-09 10:40:47 +00:00
inshy b17bb900ea -Fixed some problems with russian letters in IMP page (by ViSoR) 
-Added 2 letters for French (Ligatures Æ, æ, Œ, œ). Now we have support for all French alphabet
-Converted French text to UTF-8 for simple use in ather OS Language

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4877 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-01-07 20:49:51 +00:00
Wanne 8da8548db2 - Bugfix: Hotkey 'ENTER' hiring screen fix to exclude conditions for dead mercs in AIM & MERC & when MERC accounts are suspended (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4874 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-01-02 10:20:44 +00:00
Wanne 1e1363c6ad 2011 Release Version: 4870 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-12-28 10:51:54 +00:00
Wanne 7ba509cd40 New "mini" Feature: Added possibility to set optional Tag <mAbsolutePrice> in MercStartingGear.xml to define absolute prices for gearkits (by Tais) 
- I put both (startup and gearkit selection in BR's) the initializations for gearkit prices into if's that will check if the absolute price is higher than -1 and lower or equal to 32000 (INT16)
- I also added the reading of the tag in xml_mercstartinggear.cpp, to be able to support zero priced gearkits in absolute prices I set the absolute price of a gearkit to -1 on opening tag of a gearkit, if there's an mAbsolutePrice tag set in the gearkit it will override the value, if not nothing happens and all will behave normal
- so nothing will change in 1.13 as it is, it will just give modders the ability to set absolute prices with a new tag

TODO: Maybe we should also add this optional <mAbsolutePrice> tag to the XML Editor in the future.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-12-27 15:39:52 +00:00
Wanne 133d921328 - Bugfix: When graphical face gear (eg: SWAT Helment) was shown on the merc face (in tactical turn based), the red opponent count was hidden one layer behind the face gear. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4865 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-12-27 15:25:06 +00:00
Wanne d471c48dcc - Increased multiplayer version to v2.0 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4863 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-12-27 13:40:11 +00:00
Wanne cd9f86bb01 - Bugfixes: 
o MP: Fixed crash when hiring a merc with graphical face gear and then closing the laptop (the problem was, that an initializing function was not called in a MP game)
o Fixed init problem when starting a new single player game after playing a MP game
o Reducted message lines in a chinese game in strategic view
o Shortened german text


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4861 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-12-27 13:21:27 +00:00
Wanne 7c028b4a68 - Bugfix: If SMALL_SIZE_PB = TRUE (ja2_options.ini), in 640x480 and 1024x768 the mall progress bar (rect*thin.sti) was not loaded and displayed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4858 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-12-15 10:30:37 +00:00
Wanne 1601a370ae - Bugfix: Fixed a bug (not mine) where item stacks with 128+ items in them would cause an endless loop when trying to sell the entire stack with ALT-SHIFT-CLICK (or, in my case, when displaying the price of the stack) (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-12-12 21:56:31 +00:00
Wanne 6dbcb8dba9 - New Externalization: Mute when item spotted in turn based mode 
ja2_options.ini: ITEMS_SPOTTED_NO_TALK

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4843 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-12-11 20:26:49 +00:00
Wanne 959bb1901b - Chinese Bugfix: Adjusted WINFONTS for Chinese version (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4841 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-12-11 15:25:24 +00:00
Wanne 2e2e5ad10a - Translated texts for Russian Version (by PasHancock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4818 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-30 23:01:14 +00:00
Wanne 7e44504c34 - Fixed wrong "build" output directory path for "Utils" in Release configuration 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4816 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-30 22:55:34 +00:00
Wanne 28a8056801 MERGED source code from development source trunk: 4814 
- fix UTF8 coding for _PolishText.cpp and _Ja25PolishText.cpp (by Jazz)
- rewrite file LuaInitNPCs.cpp (by Jazz)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4815 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-28 15:43:08 +00:00
Wanne 849b1c4901 - New Feature: Fast transition of laptop, strategy and fast www sites loading 
o 3 new INI properties: DISABLE_LAPTOP_TRANSITION, FAST_WWW_SITES_LOADING, DISABLE_STRATEGIC_TRANSITION
o In a multiplayer games, for all 3 ini-properties fast loading is enabled!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4806 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-18 10:06:23 +00:00
Wanne f5e3733f62 - Bugfix: Added minimum zero condition for weapon deteriorate test as random generator is unsigned variable (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-18 09:02:42 +00:00
Wanne 8624928dd5 - Chinese Bugfixes (by zwwooooo) 
o Correct tactical interface font height to fixed Chinese characters smearing bug
o Correct missing symbols "\n" in _ChineseText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4799 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-16 00:02:01 +00:00
Wanne f410402155 - Bugfix: Fixed Assertion, when trying to add pending enemies 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4795 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-14 22:47:08 +00:00
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