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
1,167 Commits 9 Branches 6 Tags
7ba509cd40d1a522aba60f9104f144fb06232e21
Commit Graph
295 Commits
Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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 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 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
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 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 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 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 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 4c098a5097 - Fixed type mistakes (Hardest battle, Surgeries undergone) (thx to Zalpha) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-27 18:01:28 +00:00
inshy 0d661ec0cf Translated new line in Russian lang 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4521 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-22 05:27:21 +00:00
Wanne 4b55d692c7 BUGZILLA #539: Formatting of "No funds available" output screwed due to tab char 
o I also moved the hardcoded English text to the proper language text files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4511 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 13:03:56 +00:00
ChrisL 2bd354af32 BUGFIX 522 - Coded some popup box position adjustments so that popup boxes can't be drawn off the screen. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-13 16:33:38 +00:00
ChrisL 1652167097 BUGFIX 500 - Corrected "equiped" spelling error 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 23:56:35 +00:00
Wanne bfbe6b0311 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4472 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2011-06-05 07:44:32 +00:00