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
763 Commits 9 Branches 6 Tags
ef158c56cf825751d8ffc7fcc4ededaeb2722839
Commit Graph
763 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisL ef158c56cf Correction to the AutoBurst penalty, by Headrock 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2387 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-30 02:56:38 +00:00
ChrisL 2eb729ab31 Headrock found a bug in the CTH calculation with regards to autofire penalties. 
Think I've fixed a glich where mercs who were already in a sector (but not active) could not be placed on the tactical placement screen (either because of an assertion error or simply being told the placement wasn't valid).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2385 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-28 18:41:22 +00:00
ChrisL 7bd9d49e7c One more change to BRs to display the correct AP label. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2382 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-21 17:09:37 +00:00
ChrisL e7049a63db Fixed a glitch with the AP display in BRs. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2380 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-21 16:55:32 +00:00
ChrisL 33a9f17760 Bugfix to resolve an assertion error relating to the helicopter. 
Change to BobbyRays information as proposed by Headrock.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2379 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-17 15:56:58 +00:00
Wanne 260b2bc4fd New Map Editor and Game Exe Build (Build: 2377) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2378 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-15 21:00:53 +00:00
ChrisL 26201b3816 Updated build number 
--Editor fixes from Kriplo
Implementation for mouse wheel support
Implementation for mouse middle button support
Fix for adding on roof tiles
Fix assertion when leave editor mode
On saving map check of entry points are add
Fix for to many ToolTip messages in place walls
Fix assertion on loading map without entry points
Fix assertion in Sector Summary if DevInfo directory not exist
Fix for problem of losing map edgepoints
Fix problem with losing stuff from LBE
Fix crash in meanwhile
--Fixes from Headrock
Fixed a typo in the Health experience calcuation for strategic movement
Added "Draw" cost to weapons help data


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-13 21:05:28 +00:00
ChrisL fa21f87a59 Tron and Kriplo's fix for the "off-by-one" bug. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2373 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-10 22:47:07 +00:00
ChrisL 1278c52d9a Bugfix for IMP attributes. 
Fixed loop/crash that occurred when handing MADLAB a weapon with a permanent attachment.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-07 22:35:48 +00:00
ChrisL 7e1d4a2d89 Fixed a capitalization error that was stopping the editor from compiling. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-30 16:21:02 +00:00
ChrisL 92b1865817 Map editor changes from Kriplo (DNL). 
Adding roads from “Draw Roads” selection will first remove exact the same road tile object before placing the same again at the same location.  
Adding roads from “Place banks and cliffs” option now will not put same road in same map element just once.  
Whenever you chose to place rocs,bu ches,tree,junk, or any what call PasteStructureCommon() will first remove exact element before it put again.  
“Fill area” will not go to endless recursion loop when try to fill inside buildings, ending with stack overflow.  


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-26 23:41:37 +00:00
ChrisL 6f2af55cba Fixed assertion error caused when switching from strategic to tactical with a dead merc in the current team. 
Fixed a bug where hired RPCs would not get items stored in their gunsling or knife pockets.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-23 23:14:49 +00:00
Wanne 52a28a8268 Updated _DutchText.cpp (from Inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-22 17:18:40 +00:00
ChrisL f7ffba090e Fixed an assertion error that occurs if you try and save a game immediately after an autobattle has completed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 18:25:17 +00:00
ChrisL 87fbb6f4d9 Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor. (part 2) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 16:28:13 +00:00
ChrisL 3e8d006329 Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 16:27:07 +00:00
lalien 226992e00b Fixed Russian translation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 09:03:58 +00:00
ChrisL 0e4c2ab79c Updated the shopkeeper display so that items being offered for sale by the shopkeeper display their highest unit cost instead of the stack cost. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-15 20:43:49 +00:00
ChrisL e6f9406ffe Fix sector inventory so that right-click closes the panel when ALLOW_SECTOR_DESCRIPTION_WINDOW is FALSE. 
Removed the "Major Version Update" system from the map editor.  Now, maps will be updated only when they are actually loaded.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-11 14:57:12 +00:00
Wanne eae98df88d - externalization: Restrict female enemies from being in the queens army (except Female Elite enemies)? -> RESTRICT_FEMALE_ENEMIES_EXCEPT_ELITE 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-09 16:26:51 +00:00
Wanne 3951568f8c Updated _RussianText.cpp (by Inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-31 15:24:00 +00:00
Wanne 602713f0ca Updated build version number for new exe to 2322 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-30 15:07:32 +00:00
ChrisL feb713ff0e Another tweak to the language system for cities.xml. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2321 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-29 22:59:38 +00:00
ChrisL 0a1b40237d Updated code to support language specific cities.xml. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2319 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-29 16:12:08 +00:00
lalien 3ae10505f4 Fixes for new fonts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-27 21:45:39 +00:00
Wanne e3dd3f5487 First step in making the Cities.xml useable with other languages (Russian.Cities.xml, ...) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-18 12:49:34 +00:00
ChrisL 7e37a07476 Fixed the sector inventory so that you can right click to look at an item's description even if you don't have an On Duty merc in the sector. You still need a merc in sector, but they can be involved in another activity where before they also had to be part of an active unit. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2306 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-12 17:09:29 +00:00
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