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

7130 Commits (478424e0b696cb217bda09d53b25b5077059dd55)

Author SHA1 Message Date
Per Inge Mathisen 924b6c5169 Changing object rotations to use 16 bit unsigned values instead of the current 
mix of signed and floating point types. This allows us to use under and over
flow as features instead of failures. There are many conversions using DEG() and
UNDEG() in the code now - these should be read as TODO items for further work.
There is a high chance of bugs being introduced. Patch reviewed by Cyp_.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10067 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:37 +01:00
Guangcong Luo 78c10eb0e7 Do not visualize path of a droid that has no path. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10065 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:36 +01:00
Guangcong Luo 59168acc5c Fix some rounding errors in repair facility and research facility. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10063 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:36 +01:00
Cyp 80d7cdb475 Add some better trig lookup table functions, and make updateDroidOrientation use them. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10061 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:36 +01:00
i-nod 5f58469f2b 'Active mods' frontend label was repositioned to top-left corner and its internal buffer was enlarged a bit. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10060 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:36 +01:00
Christian Ohm 4af14d9ec0 Only clear buffers on exit if we still have an OpenGL context. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10057 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:36 +01:00
dak180 80b379fcbf Externalize fetch scripts. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10056 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:36 +01:00
Christian Ohm f762bdf40e Don't put random colours in the loading bar. 
Make every star have a random grey value instead.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10054 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:36 +01:00
i-nod f875b678ac Fix MSVC 2008 for the GLee changes in r10028. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10053 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:36 +01:00
Per Inge Mathisen 5f7aea25a3 In preparation for newnet branch, turn object positions into int32 values and 
introduce the new typedef Position to hold them. Patch reviewed by Cyp_.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10052 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:36 +01:00
Safety0ff f50803b0f4 Stop landing VTOLs even if they are below the map height. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10050 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:36 +01:00
Safety0ff bab5657791 Update to r9472 to match r10022. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10049 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:35 +01:00
dak180 89feaaa192 Update libpng to 1.4.1. 
Closes #1479

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10048 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:35 +01:00
Safety0ff 327b684965 Update to r9628: Re-enable face culling after having disabled it for the map preview rather than enabling it each time we draw the 3D scene. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10047 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:35 +01:00
Safety0ff 9da488b14c Update to r9629: Use floats constants instead of ubytes to save on the conversion. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10046 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:35 +01:00
Christian Ohm 3f4eef1b54 Fix makefile.win32 for the GLee changes in r10028. 
Thanks to sicanjal for testing.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10041 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:35 +01:00
Cyp 3dd3cd5051 When droids are taken over, don't send droid count, since droid count isn't read, making the message unparsable. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10039 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:35 +01:00
René Jürgens 5f6fc04c84 Online - Template Fix #2 
sry... but thats realy the right one now. :/

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10037 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:35 +01:00
Christian Ohm 20017e380c glFlush on exit to reset video mode. 
Without this, when running the game fullscreen in a smaller resolution, it
would stay that way on exit. Introduced in r9633, though that is in 2.3 as
well, and this problem only occurred in trunk.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10035 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:35 +01:00
René Jürgens d5ff075122 Online - Template Fix 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10029 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:35 +01:00
Christian Ohm 714d2d1b69 Use the system's version of GLee, if available. 
Require at least 5.4, since that's what we have included. If not detected, we
use the integrated copy as before.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10028 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:34 +01:00
i-nod 09a3837526 Sync NSIS project with 2.3 version. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10021 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-27 22:51:27 +01:00
dak180 7e93e96524 Save space on releases by compressing everything we can. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10018 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-27 22:51:27 +01:00
i-nod 991b158f65 Use less complex zip calls or mingw32-make will fail. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10016 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-27 22:51:27 +01:00
Per Inge Mathisen 89b90ec8dc Shave 64 unused bits off each A* node. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10015 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-27 22:51:27 +01:00
Per Inge Mathisen f8d50ddbc6 Experiment with increasing zoom out distance slightly. Report back all feelings of 
nausea and discomfort for further study.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10013 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-27 22:51:27 +01:00
dak180 7057faba66 Warzone 2100 is the full name of the game, so use that for the default display name on the mac. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10011 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-25 20:51:10 +01:00
Buginator 8ec55a5579 Handle socket clean up, then player cleanup, and then re-init the player who left. 
Fixes the issue of seeing leave messages with the default AI color names, instead of the person who left name.

(2.3 r10004)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10010 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-25 05:50:39 +01:00
Buginator c402fb2f2a Committed wrong patch for r9992. 
When host drops at that point, just close up shop, and set lobby error.

Thanks to Cyp for noticing.

(2.3 r10003)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10009 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-25 05:50:39 +01:00
Buginator 66d2fb68ec Broadcast NET_HOST_DROPPED on host dropped in NET_fillBUffer() 
(2.3 r9992)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10001 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-24 06:50:37 +01:00
Buginator ae3e6e80a7 broadcast all player's stats. 
This should fix the issue where, on joins, people would sometimes see different medals (pacifier) instead of what the remote player actually has. 

(2.3, r9991 & r9993)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10000 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-24 06:50:37 +01:00
Buginator 3433d5fb58 Make sure the localOptionsReceived flag is set correctly when the refresh widget is hit 
(would cause people to enter a game, and only see all AI's, instead of the actual players)

(2.3 r9990)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9999 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-24 06:50:37 +01:00
Buginator 8a785d511c If we run out of temp sockets, then we should error out, not "fix" the issue by reusing MAX_TMP_SOCKETS -1. 
(2.3 r9988)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9998 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-24 06:50:37 +01:00
Buginator 15b25dcdfe Add more LOG_NET debugging love. 
No code changes (besides adding debug(LOG_NET...))

Change some LOG_WARNINGS to either LOG_ERROR (since they are) or LOG_INFO (since we should know about this)

(2.3 r9987, r9989)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9997 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-24 06:50:36 +01:00
Buginator a485fa69c6 When we leave, only tell the host that we are leaving, and have the host tell everyone else about the player leaving. 
(2.3 r9986)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9996 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-24 06:50:36 +01:00
Buginator e8ff3ec7bf Make sure we mark the socket invalid in the socket set when we are about to close the socket. 
This will fix (hopefully) the remaining segfault issues in checkSockets().
(2.3 r9985)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9995 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-24 06:50:36 +01:00
Buginator 519db7a374 To prevent closing the socket before the receiving end can receive the 'quit' message, add a delay of 1s. 
This should fix the issue of players dropping, and nobody would notice that they left until they had a heart attack.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9994 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-24 06:50:36 +01:00
Christian Ohm eeeb453139 make dist: Include whole macosx directory instead of listing every file. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9982 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-23 15:50:47 +01:00
Giel van Schijndel a6a1ffbaa0 Explicitly link with -lX11 when running on an X11 system because we directly use X11 in lib/widget/scrap.c 
This fixes #1098 also reported as DebianBug:556919.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9980 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-22 14:51:00 +01:00
Cyp 8f8cc30847 Clean up droidUpdateDroidRepair. Add droid->body <= droid->originalBody assert in CHECK_DROID. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9979 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-22 09:50:27 +01:00
Giel van Schijndel fafeb245d9 Win32 cross build scripts: Add http://www.il.fontys.nl/~giel/warzone/devpkg/ as mirror for package archives 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9975 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-22 01:50:21 +01:00
Giel van Schijndel 1ed72f87ab Don't use EPIPE when it doesn't exist 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9973 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-22 01:00:19 +01:00
Per Inge Mathisen 21bd0ffdc3 Fix assert if socket set not allocated but socket needs to be deleted. Patch reviewed by cybersphinx and Giel. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9968 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-22 00:50:38 +01:00
Per Inge Mathisen 9bbf6a655c Sync up network changes from 2.3 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9964 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-22 00:50:38 +01:00
Giel van Schijndel 2c09022412 NetPlay refactoring: 
* Rename addSocket to more descriptive SocketSet_AddSocket
 * Rename delSocket to more descriptive SocketSet_DelSocket

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9952 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-21 21:50:20 +01:00
Giel van Schijndel 401723958c Make backtraces regarding FD_SET related crashes (see #1136) more useful 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9950 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-21 21:50:20 +01:00
Giel van Schijndel fa787fcc80 Win32 cross build scripts: Apply revision 5375 from the SDL repository as a patch to SDL-1.2.14. 
This fixes #1340, also reported as SDLBug:849.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9948 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-21 20:50:19 +01:00
Guangcong Luo 582962732d Rebalance 0.7.0 - The cannon overhaul. 
Cannons and rails have their original 1.10 HP levels restored.

- Heavy Cannon was moved later-game
- Assault Cannon, Twin Assault Cannon, and Hyper Velocity Cannon were moved earlier-game (and rebalanced accordingly)
- Assault Cannon, Twin Assault Cannon, were made lighter
- Hyper Velocity Cannon can now hit air units, penetrate units, and is lighter, but reloads more slowly and has less HP. It no longer replaces Medium Cannon
- Plasma Cannon has been made into a cannon (prereqs: HPV + Inferno + DSLDA3), and has been rebalanced accordingly.
- Hyper Velocity Cannon can now hit air.
- Cannons, rails, mortars, and howitzers have their splash damage increased.
- Ripples and Archies have been nerfed.
- Lancer has had its damage slightly nerfed. A full lancer rebalance is planned for later.
- Analogous changes have been done to the corresponding cyborgs and VTOL weapons, as well.

("Rebalanced accordingly" means that the component price, research price, and damage have been adjusted to fit the new techlevel.)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9945 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-21 18:50:16 +01:00
Guangcong Luo 9dbc31ade2 Fix bug #1612 - ignore `turnOffMultiMsg` for sending droid deaths from HP loss, since they aren't handled by the caller of `turnOffMultiMsg`. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9943 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-21 17:50:42 +01:00
Giel van Schijndel d96986488f Netcode, refactoring: move setting of (SOL_SOCKET, SO_NOSIGPIPE) to a function rather than duplicating code 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9939 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-21 16:50:45 +01:00