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

7902 Commits (b21f92a65d0ac9ad9042bd1c619fbd9540eb08bd)

Author SHA1 Message Date
Christian Ohm 7f0929bb48 Fix sk.po. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11429 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-11 00:04:10 +02:00
Christian Ohm fe59e98943 Add Slovak translation by Koapa. 
Closes #2036.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11418 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-11 00:04:10 +02:00
Christian Ohm e210755cb5 Korean translation update by urgood2. 
Closes #2068.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11417 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-11 00:04:10 +02:00
Christian Ohm a11814e87f Fix unitialized variables warning. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11416 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-11 00:04:10 +02:00
Christian Ohm 8d0efc507d Update Debian packaging. 
Based on r11266 from 2.3.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11412 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-10 18:48:15 +02:00
Christian Ohm 7befaa1f89 Update .gitignore. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11411 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-10 18:48:14 +02:00
Christian Ohm 6e6b5a7c34 Update translations. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11407 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-09 09:14:50 +02:00
Christian Ohm a07d8d3ad8 Don't save translated descriptions in the keymap. 
Uses the English string in the keymap file, and translates it for display only.
That way, when changing the language, the descriptions will appear in the new
language. Old files will still work, just show the translated string until a
reset. Also mark all descriptions as translatable. Closes #2049.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11406 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-09 09:14:50 +02:00
Christian Ohm fab89b8ab4 Don't crash in socketAccept when given a NULL socket. 
Closes #2033.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11405 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-09 09:14:50 +02:00
Christian Ohm 5a21521678 Make some internal component names untranslatable. 
Closes #2064.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11402 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-09 09:14:50 +02:00
Christian Ohm 4eb49a39d1 Add Korean translation by urgood2. 
Closes #2035, #2055.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11395 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-09 09:14:49 +02:00
Cyp 6bc0682c06 Don't use extra precision when avoiding (or trying to avoid) obstacles, since it leads to integer overflow and pseudorandom decisions. 2010-08-06 19:29:11 +02:00
Safety0ff 9998b89016 Apply patch from #2007 (Remove randomiseSeed calls from scripts.) 
Closes #2007.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11386 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 20:05:02 +02:00
Giel van Schijndel 94320034ae Assume that SDL headers are directly in the #include path, instead of assuming the SDL directory is in the #include path. 
Closes #1941.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11385 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 20:05:02 +02:00
Safety0ff 1fa5ab201d Apply patch from #1944 (vorbis error strings). 
Closes #1944.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11384 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 20:05:02 +02:00
Safety0ff dec83d8065 Apply patch #1982. 
Removes Vector3i_normalise and return int32_t instead of float for Vector3i_Length.
Closes #1982.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11383 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 17:48:53 +02:00
Buginator 235579d051 Backport revert: 
As by consensus, revert ticket:1990, and revisions:
r11331, r11310, r11305, r11206, r11202, r11200, r11199, r11112.

Please see ticket:2051 for more discussion on the new routine.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11381 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 14:13:30 +02:00
Buginator 0a4bd99cb5 Removed unused file. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11378 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 14:13:29 +02:00
Christian Ohm e503f52a32 Fix "make distcheck". 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11371 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-04 16:43:19 +02:00
dak180 36c9b413a5 Update the PT_BR .strings file. 
Closes #2047.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11366 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-03 09:39:11 +02:00
Christian Ohm 602e7f13c9 Add missing files to the tarball. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11370 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-03 09:38:30 +02:00
Giel van Schijndel ccbd9c56c7 wzmasterserver.py: change the `__author__` value to "The Warzone 2100 Project" 
This used to be a list of authors.  Ego-boosting can always be performed by the AUTHORS file, no need to boost it all over the place ;-)

Suggested by Fastdeath's patch, see #1985

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11369 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-03 09:38:30 +02:00
dak180 f2548c181f Update the PT_BR .strings file. 
Closes #2047.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11365 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-03 09:38:29 +02:00
Christian Ohm 43aedf78da Brazilian translation update by Tucalipe. 
Closes #2043.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11362 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-03 09:38:28 +02:00
Cyp cdfb2625e3 newnet: Don't let (unsynchronised) delivery points stop droids from building. 2010-08-02 14:23:31 +02:00
Cyp dd47d1f8c2 newnet: Insist harder on detecting and displaying desynchs. 2010-08-02 14:22:10 +02:00
Cyp 19c5f3ebb7 newnet: Obliterate some floats in projectile movement code. 2010-08-01 23:24:05 +02:00
Cyp a9d1296e29 newnet: Demote LOG_ERROR to LOG_NEVER, when droids are destroyed just after being sent orders, since LOG_ERROR isn't for expected behaviour. 
Also, demote LOG_WARNING to LOG_FEATURE, when features are destroyed.
 2010-08-01 22:34:48 +02:00
Cyp d5b3621844 Merge branch 'master' into newnet 
Conflicts:
	lib/netplay/netplay.c
	src/multiint.c
 2010-08-01 21:10:34 +02:00
Cyp 7c8df3a2e8 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/framework/wzapp_c.h
	src/power.c
	src/power.h
 2010-08-01 20:41:45 +02:00
Cyp 82ad8abd8f When a player drops from the joining menu, clients should remove the dropped player, and not decide whether to randomly quit based on whatever was on the stack, either. (Forward-port from 2.3.) 2010-08-01 19:41:07 +02:00
Cyp da7ff2f37f Don't allow inconsistent player positions or colours, even momentarily. (Forward-port from 2.3.) 
On swapping places or colours, sends a NET_PLAYER_INFO containing both players, instead of two separate NET_PLAYER_INFOs.
 2010-08-01 19:40:12 +02:00
Cyp 466943b783 Don't use floating point calculations in power code. 2010-08-01 18:38:11 +02:00
Cyp eed7a50018 Minor power code cleanup. 
Removed unused stuff, changed float to int in some places that don't make a difference.
 2010-08-01 18:38:11 +02:00
Cyp 7874dc608c Clean up thread-related #defines. (Backport from newnet.) 2010-08-01 15:23:06 +02:00
Cyp c96eda047c Check if blocking map pointer is valid by comparing game time to a variable that isn't inside the blocking map structure. (Backport from newnet.) 
Must have gotten confused when mixing/refactoring/blending/frying data structures, even the comment was weird. Fixes valgrind warning and probably fixes ticket:2016.
 2010-08-01 15:17:47 +02:00
Christian Ohm c778cad0f1 Polish translation update by Emdek. 
Closes #1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11336 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-01 15:14:54 +02:00
Cyp 098878ffae Merge remote branch 'origin/master' into newnet 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2010-08-01 13:52:16 +02:00
Cyp 6e26d32b5e newnet: Don't wait for players that have left the game. 2010-08-01 13:44:56 +02:00
Cyp 2e01e81da6 newnet: Show relevant players next to connection status icons. 2010-08-01 13:06:50 +02:00
Christian Ohm 324722fc93 Prevent out of bounds access of player stat arrays. 
In the 2.3 netcode, we use player 9 for features, while we only have stats for
players 0-7. Fixes #2029 and probably a truckoad of other random problems.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11323 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-01 10:50:33 +02:00
dak180 3d0befebc9 Fix up the build rules. 
Add the Korean .strings file.

Closes #2039.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11318 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-31 19:03:34 +02:00
dak180 943af316ec Add the Korean .strings file. 
Closes #2039.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11317 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-31 18:51:15 +02:00
Cyp 1854f49a0c newnet: Check if blocking map pointer is valid by comparing game time to a variable that isn't inside the blocking map structure. 
Must have gotten confused when mixing/refactoring/blending/frying data structures, even the comment was weird. Fixes valgrind warning and probably fixes ticket:2016.
 2010-07-31 11:42:50 +02:00
Cyp b59b089ca5 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/nettypes.c
	src/multibot.c
 2010-07-30 22:51:33 +02:00
Cyp ea690beab7 newnet: Fix maximum latency calculation, don't return 1 second unconditionally. 2010-07-29 23:30:16 +02:00
dak180 3f69367f3a Add dSYM bundles for maximum symbolication. 
http://bitbucket.org/boredzo/symbolicator can be used to symbolicate crash logs from people without dSYM bundles.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11313 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-29 23:27:39 +02:00
Buginator 32241ef77b Fix ambiguous function call to overloaded function 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11297 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:59:41 +02:00
Guangcong Luo 1bf4d64a0c Fix loading some maps in T1 mode. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11309 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:35 +02:00
Christian Ohm 7b3dce75df Simplify buildingDamaged(). 
Prevents a possible division by zero, closes #2008.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11307 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:34 +02:00