1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,637 Commits 9 Branches 6 Tags
98c1e6a1f529104f2984c3192da76472ce7a53be
Commit Graph
7637 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lalien db0c13aa8b Changed/translated Russian descriptions 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1024 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-07-07 15:03:38 +00:00
Starwalker 92c9e564aa added data for S&W M29, M29 SATAN, and Manurhin MR-73 
added a few ammo crates
changed weight and size of C-18
changed weight of Alcohol
added grenade restriction to belt clip (for Molotov cocktail) and to ammobelt pocket

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1023 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-07-01 15:15:54 +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 192b132fab - updated German.Items.xml (thx to Farmer Toby) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1019 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-06-10 19:31:36 +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 0e0ffd5eab new exe build (2222) 
*** This version contains the multiplayer code integration ****
*** You have to start a new game with this EXE ***
*** If you would like to continue your current games, you have to use the ja2_2124.exe ***

For german and russian users, you can download the multiplayer package here:
http://ja2.h758491.serverkompetenz.net/Wanne/MP/ja2_113_mp_2008_06_08.rar

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1018 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-06-08 13:57:42 +00:00
Wanne cf8e8d75d1 Renamed the existing ja2.exe to ja2_2124.exe and Map Editor.exe to Map Editor_2112.exe. This are the last official versions without multiplayer integration. I will upload in the next minutes a new ja2.exe and a new Map Editor.exe both with multiplayer integration. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1017 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-06-08 13:46:39 +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 9944d75a81 - Slay & Flo speech fix for russian version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2217 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-07 12:23:01 +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
Wanne d19771cbff - added new NPCdata/064.npc for Slay, so he can be easily recruted by giving him the disk from carmen 
- added SIRTECHSPLASH.STI, so the map editor can be started on russian and german version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2213 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-03 17:16:24 +00:00
Wanne 484d7ec8be - added SIRTECHSPLASH.STI to the interface folder, so the english Map Editor.exe can also run with german and russian version 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1016 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-06-03 17:14:37 +00:00
Starwalker 905cc972d8 double entry of gun277.sti deleted 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1015 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-31 16:21:27 +00:00
Starwalker bcc88eea7c uploaded Russian.Items.xml again, earlier version may have had conflicts 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1014 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-31 15:17:04 +00:00
Starwalker 46da404a54 added three new LBE-Items and three new pockets (pics by Marlboro Man) 
corrected a few mistakes in descriptions (Inshy, RoWa21)
changed gun ranges from 10m increments to 5m increments
uploaded new Russian.Items.xml (Inshy)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1013 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-31 15:07:23 +00:00
Starwalker 97de2451c7 added/replaced some gun/item pics 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1012 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-31 15:01:25 +00:00
Starwalker 1d7b7eaf72 added two new silhouettes 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1009 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-31 14:59:18 +00:00
Starwalker d08aef5c53 added two new silhouettes 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1008 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-31 14:58:06 +00:00
Wanne 74a291abbc added speech fix for slay & fox for german version (thx to scheinworld) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2211 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-31 13:10:22 +00:00
Wanne d8ba1dbeaf - updated inventory bottom panel for 1024x768 resolution 
- added speech fix for slay & fox (thx to scheinworld)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1007 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-31 13:09:26 +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
Wanne 660be55d3a Updated comments in Ja2_mp.ini 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1006 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-25 17:45:34 +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 0176037d4c - added new multiplayer texts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2198 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-24 21:23:28 +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
Wanne e811e210ed added DISABLE_SPEC_MODE to Ja2_mp.ini 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1005 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-19 15:18:08 +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