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
716 Commits 9 Branches 6 Tags
2015c0f3629b021b7a3a8e5d9825a3258b9249e2
Commit Graph
716 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
haydent a04768e6a6 added credit check to MERC purchases 
fixed appearance of enemy MERC NPC's to show stats when targeted
fixed realtime
added check to only allow AI during game mode coop

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2167 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-15 14:41:47 +00:00
Wanne 36be370bca - bugfix: Only one M.E.R.C merc was available in single player mode. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2165 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-14 05:37:33 +00:00
Wanne 3823ac6f06 - bugfix mp: ALT + TAB is working again in full screen mode. But if you like to play multiplayer you should use windowed mode or you should never do ATL + TAB, because this pauses the game in full screen mode! 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2164 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-14 05:09:28 +00:00
Wanne 28e9276006 - bugfix mp: Wrong savegame folder name for german version that leaded to a CTD when saving a multiplayer game. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2163 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-14 04:41:48 +00:00
Wanne bf99b6d9e6 - bugfix mp: fixed up coop 
- bugfix mp: fixed bobby rays code my end

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2158 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-13 18:49:02 +00:00
Wanne 10e518110a - bugfix mp: ctd if client opens inventory in tactical, if server and client had selected different inventory in the start new game screen. Now I changed that, so each client can decide new or old inventory. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2149 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-12 19:41:21 +00:00
Wanne 1b5393014d - added INI option for new tracer bullets (USE_BULLET_TRACERS) 
- corrected some german spelling mistakes
- new release build (2147)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2147 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-12 10:57:06 +00:00
Wanne 9dfd4e096e new exe build (2146) which also contains multiplayer 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2146 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-12 09:48:10 +00:00
lalien c789c1953f Added changes from build 2137 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2145 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-12 08:35:50 +00:00
lalien 3e22dce318 Merged Multi Player Project into main branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-12 08:20:47 +00:00
ChrisL c448713412 Minor adjustment to the NIV mode 800x600 thigh and combat pack pocket coordinates on the tactical panel so that the stealing menu doesn't inadvertantly "double hatch" our pockets and make them look solid black. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2124 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-09 22:28:59 +00:00
Wanne d8590d3474 new release and editor (build: 2112) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2114 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-07 16:55:24 +00:00
ChrisL 0527d0a585 Minor update so that sector A9 will be the default map when a major version update has completed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2111 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-07 16:06:23 +00:00
ChrisL 82aec44382 Fixed bug #82: SHIFT+N allowed both sun goggles and NVGs to be worn at the same time. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2108 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-06 17:32:34 +00:00
Wanne 2b3b6367f1 Fixed bug #93: Character name too long at IMP activation screen -> CTD 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2100 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-04 19:19:38 +00:00
Wanne 9445ded9e2 Fixed bug #94: Merc with no ammo in autocombat = CTD 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2099 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-04 18:53:49 +00:00
ChrisL 8e332178e4 Made an adjustment to the editor so that map version checking takes place when rebuilding the DevInfo folder. This will allow maps to update properly if you switch between maps alot, while not forcing a major version update when it's not needed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2096 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-02 23:09:58 +00:00
ChrisL 07549fdc68 Resolved a problem where ItemSize=99 items would cause a CTD because of a mission condition. 
Adjusted the ALT+W function so it runs a bit better.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-02 16:39:16 +00:00
ChrisL 5a57354297 Fixed item "beaming" bugs that allowed items to be grabbed from a sector your merc wasn't currently in. 
Fixed the map editor so that "Nada" items don't appear in the item lists.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-29 17:33:49 +00:00
Wanne 6d4b38541b - Removed "Realist" from the 1.13 Credits, because he said to me it is a mistake that he is named there. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2086 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-27 11:10:46 +00:00