Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,586 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

7586 Commits (2dcb53d326a35dec5cd533e67e24156491212d5d)

Author SHA1 Message Date
Guangcong Luo 2dcb53d326 Fix bug #1994 and apply patch #1998 - Change Mac OS X to use DejaVu Sans like in Windows/Linux, which fixes problems with text alignment. refs #1994, closes #1998 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11230 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-19 10:58:59 +02:00
Per Inge Mathisen aa0fcecc52 (from path branch) Make sure we can never end up driving in reverse while waiting for a path. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11229 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-19 10:58:59 +02:00
Per Inge Mathisen e25fc53a66 (port from path branch) No longer come to an instant halt when changing paths. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11227 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-19 10:58:59 +02:00
Guangcong Luo 09d73b0ba5 Apply patch #2003 - Add option for rotating with middle mouse button (LMB+RMB also works). refs #2003 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11212 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-16 03:54:27 +02:00
Safety0ff a6bb433a17 Reuse the lightmap texture and buffer since their size will not change between initTerrain and shutdownTerrain calls. 
Replace a magic number with a new constant.
Update lightmap on the first frame (gameTime = 0).
Closes #1962.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11211 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-16 03:54:27 +02:00
Per Inge Mathisen 5c48a62fd5 Convert moveGetObstacleVector() to float. Now the float-b-gone conversion of move.c is complete. Patch by Cyp. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11209 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-15 20:35:04 +02:00
Christian Ohm dc9338a3b6 Fix a few new warnings. 
Closes #1999.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11208 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-15 07:13:22 +02:00
Guangcong Luo e3b5c20533 Fix bug #1993 - crash when hosting a multiplayer game 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11207 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-15 07:13:22 +02:00
Guangcong Luo f367bc1d4f Make text line up better - most text now fits in the text box containing it. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11204 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-14 19:58:33 +02:00
Guangcong Luo 6ad59e0ec9 Fix bug #1990 - broken skirmish games 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11203 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-14 11:01:15 +02:00
Cyp 0c95725a23 Backport warnings from newnet branch, fix a warning that was stopping mac build. 2010-07-13 21:04:32 +02:00
Cyp 33eaa1fd65 Fix off by (almost) half of a tile when building derricks. 
Was "+ TILE_SHIFT / 2" = +3 instead of "+ TILE_UNITS / 2" = +64 when finding the centre of a tile.
This bug exists since revision 1. Closes ticket:1988.
 2010-07-13 19:55:05 +02:00
Cyp a3569a758f Make pathfinding thread safe. 
May also be faster in some cases, where lots of droids are pathfinding to different destinations at once.
 2010-07-13 18:20:05 +02:00
Buginator 228e60f18a Prevent division by 0 when a object has 0 original hit points. 
Add a check for that condition on load, and complain about it, and assign 1 hit point to the object.

Correct some typos, clean / fix up some comments / debug lines

fixes ticket:1711
Original patch by MegabytePhreak

NOTE: the feature.txt file wasn't fixed in the commit.
2.3: r11186

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11187 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:57 +02:00
Buginator 6239cbaf46 Bump revision number for netcode, since the addition of r11182 (the map) it would fubar if all clients are not the same, and host was using said map. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11185 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:56 +02:00
Buginator 096c257052 Commit these project settings defines to disable extra checking which causes a huge performance hit. (VS2k8 was already committed in r9639, this was forgotten.) 
_HAS_ITERATOR_DEBUGGING=0
http://msdn.microsoft.com/en-us/library/aa985939(VS.80).aspx
_SECURE_SCL=0
http://msdn.microsoft.com/en-us/library/aa985896(VS.80).aspx
For more info on checked iterators see:
http://msdn.microsoft.com/en-us/library/aa985965(v=VS.80).aspx
and
http://msdn.microsoft.com/en-us/library/aa985982(v=VS.80).aspx


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11184 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:56 +02:00
Per Inge Mathisen dfc9b624dd Add new map 'Pyramidal' by Mysteryem. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11182 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:55 +02:00
Per Inge Mathisen 193bd4f386 Add challenge descriptions. Patch by BlueMaxima, though I shortened the Back to Basics description somewhat. Closes ticket:1986 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11180 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:55 +02:00
Cyp 65b68143e1 Merge accidental fix of bad sorting function in astar.cpp from newnet branch. 
The bug (due to missing parentheses) was accidentally fixed during a merge from trunk to newnet, due to different warning flags on the newnet branch which required an accidental bugfix to compile.
Pathfinding might give straighter paths now and/or be faster.

Completely closes ticket:1981.
 2010-07-12 08:50:26 +02:00
Cyp 0dc1a58cd1 Fix infinite loop in pathfinding to nearest point when destination is not reachable. 
Hopefully closes ticket:1983.
 2010-07-11 23:52:13 +02:00
Per Inge Mathisen 33afe5bc3d simplipie: Make it accept multiple filenames as arguments to make mass-conversions simpler. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11171 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 23:04:18 +02:00
Cyp 25ee2493d0 Add assertion that paths are not longer than the number of tiles in the map. 2010-07-11 22:00:24 +02:00
Per Inge Mathisen 7c39eaf693 Improve logging for movement 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11163 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:56:12 +02:00
Christian Ohm aacc6f7e54 Croatian translation update by MetalWarrior95. 
Also add Saberuneko's real name, per his request.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11160 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:56:12 +02:00
Christian Ohm a5f420655a Update translations. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11159 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:56:12 +02:00
Christian Ohm 6514240f25 Don't translate language names. 
Closes #1779. Patch slightly modified to use language names from the
translations where available, and moved the defines into the .c file, since
they're only used there.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11155 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:17:36 +02:00
Buginator 208ba52334 Add C++ header guards 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11153 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:17:35 +02:00
Christian Ohm e272388ab1 Demote "failed to remove path" message to LOG_WZ. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11151 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:17:35 +02:00
Buginator 0dca1b06a1 Prevent overlapping sounds when looking at intel information. 
fixes ticket:60

2.3:r11147

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11148 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:17:35 +02:00
Thomas Barlow 2e7466cbe8 Fix 8c-wheel (ticket: 1935) and rebalance 2c-Startup using the files from 2c-Startup2 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11146 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:17:35 +02:00
Cyp bc68503888 PointTree: Don't compare pointers when searching for points. 
This should avoid any debug assertions from paranoid¹ compiler run-time libraries when two droids have exactly the same location, since the object pointers are unsorted², and closes ticket:1981.

¹ Although std::lower_bound checking that the array is sorted could catch real problems too, so it's not that strange³.
² Was comparing to a NULL pointer when searching, so the values of the pointers in the array didn't matter. Skipping the NULL pointer comparison should save a CPU cycle or two, at least.
³ But using recursive footnotes in a commit message might be considered strange.
 2010-07-11 08:41:56 +02:00
dak180 860d164ff4 Rip -mfpmath=sse and -mno-fused-madd out since we are eliminating floats instead. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11141 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 08:08:34 +02:00
Christian Ohm 3537be8401 Update .gitignore. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11134 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 08:08:34 +02:00
Christian Ohm abc500a9b4 Correctly align the map selector close button. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11127 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 23:57:34 +02:00
Christian Ohm 11fa3d73fc Save settings when receiving an SDL_QUIT event. 
Closes #1964.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11126 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 23:57:34 +02:00
Cyp ef3c1b6d1d Use sqrtl instead of sqrt, on 32-bit platforms, to work around weird compilers. 
On some compilers, sqrt() seems to have somehow been taking 64-bit doubles and returning 80-bit doubles, breaking expected rounding behaviour.
 2010-07-10 19:25:15 +02:00
Cyp b96f6c2b6e Reuse pathfinding data when multiple droids want to go to the same place. 2010-07-10 11:13:01 +02:00
Buginator 6137e01960 Apply patch #1971 - Remove "Sk-" and "-T1" from map names in map chooser. 
Committed, as requested by Zarel

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11113 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 10:38:39 +02:00
Buginator 8e02c3d3ea When player disconnects / drops, handle the message, instead of the clients ignoring it. 
Fixes ticket:1020


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11109 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 10:38:38 +02:00
Buginator 1941064f77 Re-enable client packet logging 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11108 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 10:38:38 +02:00
Buginator 76834a7040 Update MSVC project file for the astar.cpp change. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11107 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 10:38:38 +02:00
dak180 cd7550c0aa Make the Autorevision script a bit smarter. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11106 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 10:38:37 +02:00
dak180 a658e90d16 Get rid of VORBIS_NEEDS_HACK on the theory that less hacks are better. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11102 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-06 07:17:42 +02:00
dak180 559a02e7f7 Minor adjustments to better match up with newnet. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11101 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-06 07:17:41 +02:00
Per Inge Mathisen 9314399f0c As an extension of ticket:1651 now remove even more floating point movement code. Also 
remove the rather pointless turn optimization code. Also see ticket:1649 for discussion.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11099 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-05 23:15:20 +02:00
Christian Ohm ae85ae5e84 Update POTFILES.in. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11097 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-05 23:15:20 +02:00
dak180 b66bdb8955 Turn -Wsign-compare warnings off until someone has time to fix them. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11093 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-05 08:08:53 +02:00
dak180 2d7d29c861 Change astar.c to astar.cpp in xcode project. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11092 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-03 11:06:38 +02:00
Cyp ca9f5a1f5d astar: Try to optimize pathfinding a bit. Same basic algorithm. 
Lower memory usage, less allocations, O(n) → O(log(n)) in one place. Less code.
 2010-07-03 07:34:42 +02:00
dak180 bb2eed7c63 Add jpeg_encoder.(c|h) to the xcode project. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11088 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-02 08:31:40 +02:00