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
736 Commits 9 Branches 6 Tags
4180a3aa0d033e7010e90cfbbfb78e7359697ab1
Commit Graph
736 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lalien 4180a3aa0d - fixed Russian text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-11 22:59:12 +00:00
ChrisL 382fff0437 Possible fix for the intermittent sector inventory right-click issue. 
Fixed the display AP cost for shooting (when you also have to change facing and/or ready a weapon) so that it correctly matches the APs that are really charged.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-08 23:26:20 +00:00
ChrisL a1a00fbf59 Russian language updates. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-08 18:10:39 +00:00
Wanne 15e7e467e5 New exe build (2296) 
- A* enabled

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-06 19:01:39 +00:00
ChrisL 94ef5885bc Adjusted the ChangeDropPackStatus function to account for "range to backpack" when enemies are in sector. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-06 16:33:52 +00:00
ChrisL 0b25d91e0e Corrected a graphic rendering issue with attachment alignment on the strategic screen. 
Corrected a problem with IMP hiring that caused an assertion error when trying to use the last female IMP profile ID.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2292 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-05 18:22:22 +00:00
haydent 768ad6ea74 hope to fix mp ctds, line 922 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-25 23:03:43 +00:00
ChrisL 411bec6fc4 More random number adjustments from SpaceViking. 
Adjusted the default file location so that it doesn't point to a specific drive but, instead, creates builds in whatever driver your code is located on.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-23 18:12:48 +00:00
ChrisL 75c937544a I messed up one of SpaceVikings changes. This corrects it. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-18 18:29:30 +00:00
ChrisL ec87dd51e6 SpaceViking's random number and CTH adjustments. 
OIV Graphic alignment correction.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2242 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-17 00:16:16 +00:00
Wanne ad96055687 new exe build (2240) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2241 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-14 18:48:58 +00:00
ChrisL 6438f9164d Corrected a display problem with the KeyRing popup when playing in OIV mode. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-11 16:49:12 +00:00
ChrisL a2c73aab6d Fixed the MapEditor configuration so that it will compile a "release" version of the editor instead of the "debug" version that had been created. People should use this updated configuration to generate the Map Editor instead of messing with the defines in the builddefines.h file. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-25 15:33:58 +00:00
Wanne 631ba52d19 - removed debug messages that occurred in release code in tactical screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-25 10:38:19 +00:00
Wanne 06a0249994 I just added a comment to builddefines.h for building the editor: 
You should build the map editor in "Release" mode and not "MapEditor" mode.
You also have to enable the 2 defines in builddefines.h for the map editor.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-20 10:35:51 +00:00
Wanne 6be5f313db - new exe build (2222) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2222 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-08 13:57:43 +00:00
Wanne 8e36b221c2 - removed inventory choice from "start new game" screen in multiplayer mode -> now the inventory choice is defined in "ja2_mp.ini" 
- added new headline text in the "start new game" screen for multiplayer mode

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-08 13:10:17 +00:00
Wanne 4e954d0c15 - bugfix: Removed "No Gear" button for MERC if playing in single player mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-07 21:27:10 +00:00
Wanne 5b1405b717 - bugfix Bug-ID: 101: No bloodcats in tactical by bloodcats ambush 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2219 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-07 21:20:11 +00:00
Wanne 2baa1b7c94 - bugfix: Loading maps in map editor with creatures. They did not show up 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-07 18:27:56 +00:00
Wanne 2015c0f362 - bugfix: Exclusive multiplayer condition was missing in AddPossiblePendingMilitiaToBattle() 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-04 05:50:50 +00:00
lalien 23b8b0c624 Fixes for VS2003 
- added files
- changed Credits.cpp to non Unicode version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-31 11:56:39 +00:00
ChrisL b2b42e1958 I blew it and missed the fact that SpaceViking was still using the old structure in his test code. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2208 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-30 15:43:51 +00:00
ChrisL bab3a586d7 Added new weapon jam code from SpaceViking (think that's who wrote it). 
Updated the text files and moved a static phrase into the language specific files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2207 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-30 15:32:54 +00:00
ChrisL 0fc5fd8e10 Turned A* Pathfinding off until someone can resolve the infinite loop issue that is occuring on custom maps. 
Updated the 1024x768 tactical graphic coords to fix a "blacked out" display issue.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-29 15:15:03 +00:00
haydent 736f2a194d *disable tank spawning, and fix bug causing lack of AI to spawn in maps with snipers or tanks. 
*small change associated with hidden interrupts now occuring and not necessarily only being between AI to hopefully stop crashes. (thanks for the call stack!)
*added no gear option 4 MERC
*disable explosions


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-27 10:01:04 +00:00
lalien 15cdb9fb6b - Fixed the wrong texts for portrait, voice, skills and attributes in the I.M.P creation screen 
- Translation of multi player text


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2201 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-26 11:30:47 +00:00
haydent 5957abba5b disabled mp reading of ja2_options.ini to take default values only. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2200 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-26 10:56:45 +00:00
haydent b701a71e23 modified mp bobby rays to show inv. also disabled reinforcements in MP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2199 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-25 13:51:05 +00:00
Wanne 720bd2a6ae updated _RussianText.cpp (thx to inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2197 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-24 20:32:52 +00:00
Wanne 24dc505faf Fixed the wrong texts for portrait, voice, skills and attributes in the I.M.P creation screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2195 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-22 20:24:49 +00:00
ChrisL 51d541f29c Turned on Abends so they appear rather then having the program simply CTD. 
Setup a failsafe in the pathfinding system that will force an abend should the system fall into an infinite loop.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2194 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-21 16:55:38 +00:00
haydent 73acf25c7a fixed up AI interrupts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-21 10:23:54 +00:00
haydent 4397de6edb fixed refresh bug 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2191 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-20 22:33:46 +00:00
haydent 4b0dcb5e96 disabled spawning on roofs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2190 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-20 22:16:11 +00:00
lalien d64ed11205 Fixed Russian text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2188 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-20 11:45:55 +00:00
haydent 85252909ff mp fixes some more 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-20 00:49:45 +00:00
Wanne 41596a49cd - bugfix: Multiplayer games can now run in fullscreen mode! Game will not pause anymore and ALT + TAB also works. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2186 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-19 19:46:40 +00:00
Wanne cceb340a05 Externalized "starting turn for client #" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-19 16:02:26 +00:00
haydent 947dcb7e5d synced merc collapse 
'resolved' timer cursor lockups
add new server ini variable: DISABLE_SPEC_MODE = 0 
possible lessening of chance for AI to Lockup.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2184 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-19 11:17:48 +00:00
haydent 06c9fb60cc fixed opponent count error 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-19 04:19:34 +00:00
haydent 70c6e61334 added sync for bandaging anim and ability to heal other teams 
add names to end turn dialog.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2182 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-19 03:13:19 +00:00
Wanne c5c317849c - bugfix mp: If server sets ALLOW_CUSTOM_NIV = 0 and clients select another interface than the server, the following problems occured: 
* crash if clients opens the inventory
* from merc item layouts if you hire a merc
* if client plays in 640x480 res and server selects NIV a crash occured

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2181 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-18 18:36:03 +00:00
Wanne eedb409e48 - added multiplayer folder include for tactical project for release version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2180 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-18 10:22:16 +00:00
Wanne 6c34069db6 increased the save game version, because this the multiplayer code changed MAXTEAMS from 6 to 11, so old savegames are not compatible anymore. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-18 09:27:00 +00:00
haydent 741e5c03bf added slay 
> $$$ 4 iggy
fixed coop
stopped speck talking
preopened merc account
CREATURE_ENABLED = 0 no longer has any effect u can remove it from ur ini
ALLOW_CUSTOM_NIV = 1   -> new server ini variable, please add
added gear cost to MERC's

please feel free to make suggestion on MERC NPC costs...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2178 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-18 02:53:59 +00:00
Wanne f17cc948a4 - fixed map editor incompatibility with the merged multiplayer code 
- fixed crashes when loading modified maps in tactical
- added missing "is_networked" condition to the method AddPossiblePendingEnemiesToBattle()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-17 21:51:32 +00:00
Wanne d576fc6b99 - made a few project changes, so that the map editor exe can be compiled 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-16 18:12:15 +00:00
ChrisL 6565f14bc3 Fix for Bug#99 
Fix for Bug#100

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2170 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-16 17:25:46 +00:00
haydent 66d55cf08a * fixed bullet artifacts and removal ! 
* hopefull disable of grenades
* added a LOS check from your mercs to a door to see if it should be animated or not.

* looked into the "ENEMY_ENABLED" issue, it is not double defined, the one in network.h is part of a struct and not connected. made some changes to do tests for ==0 or ==1 rather than boolean. but i believe there must be some misunderstanding possibly. ENEMY_ENABLED only enables or disables the enemy AI, And only when coop is enabled... when its not there is no ai whatsoever, but you can still get into deathmatch battle under the various ini settings.

enjoy, the bullets are finishing themselves off much better now ! :)


 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2168 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-16 08:36:19 +00:00