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
867 Commits 9 Branches 6 Tags
6ef237c6ed35fcf98e8a0aa577de74dccee5624d
Commit Graph
867 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 6ef237c6ed - Updated a few "wrong" default values to "correct" ones. In multiplayer we read the default ja2_options.ini. Problem was, that min. and max. CTH was set to 0, which resulted in zero CTH 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2725 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-11 23:30:54 +00:00
Wanne 305d3e4cea - Added the new strings from the multiplayer branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2724 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-11 18:38:52 +00:00
ChrisL a2740bfbdb Bugfix: APs to shoot when weapon not ready and we have to change facing was displaying wrong. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-11 00:24:35 +00:00
Wanne 17279936bc - Added the new strings from the multiplayer branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-10 18:23:34 +00:00
Wanne 9b9e22f09d - Fixes/Improvements to Option screen (by Arynn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-10 10:36:08 +00:00
ChrisL 36eb308270 Made an APBPConstant a little clearer. Before it was labeled as part of the suppression system when in reality it's not. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-09 20:43:52 +00:00
ChrisL 23a8f63bd8 Corretion to the 100AP/HAM integration. Also made an APBPConstant a littler clearer (hopefully). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-09 19:25:24 +00:00
ChrisL 72174db37c Updates to the HAM/100AP integration. 
Added Min/Max Suppression Tolerance values (from Headrock).
Bugfix: Took away the ability to reload a weapon from the item description box while using an ammo crate.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-09 15:28:41 +00:00
inshy 9a65840def Translated new text for Multiplayer and HAM. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2693 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-09 13:58:17 +00:00
ChrisL f91bc180ad The valid range for Price_Modifier is (-1)-100. -1 & 0 were added as options some time back to allow the game to dynamically adjust the Price_Modifier value based on game progress. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-06 17:53:44 +00:00
ChrisL 1d6f96553a The valid range for Price_Modifier is 0-100. 0 was added as an option some time back to allow the game to dynamically adjust the Price_Modifier value based on game progress. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-06 17:50:23 +00:00
Wanne bd98b767f5 Bugfix: Tactical Interface is still locked after QuickLoad (by Zathras) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-03 15:14:36 +00:00
Wanne bfb4561fa9 - New Release Build (2660) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2660 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-02 07:59:46 +00:00
Wanne d593be35c4 - Removed a CPU intensive AI calculation function which was used by HAM (thx to Headrock) 
- Fixed some compilation warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2655 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-01 20:02:28 +00:00
Wanne 538c62455a - New Release Build (2651) 
- Removed test code for multiplayer file transfer (we have now a new branch for multiplayer: https://81.169.133.124/source/ja2/branches/Wanne/JA2 1.13 MP)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2653 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-01 13:49:36 +00:00
Wanne 335747c3ff Added Headrock's HAM 2.8 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2650 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-01 12:20:30 +00:00
lalien 5f9261273a Removed assertion in Random.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-31 12:15:33 +00:00
Wanne 5a232eb15f Multiplayer: Transfered files are now saved in the correct location on the client side (I just replace the server executable directory from the file with the client executable directory) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2642 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-30 07:07:04 +00:00
Wanne b3efb29dd7 Updated Project file 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2641 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-29 18:27:02 +00:00
Wanne bb6e7c4521 Multiplayer: We can now send files from server to all clients. I just send two dummy files (Items.xml, German.Items.xml) from server to all clients and save them on the client in the JA2 root directory. 
The files are send as soon as the client connects.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2640 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-29 18:17:33 +00:00
Wanne 24d426c7d9 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2639 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2009-03-28 15:36:41 +00:00
Wanne e383a4080c Updated RaknetLib.lib to version 3.4 
Added all raknet headers for full raknet support
Added Testclass "TestCB.cpp" which is a test implementation for raknet plugin "File List Transfer". We will use this plugin for file transfer in multiplayer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2638 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-28 15:30:07 +00:00
lalien 6a740eb82b Temporary fix for game freeze when a path contains duplicate tiles 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-28 00:28:54 +00:00
SpaceViking 84299f157e Add "USE_AGGRESSIVE_ASSERTIONS" define 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-28 00:13:12 +00:00
Wanne a465bebf14 Fixed a bug when creating the application, it was only possible to start ONE instance of the game. Now it is possible to start as many instances of the game you would like. 
So this is very helpful for debugging and running 4 clients on one single PC (each client needs its own JA2 installation folder).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-26 05:09:52 +00:00
ChrisL c947784561 Minor fix to allow the bullet graphic to render properly when the shopkeeper panel is open. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2634 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-24 23:08:25 +00:00
lalien 0c6801fb61 Fixed szSoundEffects definition 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-24 20:41:54 +00:00
Wanne 8fe93de1f5 Translated new MP UI messages for German version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2631 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-22 19:36:20 +00:00
Wanne 9fa220634d Bugfix: Press "ESC" while green progress bar on laptop loads -> Buttons are still visible although Laptop is closes (by InHuMan from Stracciatella Forum) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2630 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-22 18:27:52 +00:00
Wanne bf74b894af Bugfix: Max Merc limit in multiplayer was not evaluated when hiring merc 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2629 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-20 18:35:52 +00:00
Wanne 8fa1c2a4e6 Merged Multiplayer UI patch from Zathras: 
New Features
- Added hits, misses, accuracy to scoreboard
- Added in-game chat with history
- Added more options from the ini to the host screen, Use NIV and Enable
civillians
bugfixes
- Clients connecting at the same time controlling the wrong client
- Team Deathmatch working again
- Refreshing the player list after a player changes team / edge
- AI is always on for Co-op now
- There is now always a scoreboard in Co-op even when you lose.
- scores on the Co-op scoreboard have been fixed for all deaths including
bleeding
- Start Game button now only appears for server
- Fixed cleaning up game resources on disconnection
- Disabled the 1,2,3,4 keys for connecting / disconnecting
- Fixed victory conditions for all game modes
- Fixed players names getting copied into TeamTurnString each game resulting
in multiple names
- Fixed Assertion bug caused by the game sometimes calling
SetCurrentWorldSector more than once before placement of mercs
- Fixed a bug that was possible when merging items such as M14 and EBR stock
on mapscreen.
- Fixed bug with game starting while a player was in chat, closes chat
window when game is starting
- Fixed bug with game starting while a player was in the options screen, if
the player leaves the mapscreen while ready, they are set to unready
- Team and Spawn direction popups changed to use buttons to open/close them
- Disabled players joining after the laptop has been unlocked, as they would
be out of state with any hires


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-19 15:31:55 +00:00
inshy d28c42b353 fixed polish text... 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2627 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-18 19:03:10 +00:00
inshy fa5d04f898 Translated new strings for Forced Turn Mode (French) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2626 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-18 18:47:48 +00:00
inshy 9fe8221e31 Translated new strings for Forced Turn Mode (Russian and Polish) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-18 12:29:08 +00:00
Wanne 4c6df7cc2c Quickfix: New option "Force turn mode" is always disabled when playing a multiplayer game 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-14 16:32:44 +00:00
Wanne 2660ca5135 New ja2.exe release build (2620) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-12 23:05:30 +00:00
ChrisL 5815b01f6a Added a condition which should stop the blue asterisk from appearing on an item unless that item is of item class IC_LBEGEAR. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-12 18:16:26 +00:00
ChrisL 6be3de2149 Fix movement cost problems in 100AP. Externalized the movement cost modifiers and changed the run modifier from a divisor to a flat modifier like other forms of movement use. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2618 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-09 23:14:43 +00:00
Wanne e3303e321c Fix was lot by merging 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2616 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-02 16:07:48 +00:00
Wanne 8afd965a5e Chinese Fixes (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-02 07:22:05 +00:00
Wanne 9fe479ab0a Update _ChineseText.cpp (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2613 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-02 07:06:25 +00:00
inshy 74bd6ca4b3 Fix from Heinz: 
1) Fixed error creating new soldiers in DoReinforcementAsPendingEnemy
2) Fixed some bugs in Shopkeeper interface.
3) Fixed CTD when pressing Alt-Y not in cheat mode
4) Save/load screen shouldn't appear during quickload

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2612 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-01 18:22:56 +00:00
Wanne c4e483539f Updates / Fixes by Arynn 
- Fixed: Mercs randomly drop aimed weapons automatically under some weird circumstances 
- Fixed: Merc are now a little more "talkactive"
- Update: New option screen with "Next" and "Prev" button. This allows "unlimited" of options in the option screen
- New: New "Forced turn base mode" option in the option screen and also available via keyboard shortcut (CTRL+ALT+SHIFT+T) in tactical.
This forces the game to go in turn based mode when there are enemies in the sector.

INFO: There is a new STI Graphic (OPTIONSCREENADDONS2.sti) which is needed for the updated option screen.
You can download the file from http://ja2.h758491.serverkompetenz.net/Wanne/NewOptionScreen/OPTIONSCREENADDONS2.sti
Put this file in your Data\Interface folder. If I build a new release I will upload the file to SVN GameDir and then remove it from my private download folder.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-02-28 09:16:25 +00:00
Wanne a64a66bdf3 Update _ChineseText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2591 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-02-13 08:37:30 +00:00
Wanne 7829441397 Bugfix: No we have the working "AI Viewer". The needed files are already in SVN GameDir. 
To use the AI Viewer build a Debug Version, go to the Strategy Screen and press F12 (thx to Heinz for support)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2589 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-02-10 19:10:37 +00:00
Wanne f0edab9b48 Bugfix: Bug #137: Open IMP page in laptop and then close laptop using key ESC. You will see 
button for closing window on strategic map... if you press this button you will
have CTD.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-02-09 19:23:10 +00:00
Wanne d626d8c835 Updated _ChineseText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2580 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-02-05 10:35:36 +00:00
Wanne d86193fe97 Externalized Chinese specific (unicode) texts to _ChineseText.cpp and saved the Unicode files back to ASCII (thx to Kriplo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2574 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-02-03 19:19:33 +00:00
Wanne f7de64d294 - Bugfix: CTD when enemies retreat (by Heinz) 
- Updated Chinese Text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2572 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-02-02 17:55:46 +00:00
Wanne c23dc27c7b - translated "goggle text" in German Version to German 
- New EXE build (2567)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-02-02 07:24:41 +00:00