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,097 Commits 9 Branches 6 Tags
613e59b2c68d46ee439e32dfdab32cb71f78979e
Commit Graph
247 Commits
Author SHA1 Message Date
Wanne 613e59b2c6 MERGED source code from development trunk (revision: 4658) 
- Bugfix: Militia do not stop enemy invasion on strategic map (fix by tazpn)
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290508#Post290508

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4659 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-09-25 09:17:45 +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 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 9630f0f21f BUGZILLA #548: Fixed crash (division to 0) when finishing training of mobile militia 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4582 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-21 13:58:50 +00:00
ChrisL 75e797f9ae BUGFIX 551: Prior fix would allow items to be auto placed into the wrong sector if you had a sector inventory panel already open. The code should now realize that the wrong sector inventory screen is displayed, close that screen, switch to the correct sector, and then open the sector inventory panel before placing the item into sector inventory. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4573 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-14 16:46:14 +00:00
Wanne 02f7f2037c BUGZILLA #545: Enlarged font size in 1024x768 for strategy map screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4561 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-07 11:25:16 +00:00
Wanne f65f029305 MERGED FEATURE FROM DEVELOPMENT TRUNK: Enlarging Strategy Map (Revision: 4527 - 4534) 
- This feature enlarges the strategy map in 800x600 and 1024x768 (like in Wildfire 6.0)
- You also have to update the GameDir folder from the official SVN GameDir folder with the latest graphics

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4551 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-30 14:53:16 +00:00
ChrisL d9437117bb BUGFIX 523 - When retreating from combat, the code was designed to add 5 minutes to the game clock. Not sure why. Possibly to resolve an exploit? Anyway, if another travel group had an arrival time within that 5 minute span, an Assertion error would result. This fixes that by removing the 5 minute "retreat charge". 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4500 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-14 14:43:30 +00:00
ChrisL b8e5ebcf6c BUGFIX 514 - A vector error in the size of the world inventory was causing a mouse button to be deleted twice resulting in an assertion error. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-07 18:16:56 +00:00
ChrisL 7376ffbb68 BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 22:28:19 +00:00
Wanne 75b4d43964 - Fixed Tixa problem: When playing Realistic you could go down to underground level where crepitus are 
o When loading such a buggy savegame, we will fix it automatically

- Simplified (reworked) IF-conditions with crepitus

- new define in luaglobal.h: LUA_GAME_INIT_NEW_GAME, LUA_GAME_INIT_NPCS.
o So we can select if we want to use lua script (GameInit.lua) or the hardcoded JA2 stuff

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 19:04:56 +00:00
Wanne 6e2bdd557c **************************************************************************** 
** Merged Source Code from Development trunk, for the Spring 2011 Release **
****************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
o This trunk (the official 1.13 source trunk) will only be used for fixing bugs. No new features will be added here.
  New Features are only included in the Development trunk
o !!! After we have fixed a bug here in this trunk, we should MANUALLY merge the bugfix in the development trunk !!!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 11:04:47 +00:00
Wanne d8d0af38e8 ************************************************************ 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Deleted unused files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 09:18:46 +00:00
Wanne 91087ca8c0 ************************************************************ 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 09:11:09 +00:00
Wanne 09ad70f868 ************************************************************************* 
** Merged source code from development (MP+BMP) trunk (Revision: 3352) **
** https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP    **
*************************************************************************

1 (Rev. 3343)
Changes:
	Control hardcoded list of unclickable ("bad") sectors via XML file. (by Realist)
	On the strategic map, the player cannot click or highlight specific
	sectors (e.g. A4, A5). Introduce a <BadSector> tag in MovementCosts.xml
	that flags a sector as "bad". (<BadSector>1</BadSector>)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Map Screen Interface Map.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Strategic Movement Costs.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/mapscreen.cpp
	/branches/Wanne/JA2 1.13 MP/GameDir/Data/TableData/Map
	/branches/Wanne/JA2 1.13 MP/GameDir/Data/TableData/Map/MovementCosts.xml
	/branches/Wanne/JA2 1.13 MP/GameDir/Data-1.13/TableData/Map
	/branches/Wanne/JA2 1.13 MP/GameDir/Data-1.13/TableData/Map/MovementCosts.xml

2 (Rev. 3344)
Changes:
	Move hardcoded underground sectors initialization to Lua script file. (by Realist)
	Locate "initunderground.lua" at data-xyz\scripts ("xyz" subject to change).
	Lua script allows easily adding underground sectors at arbitrary locations and defining enemy garrisons and creature population.
	Also enables underground bloodcat population.
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Campaign Init.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Campaign Types.h
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Queen Command.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Strategic AI.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Strategic_2005Express.vcproj
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Strategic_VS2008.vcproj
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/UndergroundInit.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/UndergroundInit.h
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/strategicmap.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Soldier Init List.cpp
	/branches/Wanne/JA2 1.13 MP/GameDir/Data/Scripts
	/branches/Wanne/JA2 1.13 MP/GameDir/Data/Scripts/initunderground.lua
	/branches/Wanne/JA2 1.13 MP/GameDir/Data-1.13/Scripts
	/branches/Wanne/JA2 1.13 MP/GameDir/Data-1.13/Scripts/initunderground.lua

3 (Rev. 3345)
Changes:
	Bugfix: In Method CreateDestroyMouseRegionsForFacilityAssignmentMenu() (by Headrock)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Assignments.cpp

4 (Rev. 3346)
Changes:
	Changed order of properties in GameSettings.cpp (by Headrock)
	HAM 3.6 fixes (by Headrock)
	Sorted Data-1.13\ja2_options.ini (by Headrock)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/GameSettings.cpp
	/branches/Wanne/JA2 1.13 MP/Build/GameSettings.h
	/branches/Wanne/JA2 1.13 MP/Build/Laptop/BobbyRGuns.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Assignments.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/MilitiaSquads.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Strategic Mines.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Town Militia.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Campaign.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Interface Enhanced.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Interface Items.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Items.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Items.h
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Overhead.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Soldier Control.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Soldier Profile.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Weapons.cpp
	/branches/Wanne/JA2 1.13 MP/Build/TileEngine/Explosion Control.cpp
	/branches/Wanne/JA2 1.13 MP/GameDir/Data-1.13/Ja2_Options.INI
	/branches/Wanne/JA2 1.13 MP/GameDir/INIEditorJA2Options.xml

5 (Rev. 3347)
Changes:
	Bugfix: Turns out that the program is saving the number of used Placement Slots to the temp file fine, 
	but if that number is equal to the limit of how many enemies/civvies are allowed in a sector by the INI settings, 
	it leads to an assertion error instead when trying to re-load that sector. (by Headrock)
	Re-ordered Data/Ja2_Options.INI (by Headrock)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Enemy Soldier Save.cpp
	/branches/Wanne/JA2 1.13 MP/GameDir/Data/Ja2_Options.INI

6 (Rev. 3348)
Changes:
	Translated missing HAM 3.6 German Texts (by systemfehler)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Utils/_GermanText.cpp

7 (Rev. 3351)
Changes:
	PlusAI 1.0 Patch (by Headrock)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Points.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Points.h
	/branches/Wanne/JA2 1.13 MP/Build/TacticalAI/Attacks.cpp
	/branches/Wanne/JA2 1.13 MP/Build/TacticalAI/DecideAction.cpp
	/branches/Wanne/JA2 1.13 MP/Build/TacticalAI/FindLocations.cpp
	/branches/Wanne/JA2 1.13 MP/Build/TacticalAI/ai.h

8 (Rev. 3352)
Changes:
	Bugfix: The DEBUG only setting "fEnableInventoryPoolQ" is now only enabled in a DEBUG version. In all other builds it is set to FALSE.
Files:
	/branches/Wanne/JA2 1.13 MP/Build/GameSettings.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-03-07 11:37:32 +00:00
Wanne 14750c6903 ********************************************************** 
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-28 18:38:52 +00:00
Wanne da4bef0a4a - Fixed return values in FindAnyAwakeTrainers() and FindAnyAwakeTrainees() 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3326 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-20 22:31:13 +00:00
Wanne f010769397 ************************* 
* HAM 3.6 (by Headrock) *
*************************
- Info: Needed GameDir files for HAM 3.6 are not committed yet to the SVN GameDir. Will do that in the next few days
- For more infos on HAM 3.6 check out: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=244808&page=0&fpart=1


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-20 15:49:46 +00:00
Wanne 5c9f9e71f9 - Fixed a few Visual Studio compiler warnings 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3129 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-22 21:35:50 +00:00
Wanne 3a2db52065 - Bugfix: Refreshing bug in strategy merc list in resolution 640x480 and 800x600 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3125 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-22 19:02:55 +00:00
Wanne 826340978a - Bugfix: If user changes shipping destination location in "ShippingDestinations.xml", Bobby Ray was still under construction if the "original" shipping destination was not under players control. 
This occured because of hardcoded DRASSEN AIRPORT COORDINATES (BOBBYR_SHIPPING_DEST_SECTOR_X, BOBBYR_SHIPPING_DEST_SECTOR_Y, BOBBYR_SHIPPING_DEST_SECTOR_Z)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-11 12:01:26 +00:00
Wanne 8f3f28aea8 - TEMPORARY Bugfix: Temporary fix in method "NumEnemiesInSector()" to avoid assertion errors if the "source" sector was along the map's edge (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-07 08:44:02 +00:00
Wanne cb0ceabb82 *** Merged Code from Multiplayer Branch Revision 3040 *** 
Bugfixes: Bobby Ray Shipment
- Re-enabled stealing from delivery sector (STEALING_FROM_SHIPMENTS_DISABLED)
- Re-enabled & externalized chance that whole shipment is lost (CHANCE_OF_SHIPMENT_LOST)
- Re-enabled delivery from John Kulba

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-28 16:51:52 +00:00
Wanne 0e078dd386 * Merged Source Code from MP branch Revision 3025 * 
- Shipment Bugfix: Stop time compression when shipment and email arrives
- Shipment Bugfix: Fixed duplication of items from shipment. This bug occured, when loading a savegame with at least 2 depending shipment orders



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-26 16:18:05 +00:00
Wanne 7fc0de5ccd - Bugfix: On "sell all" also unreachable items were sold (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-25 18:20:08 +00:00
Wanne 178629d2c0 - Bugfix: Stop Time when Skyrider arrives in the destination sector (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3027 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-22 19:39:44 +00:00
Wanne 7521db7ae7 - Bugfix: Need for soldier sleep was calculated wrong (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-22 11:35:46 +00:00
Wanne 76b990f133 - Fixed compilation errors in VS 2005 
- Updated Revision number: 2996

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-10 10:13:02 +00:00
Wanne 1c69e1a019 *** Merged Code from Multiplayer Branch Revision 2993 *** 
- Updated VFS
- Fixed Map Editor not properly initialized with VFS
- New Map Editor Release (Build: 2993(


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2994 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-09 11:40:08 +00:00
Wanne a3a69728ce New Map Editor Release (Build: 2975) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-06 22:28:46 +00:00
Wanne 47db604b50 *** Merged Code from Multiplayer Branch Revision 2960 *** 
- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-04 21:01:45 +00:00
SpaceViking bd74fac6cc Add checks around all use of bMercOpinion 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-13 22:32:44 +00:00
Wanne a0b75319ad Bugfix: Problems with refreshing fast help text in mapscreen (by jones bearpit) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2825 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-07 20:07:22 +00:00
Wanne 1c28b04c9c Bugfix: Glitch with NIV mouse region (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2787 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-30 13:08:55 +00:00
SpaceViking 6f6ffe91f8 Fix problem with invalid X,Y coordinates 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2780 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-27 23:50:45 +00:00
Wanne 598709f33d - Added Dealtar's and Zilpin's Airport Externalization 
- Needed GameDir files are already committet to SVN GameDir

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2759 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-21 20:27:56 +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
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 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 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 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 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 8b0305e221 Chinese specific update (by zww from tbs) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-31 18:20:16 +00:00
Wanne a6adf843b8 1) some fix in russiantext.cpp (by inshy) 
2) fixed mistakes in UFS web page (was missing ","), add missing line (by inshy)
3) added russian layout for IMP Begin screen, now russian users can type name of they heroes using russian letters. Fixed position for male\female text in russian version (by Heinz)
4) fixed wrong position for items in inventory (by Heinz)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-21 15:21:36 +00:00
SpaceViking c486577d89 Bug fix for invalid coordinates problems (outside valid range of 1-16) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-17 02:40:59 +00:00
Wanne bc16d41a6b SpaceViking forgot to add a new CPP file to the Strategic Project. The game compiles now. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-15 22:56:34 +00:00
SpaceViking f26095d86f Space Viking's many mercs changes plus numerous generic bug fixes 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-15 01:26:13 +00:00
ChrisL f64f58fbf8 Bugfix: I've simply added a condition to a pair of assertions so that they won't run when a soldier is assigned to a vehicle. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-12 16:51:34 +00:00
ChrisL e646ffda20 Resolved an assertion error that occurs when retreating from a sector while inside a vehicle. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-08 16:53:45 +00:00