github.com/Warzone2100/archived-3.1-branch commits

The Super Transport (which is the same gfx as the transport in SP game) is available

in MP games now.
The Super Transport can carry a max of 10 units, their weights are calcu...

89e9127957fc0a2cb94f46f0fcf2917a7a9b0d8d authored over 14 years ago

Fix MSVC builds

a11d60774ea3db52ff7212175de3009977c4848a authored over 14 years ago

Update translations.

f894586e5cce49afdbae518999f041fadcb5d3d0 authored over 14 years ago

Clean up handling of SHOOT_IN_AIR and SHOOT_ON_GROUND with some fringe behaviour changes. These are bit values, not enums! Patch reviewed by SafetyOff.

8a01df2f1a9363a2b41eff8d2787aaa5405e9fb4 authored over 14 years ago

Add support for multiple weapons and differentiate between air and ground hitting weapon types. Early support for AA threat maps. Patch reviewed by SafetyOff. Ref ticket:2203

1477265908d450557b2fd865c62c007b401701f9 authored over 14 years ago

Remove formation.c from the xcode project.

5b45925a1ced14df1de0695a0f7ec169a1a73364 authored over 14 years ago

Fix droid order lists getting cleared when processing orders to build modules.

Probably fixes other cases of droid order lists getting cleared.
Fixed by simplifying recvDroidI...

caf94e57235d3b215c863161ab1a2f88bc86cf3b authored over 14 years ago

Add a danger map to the AIs. This will keep them from wandering into the line of fire of enemies while going

from one place to another, and can also be used for quick lookups to see if a particular tile is ...

0c0bcd5c358f42d3ca3f98a0003fcd2db314e3d3 authored over 14 years ago

Merge branch 'master' of gitorious.org:warzone2100/mainline

860d70715dc1eee474e15a327ba72da223e75eac authored over 14 years ago

Fix the ugly "Bug! (e)" message for script added production. Makes watching autogames really annoying.

6f2580255378cdd7e39d540730b1e41aaf4be1a5 authored over 14 years ago

Update .gitignore for MSVC

c2368d51073b1d8d182d13361d5712e7f02aff64 authored over 14 years ago

Update POTFILES.in.

1ef4fe7b590456c371df27d558574182a96786bb authored over 14 years ago

Make movement code better by deleting more lines of code. Remove boundary vectors

and the hack that makes droids phase in walk nodes opportunistically. Now follow path as given.

4bbd0e9b5fb972d4049456a9c89c3caf2829c4a0 authored over 14 years ago

Remove old, broken formation system. This removes 1084 lines of code.

955788bfa94d812637c1d5cd54fce2413ffd9331 authored over 14 years ago

Fix spurious out-of-synch messages when pausing in single-player mode.

This was caused by forgetting to set the delta tick time to 0 when paused. Don't know whether fi...

49e9780f412edab6be982dc3cbd015f078e46493 authored over 14 years ago

Clean out extraneous linkage.

a31521f75eb1ec4a27d04667ab46d06488437381 authored over 14 years ago

Some 64bit prep.

--HG--
extra : rebase_source : b84622c5ee3ddfda891d561327bd4c99a8642362

e5c398b141c41f80eddcdf2f265addbb27d7de2d authored over 14 years ago

Clean up things that are no longer used.

--HG--
extra : rebase_source : 544022e1eeeac8e22d03d0a59cd98ddb9c220a51

20924b59a49c6ae72417b0cf124bc3ddee5f28f7 authored over 14 years ago

Turn global geoOffset into a constant

geoOffset is only ever intialised to 192 so make it a constant instead
of a variable.

Signed-of...

5457aefde6d3259f37c04020843d208900c817ed authored over 14 years ago

remove write-only variables buffer and size from iSurface

Signed-off-by: Giel van Schijndel <[email protected]>

b5fb5bacf883cac1b1557404cb1d8bb1c6abb063 authored over 14 years ago

Replace rendSurface related bitshifts with divisions

These cases of bitshifting are premature optimisations ''only'',
especially since they obscure w...

0d2dbdbaef02c900b557baa31627c3d23e762d21 authored over 14 years ago

move global rendSurface to piemode.c

rendSurface isn't used by rendmode.c, so define it in piemode.c where it
is both used and its co...

6e509622c2895bc991215a603d61fe1a040aad7f authored over 14 years ago

Remove pointer global psRendSurface

Global pointer psRendSurface only ever contains &rendSurface (another
global), provided that it ...

5ab267ab71d8e389ea19a68558cf460cce55e2c4 authored over 14 years ago

Get rid of double pie_/iV_ names for the same functions

Signed-off-by: Giel van Schijndel <[email protected]>

5a51986e65065e0f583893813999e562b28f3458 authored over 14 years ago

Remove unused constant PIE_NO_CULL

Signed-off-by: Giel van Schijndel <[email protected]>

681988a5d4b377b41d4c823f6e3580ff7a346d83 authored over 14 years ago

remove write-only variable iSurface.flags

Remove the write only member variable `flags` from struct iSurface.

Additionally remove the mac...

e278f01bcdec5f89425b693e830a472499d40dd7 authored over 14 years ago

Also fix MSVC *.vcproj files that somehow ended up in lib/ instead of win32/, remove the last part that touches macosx.

569fb996937bcfcab5547cb44431f781bcaa3b4b authored over 14 years ago

scriptfuncs: store (possibly) signed values in signed variables

Store map coordinates in a pair of signed integers as that's how
map_coord returns them.

Signed...

10f2bdede638766ed0ea198d750a00af95fbf110 authored over 14 years ago

piematrix: improve mathematical description of pie_RotateTranslate3f

Signed-off-by: Giel van Schijndel <[email protected]>

5923c455936febbf4303e80f22ac2c8ae431c6a1 authored over 14 years ago

code cleanup: slight code reordering for readability

Slight reordering of the call to pie_RotateProject and turn a
todo-message comment in an actual ...

0a7b147c5b2d7eb8ba109ff466ab35c918300bfc authored over 14 years ago

trig: don't #include "math_ext.h" as trig.h doens't use it

Signed-off-by: Giel van Schijndel <[email protected]>

d6c7690f02922708af5a36c7f9ad3d0b0d0c8458 authored over 14 years ago

trig: declare all trigonometric functions as pure

Mark the prototypes of all (fixed point) trigonometric functions as
pure. This declares that th...

a8fdd2c06838ff5de5ac6d135aac5793277cca6e authored over 14 years ago

Get rid of unused constant TRIG_DEGREES

Signed-off-by: Giel van Schijndel <[email protected]>

83aacc042b4b51ec67643dffcb3956f2fdaa79db authored over 14 years ago

Merge remote branch 'origin/master' into qt-trunk

Conflicts:
.hgignore
configure.ac
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib...

0794c5a674ac3ca6ab224f8eaa81115274fa00e6 authored over 14 years ago

Only xcode should touch the project.pbxproj file.

d2739968a3670c3e4cb3db4f4ade1cbe0ff757c9 authored over 14 years ago

merge

a11af2d203ec4171799ce67ca3f9a8332f2adf37 authored over 14 years ago

Treat the xcode project as a binary.

6473b8eded8eee50ccf61e7e6d412614d6fdc98a authored over 14 years ago

Add build script fixer for when renaming files from .c → .cpp, and add branch-switching hack to lib/ivis_opengl.

03cc107b846ab190e6649de9911a45881e5c1ecd authored over 14 years ago

Convert pie_MatRot[XYZ] to use uint16_t instead of float.

125e7ba9ab0403fe3156b8c377d7b7e2d07d7709 authored over 14 years ago

Replace iv_Matrix with pie_Mat, eliminating the need for ivispatch.h.

5fa9edc4ade97af82dae1610056b9cc7554e4302 authored over 14 years ago

Make sure that git is in the path when Autorevision is run.

60c61a89b4b9513f012ee90dd774ce6055e9add4 authored over 14 years ago

piematrix: remove unused function pie_RotateTranslate3iv

Signed-off-by: Giel van Schijndel <[email protected]>

fd740148c35fc1d1bf929488591ff2056ef20962 authored over 14 years ago

Make autorevision.cpp print Git commit SHA1s.

ef4b89420298ca272ef170f3c102f4a862f73b36 authored over 14 years ago

Thanks to the follow individuals for the new icons! Forum members "Jorzi" (kick icon) "CinC" (VTOL/NO VTOL icon) and "n2large0shirt" (Cyborg / no Cyborg icon)

Thanks to Mysteryem for cleaning up the icons and doing some modifications as well so they all m...

3defb7a8da1a5de2a87b6887a9519d261386080e authored over 14 years ago

Update the copy data script to work without svn.

269af78e688e6524f39a85d78dc557a24348dc15 authored over 14 years ago

piematrix: fix rotation math

In 697a97ff18667db61fb65ec792cf87ef1127cb3c, my interpretation of the
performed matrix math was ...

704b32b9bacaeed7854c9f4aa9be38424a1d2324 authored over 14 years ago

Update the ignores.

15db57f4059d4de08b40bf987200b7b69770660b authored over 14 years ago

piematrix: get rid of FP12 bitshifting

Use multiplication and division instead of bitshifting as its
conceptually easier to understand ...

ab9711d87782f242bd2eabf10d45be91b3dec6ec authored over 14 years ago

Fix wrong ordering of matrix cells

Wrong ordering reported by cybershpinx

Signed-off-by: Giel van Schijndel <[email protected]>

660f202a9c8283f0951bafc73f525d5d02727824 authored over 14 years ago

piematrix: document the used math

Add descriptions of the used matrix math and the internal representation
of matrices.

Signed-of...

697a97ff18667db61fb65ec792cf87ef1127cb3c authored over 14 years ago

Replace [xy]pshift with the single constant it ever contains

The variables [xy]pshift only ever contain the constant value `10`, so
instead of bothering to k...

c95f0f8be3a967dca7ef65f557fbc5db1419dc72 authored over 14 years ago

Test commit

41338ab0d6ac993f8251d8347731cb15680d6596 authored over 14 years ago

Debianize the two ticket-related Trac plugins

Turn the ticketnotifications and ticketvalidemail Trac plugins into
Debian packages, allowing fo...

9d973acc200a80419084922e98de8726ff6461f4 authored over 14 years ago

Don't assert on AI giving queued orders after debug-switching players.

b080fb644e157f196786b5feed06770f87b05da8 authored over 14 years ago

Make sure the licence is in the bundle.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11743 4a71c877-e1c...

f146148be9b42b6925bb7ae5cd3e7205899683c0 authored over 14 years ago

Update libpng to 1.4.4 and use better cleaning for updated libs.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11737 4a71c877-e1c...

c3e55dde07381490168acfaa05222242fe171419 authored over 14 years ago

Update the lt .strings file.

Refs #2199.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11728...

42f15a57edf5d7a02d29f69b432927ca4ac4aa05 authored over 14 years ago

Italian translation update by Alpha93.

Closes #2199.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@117...

ce3ce77882a0eef9f25fc5217834912d426a6da5 authored over 14 years ago

Bump the upload limit up for the buildbot.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11735 4a71c877-e1c...

83e21c6cf2e0da961581d51b66bb6bdd8f1fae3b authored over 14 years ago

Merge r11685 from trunk into the Qt branch: Add lib/framework/opengl.h to noinst_HEADERS

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11687 ...

9870192aa16a8552fc7bb035a5d1058c1973e1c7 authored over 14 years ago

Get rid of -Wno-type-limits because LLVM-GCC 4.2 does not like it.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11716 4a71c877-e1c...

69c518ebf945425e332c1d3b8a472393ea7074dc authored over 14 years ago

team-color mask shader: reduce required shader version to 1.10

Reduce the required shader version for the team-color mask shader to
GLSL 1.10. As a result we ...

0cbe0b2ccfe461ea84e7c13d2769eaa8f9dc8c1c authored over 14 years ago

Use sub dirs.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11717 4a71c877-e1c...

6c702b05a368a2f3c217a16406c99377e11a60c5 authored over 14 years ago

Switch to LLVM-GCC 4.2 because 10.5 does not have Clang.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11715 4a71c877-e1c...

b3b4f3a082f60f1f8e2a65f27531ddede6ef6333 authored over 14 years ago

It helps to clean the right configuration.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11706 4a71c877-e1c...

9cbabdd62a1cb1957d0f572406036b7da94b143d authored over 14 years ago

piematrix: prepare for removal of fixed point math

* Change some of the PIE matrix functions to accept floating point
values in the API.
* Ren...

a6cb949c970b6e5817b9ab0e44ccbb7a07279945 authored over 14 years ago

DrawText: Don't be overly pedantic in restoring the previous matrix-mode

Don't retrieve the current matrix mode prior to changing it, and restore
this mode after drawing...

dc8623a6ec49859e53adae45b95af93b66760411 authored over 14 years ago

piematrix: use floats instead of fixed point DEG degree values for rotations

Allow passing of degrees as floats to the pie_MatRot[XYZ] functions.

This commit further helps ...

3390509fe73f326ddacf0e83d4bd7c45a201ec87 authored over 14 years ago

Minor fixes to the buildbot scripts.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11701 4a71c877-e1c...

40882cc2c44429c7435548ada5f21162d15fe064 authored over 14 years ago

fixing the sound problem with - old 1.10 balance

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11704 4a71c877-e1c...

3aacc17431399202814de3385cecf41160b462d1 authored over 14 years ago

Remove empty function `trigShutDown`

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11709 4a71c877-e1c...

d01a61bdc1045de2913ccbd10c9afa824b9fc85c authored over 14 years ago

mapconv: Fix an small error in an error output.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11714 4a71c877-e1...

72464dfe24e2ca5e1a8d9a2ecd715f537240166d authored over 14 years ago

Add build bot scripts.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11696 4a71c877-e1c...

b21f92a65d0ac9ad9042bd1c619fbd9540eb08bd authored over 14 years ago

Don't #include GLee.h where it isn't required

At places where we only need the ''regular'' OpenGL API, not any
extensions, don't #include GLee...

0aa5d2cef8f09b26241a27007b650f7f8831815f authored over 14 years ago

Replace immediate-mode rendering with VA-based rendering

Almost completely (one corner case requires reading GL specs) replace
immediate-mode rendering w...

f363a02af714dfe79aebcb147dc499e4dd67aa19 authored over 14 years ago

Add lib/framework/opengl.h to noinst_HEADERS

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11685 4a71c877-e1c...

d0e24c96cf13433d88f02fb36cdd73cf41fbcfba authored over 14 years ago

Update the Make DMGs for Release script.

Randomness from http://whatthecommit.com/ :
things occurred

git-svn-id: https://warzone2100.sv...

6d55a3bd5cb2cf3229a1128ae9c7120aaa7efa70 authored over 14 years ago

opengl.h: get rid of the X11 macro `Status`

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11690 4a71c877-e1c...

27fb938877d01e7fa841bf2982e8fad768473255 authored over 14 years ago

Fix compile warning that complained about variable being potentially clobbered by longjmp.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11689 4a71c877-e1...

780f186dec894be4d1adb0be9097a52d130ff40d authored over 14 years ago

Add #version line to the tcmask vertex shader to avoid errors/warnings.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11688 4a71c877-e1...

d6baaff4778938e539aa7f028344a53b1cd28c43 authored over 14 years ago

obj2pie: Fix last obj face duplication bug.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11681 4a71c877-e1...

746ffaa83623bc525a0b6297e9491642d2d7e82d authored over 14 years ago

Add opengl.h and wzapp_c.h to the xcode project.

Randomness from http://whatthecommit.com/ :
whooooooooooooooooooooooooooo

git-svn-id: https://...

447bba3120a722973cba296a8876f93587d5fb9d authored over 14 years ago

Merge r11677:11678 from trunk into the Qt branch: add a platform-abstraction header: `opengl.h`

Add a header to allow platform-indepent inclusion of the OpenGL API,
removing our dependency on ...

a83560844c4823e4d0d25c2df4763d9d832099b3 authored over 14 years ago

prevent redefinition of __glext_h__

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11678 4a71c877-e1c...

09f6b4627694d50c02096162a349e1f37722253e authored over 14 years ago

Add a platform-abstraction header: `opengl.h`

Add a header to allow platform-indepent inclusion of the OpenGL API,
removing our dependency on ...

82ed96fd3b2973d71d38bcc074e69800f122c340 authored over 14 years ago

vertex shader: don't use deprecated ftransform()

Replace the usage of the depecrated ftransform() function with an
equivalent expression along wi...

cecef2e1e7f75f252e5496240487f7ff11a0c1a6 authored over 14 years ago

Korean translation update by urgood2.

Closes #2098.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@116...

2e0135626e0884e939fc49f0bd03a6980d7d08ee authored over 14 years ago

Use native EOL to store the shaders

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11670 4a71c877-e1c...

4cb7957bd0834e9109937cdab97df2f0f5591a38 authored over 14 years ago

Replace #ifdef(APPLE) #include <$path/gl.h> sections with <SDL_opengl.h> which handles this already

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11671 4a71c877-e1c...

8e000fa32528d5f0cb4231ef8cf7a78442e757ed authored over 14 years ago

Don't #include <GL/glu.h> where it's contents aren't used

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11669 4a71c877-e1c...

b14221a289d0866af7208df7857b4adafbdd86af authored over 14 years ago

.gitignore: ignore betawidget and libtool build products

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11667 4a71c877-e1c...

7284776c386c8b53eb2eadc68f6c9116dafada7f authored over 14 years ago

Don't keep VBOs bound when they're not used anymore, this allows use of VAs at other locations

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11666 4a71c877-e1c...

220d310140335132b3f9a2cd9fe541f2465b4070 authored over 14 years ago

Brazilian translation update by Tucalipe.

Closes #2163.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@116...

13a1754953187504fdb685d5665502ef32a8de97 authored over 14 years ago

Polish translation update by Emdek.

Closes #1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@116...

9147f9b5f3db17185a7e4882de2a5beddd784551 authored over 14 years ago

Fix bug #2147, fix bug #2158, remove VTOL Flak Cannon (doesn't make sense lore-wise, and did too much friendly fire to be useful).

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11649 4a71c877-e1c...

d95995d6828fef506c154a633b8c09fa9f6efdce authored over 14 years ago

Print the needed port when lobby communication fails.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11639 4a71c877-e1c...

7ab97781ae6934ec3c7f1d124648af625948e6df authored over 14 years ago

Fix debug output on the console.

Check if there's a \n at the end, if not, append one. Before, it checked for a
\n anywhere in th...

fadd32b1e64db220dbcaf5dd8819b493d88112ed authored over 14 years ago

Update translations.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11637 4a71c877-e1c...

8c79885bc74ce6f51ce62e63a015715241e6a37d authored over 14 years ago

Rebalance 0.8.3:

- Weaken Flak Cannon and Sunburst a lot more. I'm pretty sure this change makes them too weak, bu...

3f97c795c02d3a4bcd38ed8bfd1426758a10e281 authored over 14 years ago

Display no-tank, no-cyborg or no-VTOL icons if the relevant factories are disabled.

Using random icons for now, until the right icons are drawn.

d30e97f54e1a06d150bb6561ad4d674e00713346 authored over 14 years ago

Ecosyste.ms: OpenCollective

github.com/Warzone2100/archived-3.1-branch