This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Warzone 2100 Project.".
The branch, pre-3.0 has been created
at 80d4c4c25b65ae58116abcc03580138e424a7a3d (commit)
- Log -----------------------------------------------------------------
commit 80d4c4c25b65ae58116abcc03580138e424a7a3d
Merge: 6e5e1638e8e3222fd7bda34fc749258d1be272f0
7a8fb0844e90fc3834a3614851482767606a64c2
Author: buginator <[email protected]>
Date: Thu Oct 7 14:34:32 2010 -0400
Merge branch '2.3' of git://gitorious.org/warzone2100/mainline into pre-3.0
* '2.3' of git://gitorious.org/warzone2100/mainline:
Make autorevision.cpp print Git commit SHA1s.
commit 6e5e1638e8e3222fd7bda34fc749258d1be272f0
Author: buginator <[email protected]>
Date: Wed Oct 6 00:53:47 2010 -0400
Gerard's texture license stuff...
and finally, the terrain textures (from trunk, NOT the initial commit!)
commit 357aa0b6ce4d0fad6d9ef7753f698e40d592ba44
Author: buginator <[email protected]>
Date: Wed Oct 6 00:53:23 2010 -0400
Copy over (changed) tertiles from trunk..err master.
commit 2bab0b57a91ad4d83c5e8c2731e1a3c9ae2c8a92
Author: buginator <[email protected]>
Date: Tue Oct 5 23:13:30 2010 -0400
Apply textures from ticket #1757
TCmask textures ticket:1757
TC mask textures done by Berg
commit 8e3bb05fe807fb10e851c370498e7751c6e5d54c
Author: buginator <[email protected]>
Date: Sat Oct 2 13:54:17 2010 -0400
Apply TCmask to command relay center
commit af45b8dbe9d03b0a70d90e3dba39301614b806a6
Author: buginator <[email protected]>
Date: Sat Oct 2 13:53:58 2010 -0400
Apply TCmask to factory
commit 5217d81a458b94d52990d1efbacc39a7c2aa572b
Author: buginator <[email protected]>
Date: Sat Oct 2 13:53:34 2010 -0400
Apply TCmask to HQ
commit b91f08c5977c910fca985eb2d04106827395df7a
Author: buginator <[email protected]>
Date: Sat Oct 2 13:53:22 2010 -0400
Apply TCmask to research center
commit 2c28ce2fa355de9495fa2580c97239d25582c5d4
Author: buginator <[email protected]>
Date: Sat Oct 2 13:54:41 2010 -0400
Add palette.txt and fix makefile for new additions.
commit f6d0871b424df49a339bdd1c652095b3cffca693
Author: buginator <[email protected]>
Date: Wed Oct 6 16:28:21 2010 -0400
Fix construction beams
commit aa8bf289b8f4fad5d6122a43432521dbf2e2cc92
Author: buginator <[email protected]>
Date: Wed Oct 6 12:48:52 2010 -0400
If resource was not loaded, then don't continue on, error out.
commit fb4a9e2797252b438a1b2fbfe14f71aa2a641b9b
Author: buginator <[email protected]>
Date: Wed Oct 6 12:59:46 2010 -0400
Fix wrf files to make it more clear what is going on.
Frontend.wrf is *NOT* the main texture loader for MP games, we are
using limiter_tex.wrf for that, which is hardcoded in the sourcecode.
(This is same behavior as trunk)
commit 0d01c4d81e6605ad50687f5d33f0a53332f78003
Author: buginator <[email protected]>
Date: Sat Oct 2 13:53:02 2010 -0400
Externalise all map tileset settings.
commit 5b56edc6fd0fcf8be5b313d77757c61f937cf44e
Author: buginator <[email protected]>
Date: Sat Oct 2 13:52:47 2010 -0400
Externalise all map tileset settings.
(data files)
commit efc9aac099a67883e6cd36490c26b084c3bfe56a
Author: buginator <[email protected]>
Date: Sat Oct 2 13:51:28 2010 -0400
When rendering structures, always pass player colour to model rendering
code.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9622
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/display3d.c
commit 29107a96d78b9b2ee1d24ee926f827b8b6467ea5
Author: buginator <[email protected]>
Date: Sat Oct 2 13:49:51 2010 -0400
Fix SP color picking so it correctly uses the user's saved preferences
commit ff72fca524203718f9819c606ad26d57a69812c0
Author: buginator <[email protected]>
Date: Sat Oct 2 13:48:26 2010 -0400
Null out pointer when free'ed
commit 82a93bb9cf8cf58ef2097aa43f75a620d1e8e309
Author: buginator <[email protected]>
Date: Thu Sep 30 17:38:00 2010 -0400
Apply TCmask pies from ticket:1757
Textures & wrf changes will be in next commit
commit 6f0768d50b5e6c06e097d43699a0d32aa176a29c
Author: buginator <[email protected]>
Date: Thu Sep 30 17:32:19 2010 -0400
revert r9847 to make it the same as trunk again
commit 36ef6a394b7658c6d592c09e6e773af53f0a6900
Author: buginator <[email protected]>
Date: Thu Sep 30 17:30:26 2010 -0400
Remove useless files
commit 86cd2249e16019f03732160e3c6f8b33c0f8877e
Author: buginator <[email protected]>
Date: Tue Sep 28 17:53:08 2010 -0400
Fix the single player color saving / loading.
commit c357bc73f6fb760d972fe08ce24af8dde695ff21
Author: buginator <[email protected]>
Date: Mon Sep 27 18:06:47 2010 -0400
just format fix
commit 55fcf247f241161d73b416664d41738388627c35
Author: i-nod <[email protected]>
Date: Sat Apr 10 14:59:16 2010 +0000
Correctly propagate TCMask settings through PIE levels, so it will works
for animated objects too.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@10530
4a71c877-e1ca-e34f-864e-861f7616d084
commit c6ca100be053b6b27e408bfeaf335f5738bbaee9
Author: buginator <[email protected]>
Date: Sat Sep 25 14:10:07 2010 -0400
Fixed terrain drawing code that was making the iVis state invalid.
- Added multiplicative blending mode.
- Reverted r9629.
Reviewed by i-NoD.
Closes #1692.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@10381
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
lib/ivis_opengl/piematrix.c
src/display3d.c
commit 21217f6091e10129a31aa94e5aceac68d956acf7
Author: buginator <[email protected]>
Date: Fri Sep 24 21:14:10 2010 -0400
Make sure decals & "explored" bits are not the same.
commit 632a576575cda424de4dd1b37af8ccbe4cd67b35
Author: buginator <[email protected]>
Date: Fri Sep 24 19:24:36 2010 -0400
Fix texture disapparance act in hudless mode. Patch by Safety0ff. Closes
ticket:1421
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9629
4a71c877-e1ca-e34f-864e-861f7616d084
--------
Mitigate bug #1421 - Brings it back to before-r9272 conditions using
some black magic I really don't understand. Anyone who knows what's going on is
welcome to go and fix things.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9310
4a71c877-e1ca-e34f-864e-861f7616d084
---------
Make the Tab "hide interface" keyboard shortcut hide the entire
interface.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9272
4a71c877-e1ca-e34f-864e-861f7616d084
---------
commit ca4329fc638200687d56d33a543fa03f3bbd4464
Author: buginator <[email protected]>
Date: Fri Sep 24 19:22:56 2010 -0400
Remove 256 scale value from texture matrix. Closes #1678.
PIE3 format will expect 0.0-1.0 floating points in texture coordinates
values.
PIE2 and IMG(GUI textures) formats still using 8-bit integers in
texture coordinates values.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@10297
4a71c877-e1ca-e34f-864e-861f7616d084
[Matrix is now 0..1 (like trunk)]
commit 1093bf0b836cdd73cb7d4a982ebfc95ea657d355
Author: i-nod <[email protected]>
Date: Tue Mar 9 22:32:40 2010 +0000
Fix warnings on MacOS builds that were caused by [10210].
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@10211
4a71c877-e1ca-e34f-864e-861f7616d084
commit bb557a0fcdf9470895211dd95c8d272b01de2532
Author: i-nod <[email protected]>
Date: Tue Mar 9 22:07:32 2010 +0000
Enable or disable fog in TCMask shader depending on in-game state. Part of
#851. Reviewed by Per.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@10210
4a71c877-e1ca-e34f-864e-861f7616d084
commit c4b01e61d28f83396e39e56821288923bf2e44e6
Author: buginator <[email protected]>
Date: Fri Sep 24 00:55:45 2010 -0400
iViS engine tweaks. Closes #1667.
- Replace glBlend calls with iVis blending wrapper.
- Remove pie_NO_BILINEAR flag and replace it with pie_FORCE_FOG flag.
- Enable fogging for structure baseplate with pie_FORCE_FOG.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@10209
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/display3d.c
commit a4ad726ad9f3355c1ff743c5fc8f546e20ea0a5f
Author: buginator <[email protected]>
Date: Fri Sep 24 00:44:19 2010 -0400
TCMask feature: shaders infrastructure and TCMask shader, FF fallback is
supported for TCMask. Part of #851.
**NOTE screen.c is more like trunk's for the GLEE queries
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@10179
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
lib/ivis_opengl/piedraw.c
lib/ivis_opengl/piestate.c
lib/ivis_opengl/screen.c
commit 098e7d76f92cc3018d53786219df904bdbd2ab5a
Author: buginator <[email protected]>
Date: Fri Sep 24 00:13:16 2010 -0400
Do not draw repair and baba muzzle flashes if structure is not seen by
current player.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@8868
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/display3d.c
commit 0e306226e6ddc113009af73071672d0d6e550545
Author: buginator <[email protected]>
Date: Thu Sep 23 23:36:54 2010 -0400
Skip range effects creation if they are off-map (see #1105).
Removed unused variable from the old terrain code.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@8514
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/display3d.c
commit ab80388a518d977135f7918ab721b29689085faa
Author: buginator <[email protected]>
Date: Thu Sep 23 23:21:17 2010 -0400
Draw the skybox after the terrain but before the transparent objects. This
fixes the black smoke that could be seen against the sky.
From: Gerard Krol <[email protected]>
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@7631
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/display3d.c
commit 0b91f3774b6402803b20291a022c88769bf9fc36
Author: Gerard Krol <[email protected]>
Date: Tue Apr 7 10:20:29 2009 +0000
Allow structure baseplates to have transparency.
From: Gerard Krol <[email protected]>
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@6970
4a71c877-e1ca-e34f-864e-861f7616d084
commit 36b5518054b082a5ed06dc088be1ac018a76bb09
Author: Per Inge Mathisen <[email protected]>
Date: Mon May 4 20:05:09 2009 +0000
Fix valgrind warning about an uninitialized variable in display3d.c
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@7321
4a71c877-e1ca-e34f-864e-861f7616d084
commit 8450ce60c4604d1860ccde857b964e001a61a2d6
Author: Per Inge Mathisen <[email protected]>
Date: Mon Sep 28 18:19:55 2009 +0000
Clean up renderStructure() a bit to remove unused or duplicate code. Use
OpenGL matrix commands to
avoid a lot of manual copying and transformation in pie_Draw3DShape2(), and
make the function more
readable. Patch reviewed by gerard_
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@8189
4a71c877-e1ca-e34f-864e-861f7616d084
commit b7e007de3f8dd210104dcd5b020321f296a4a295
Author: Per Inge Mathisen <[email protected]>
Date: Thu Feb 4 09:06:14 2010 +0000
Add rendering support for the TRANS_FILTER transparency mode.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9621
4a71c877-e1ca-e34f-864e-861f7616d084
commit 73d26aec66629ad9ee5a89fc5caf37341afd0062
Author: Per Inge Mathisen <[email protected]>
Date: Thu Feb 4 09:02:16 2010 +0000
Clean up the definitions of the rendering modes.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9620
4a71c877-e1ca-e34f-864e-861f7616d084
commit 207e60f4ba155bcc10849f3479492f10984b377d
Author: buginator <[email protected]>
Date: Thu Sep 23 21:18:06 2010 -0400
Remove unused dead terrain code. From ticket:1616 by i-NoD.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9886
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/init.c
commit 87cccbcf792b31b408eb2ffe0b9ae96dc5539ece
Author: buginator <[email protected]>
Date: Thu Sep 23 20:57:37 2010 -0400
TCMask support infrastructure: mask loading and colour retrieval routines.
Part of #851.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@10178
4a71c877-e1ca-e34f-864e-861f7616d084
++++Parts of r7283 as well...
Conflicts:
data/base/palette.txt
lib/ivis_common/imdload.c
lib/ivis_common/piepalette.h
commit cab7a06b5d42eb2c22dc491a164af72967b4b6a7
Author: Per Inge Mathisen <[email protected]>
Date: Mon Sep 28 19:53:10 2009 +0000
Remove unused code and correct PIE documentation. Number of texture
animations and playback rates do not
and cannot vary between polygons, despite what parts of the code wants you
to believe. This is good.
Patch reviewed by gerard_.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@8190
4a71c877-e1ca-e34f-864e-861f7616d084
commit 6401f241cd6e287b8b956851088d8deb588aa843
Author: Per Inge Mathisen <[email protected]>
Date: Fri Mar 20 17:02:49 2009 +0000
Improve error message on failed PIE texture flag load
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6879
4a71c877-e1ca-e34f-864e-861f7616d084
commit 0f83bce326c864de8766263e50c7bcba323df251
Author: Per Inge Mathisen <[email protected]>
Date: Sat Feb 13 18:50:15 2010 +0000
Remove duplicate points removal in PIE loader. Closes ticket:1582 Reviewed
by Safety0ff
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9793
4a71c877-e1ca-e34f-864e-861f7616d084
commit a84bd1a932bacdbcaaecb2288a870da14595b006
Author: buginator <[email protected]>
Date: Thu Sep 23 18:59:21 2010 -0400
2 cloaked commits in one, since I can't figure out how to make git
overwrite files
on cherry picks, and I wasn't going to sit around manually doing this for
324 files. :P
Revert trunk .pies back to PIE2 format.
This will allow PieSlicer to open them again without manual preparations
and free PIE3 format for floating point extension.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@10296
4a71c877-e1ca-e34f-864e-861f7616d084
++++++++++
Remove 5878 duplicate points in PIE files. See ticket:1582 Reviewed by
Safety0ff.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9792
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
data/base/components/bodies/cybd_run.pie
data/base/components/bodies/cybd_std.pie
data/base/components/bodies/cybdpair.pie
data/base/components/bodies/cybdpjmp.pie
data/base/components/bodies/cybdplnd.pie
data/base/components/bodies/cybdprun.pie
data/base/components/bodies/cybdpstd.pie
data/base/components/bodies/drhbod09.pie
data/base/components/bodies/drhbod10.pie
data/base/components/bodies/drhbod11.pie
data/base/components/bodies/drhbod12.pie
data/base/components/bodies/drlbod01.pie
data/base/components/bodies/drlbod02.pie
data/base/components/bodies/drlbod04.pie
data/base/components/bodies/drmbod05.pie
data/base/components/bodies/drmbod06.pie
data/base/components/bodies/drmbod07.pie
data/base/components/bodies/drmbod08.pie
data/base/components/bodies/drtrans.pie
data/base/components/bodies/exfire.pie
data/base/components/bodies/exjeep.pie
data/base/components/bodies/exjeeprk.pie
data/base/components/bodies/exschool.pie
data/base/components/bodies/extrike.pie
data/base/components/bodies/flamfall.pie
data/base/components/bodies/mibnkbod.pie
data/base/components/bodies/runflame.pie
data/base/components/prop/mibnkdrl.pie
data/base/components/prop/mibnkdrr.pie
data/base/components/prop/prhltrk3.pie
data/base/components/prop/prhlvtl1.pie
data/base/components/prop/prhlvtl2.pie
data/base/components/prop/prhlvtl3.pie
data/base/components/prop/prhlvtl4.pie
data/base/components/prop/prhrtrk3.pie
data/base/components/prop/prhrvtl1.pie
data/base/components/prop/prhrvtl2.pie
data/base/components/prop/prhrvtl3.pie
data/base/components/prop/prhrvtl4.pie
data/base/components/prop/prlhov1.pie
data/base/components/prop/prllhtr1.pie
data/base/components/prop/prlltrk1.pie
data/base/components/prop/prllvtl1.pie
data/base/components/prop/prllvtl2.pie
data/base/components/prop/prllvtl3.pie
data/base/components/prop/prlrhtr1.pie
data/base/components/prop/prlrtrk1.pie
data/base/components/prop/prlrvtl1.pie
data/base/components/prop/prlrvtl2.pie
data/base/components/prop/prlrvtl3.pie
data/base/components/prop/prmhov1.pie
data/base/components/prop/prmlhtr2.pie
data/base/components/prop/prmltrk2.pie
data/base/components/prop/prmlvtl1.pie
data/base/components/prop/prmrhtr2.pie
data/base/components/prop/prmrtrk2.pie
data/base/components/prop/prmrvtl1.pie
data/base/components/weapons/cy_can.pie
data/base/components/weapons/cy_flame.pie
data/base/components/weapons/cy_las.pie
data/base/components/weapons/cy_miss.pie
data/base/components/weapons/cy_rail.pie
data/base/components/weapons/cy_rkt.pie
data/base/components/weapons/exturret.pie
data/base/components/weapons/gnhair.pie
data/base/components/weapons/gnhair2.pie
data/base/components/weapons/gnhblas.pie
data/base/components/weapons/gnhgss.pie
data/base/components/weapons/gnhhowt.pie
data/base/components/weapons/gnhhowt2.pie
data/base/components/weapons/gnhmort.pie
data/base/components/weapons/gnhmort2.pie
data/base/components/weapons/gnhmsl.pie
data/base/components/weapons/gnhmslab.pie
data/base/components/weapons/gnhmslsa.pie
data/base/components/weapons/gnhplasm.pie
data/base/components/weapons/gnhrckt.pie
data/base/components/weapons/gnhsuper.pie
data/base/components/weapons/gnhvcan.pie
data/base/components/weapons/gnlacan.pie
data/base/components/weapons/gnlair.pie
data/base/components/weapons/gnlcan.pie
data/base/components/weapons/gnlflmr.pie
data/base/components/weapons/gnlmg1.pie
data/base/components/weapons/gnlmg2.pie
data/base/components/weapons/gnlmsl.pie
data/base/components/weapons/gnlrckt.pie
data/base/components/weapons/gnlrcktp.pie
data/base/components/weapons/gnmacan.pie
data/base/components/weapons/gnmair.pie
data/base/components/weapons/gnmflmr.pie
data/base/components/weapons/gnmhowt.pie
data/base/components/weapons/gnmlas.pie
data/base/components/weapons/gnmmg1.pie
data/base/components/weapons/gnmmg2.pie
data/base/components/weapons/gnmmort.pie
data/base/components/weapons/gnmmsl.pie
data/base/components/weapons/gnmmsla.pie
data/base/components/weapons/gnmmslat.pie
data/base/components/weapons/gnmmslbb.pie
data/base/components/weapons/gnmmslsa.pie
data/base/components/weapons/gnmrckt.pie
data/base/components/weapons/gnmrckta.pie
data/base/components/weapons/gnmrcktb.pie
data/base/components/weapons/gnmrepar.pie
data/base/components/weapons/gnmrktbb.pie
data/base/components/weapons/gnmrlas.pie
data/base/components/weapons/gnmsnsr2.pie
data/base/components/weapons/gnmvcan.pie
data/base/components/weapons/mibnkgun.pie
data/base/components/weapons/mibnktur.pie
data/base/components/weapons/misensor.pie
data/base/components/weapons/projectiles/fxtracer.pie
data/base/components/weapons/trhair.pie
data/base/components/weapons/trhcan.pie
data/base/components/weapons/trhcon.pie
data/base/components/weapons/trhgss.pie
data/base/components/weapons/trhhow2.pie
data/base/components/weapons/trhhowt.pie
data/base/components/weapons/trhlas.pie
data/base/components/weapons/trhmsl.pie
data/base/components/weapons/trhmslab.pie
data/base/components/weapons/trhmsli.pie
data/base/components/weapons/trhplasm.pie
data/base/components/weapons/trhrckt.pie
data/base/components/weapons/trhsnsr3.pie
data/base/components/weapons/trhsuper.pie
data/base/components/weapons/trlcan.pie
data/base/components/weapons/trlcmd1.pie
data/base/components/weapons/trlcon.pie
data/base/components/weapons/trlflmr.pie
data/base/components/weapons/trlgss.pie
data/base/components/weapons/trlmg1.pie
data/base/components/weapons/trlmg2.pie
data/base/components/weapons/trlmsl.pie
data/base/components/weapons/trlrckt.pie
data/base/components/weapons/trlrcktp.pie
data/base/components/weapons/trlsnsr1.pie
data/base/components/weapons/trlvtlin.pie
data/base/components/weapons/trmair.pie
data/base/components/weapons/trmcan.pie
data/base/components/weapons/trmflmr.pie
data/base/components/weapons/trmgss.pie
data/base/components/weapons/trmhowt.pie
data/base/components/weapons/trmlas.pie
data/base/components/weapons/trmmg.pie
data/base/components/weapons/trmmsl.pie
data/base/components/weapons/trmmsla.pie
data/base/components/weapons/trmmslat.pie
data/base/components/weapons/trmmslbb.pie
data/base/components/weapons/trmrckt.pie
data/base/components/weapons/trmrckta.pie
data/base/components/weapons/trmrktbb.pie
data/base/components/weapons/trmsnsr2.pie
data/base/components/weapons/trmvtlin.pie
data/base/effects/cybitlg1.pie
data/base/effects/cybitrkt.pie
data/base/effects/fxdirt.pie
data/base/effects/fxhblas.pie
data/base/effects/fxmflmr.pie
data/base/effects/fxtracer.pie
data/base/effects/fxtracrd.pie
data/base/effects/midebr1.pie
data/base/effects/partarm.pie
data/base/effects/parthead.pie
data/base/features/blfactrd.pie
data/base/features/drwreck.pie
data/base/features/miairtrf.pie
data/base/features/miarthov.pie
data/base/features/mibldwa2.pie
data/base/features/mibldwa3.pie
data/base/features/mibldwat.pie
data/base/features/miblucar.pie
data/base/features/mibould1.pie
data/base/features/mibould2.pie
data/base/features/mibould3.pie
data/base/features/mibrdfuk.pie
data/base/features/mibuild1.pie
data/base/features/mibuild7.pie
data/base/features/mibuild8.pie
data/base/features/mibuild9.pie
data/base/features/micabin1.pie
data/base/features/micabin2.pie
data/base/features/micabin3.pie
data/base/features/micabin4.pie
data/base/features/micabin5.pie
data/base/features/micapsul.pie
data/base/features/michevy.pie
data/base/features/micrane.pie
data/base/features/mifactry.pie
data/base/features/mijeep.pie
data/base/features/mioil.pie
data/base/features/mioiltow.pie
data/base/features/mipickup.pie
data/base/features/mipipe.pie
data/base/features/mipipe1.pie
data/base/features/mitanker.pie
data/base/features/mitankerh.pie
data/base/misc/arrow.pie
data/base/misc/iccamera.pie
data/base/misc/researchimds/dpvtol.pie
data/base/misc/researchimds/iccccons.pie
data/base/structs/blaamnt1.pie
data/base/structs/blaamnt2.pie
data/base/structs/bladvlab.pie
data/base/structs/blaerolb.pie
data/base/structs/blbrbbnk.pie
data/base/structs/blbrbcr1.pie
data/base/structs/blbrbfac.pie
data/base/structs/blbrbtw1.pie
data/base/structs/blbrbtw2.pie
data/base/structs/blbrbwlh.pie
data/base/structs/blbrlook.pie
data/base/structs/blbrmrtp.pie
data/base/structs/blbrtowf.pie
data/base/structs/blbunkms.pie
data/base/structs/blcanpil.pie
data/base/structs/bldrdcm0.pie
data/base/structs/blfact0.pie
data/base/structs/blfact1.pie
data/base/structs/blfact2.pie
data/base/structs/blgaurdn.pie
data/base/structs/blgrdnex.pie
data/base/structs/blguard3.pie
data/base/structs/blguardm.pie
data/base/structs/blgyrlab.pie
data/base/structs/blhardpt.pie
data/base/structs/blhevlab.pie
data/base/structs/blindlab.pie
data/base/structs/bllaslab.pie
data/base/structs/blmrtpit.pie
data/base/structs/blnanlab.pie
data/base/structs/blnavbak.pie
data/base/structs/blpilbox.pie
data/base/structs/blrotlab.pie
data/base/structs/blrpair1.pie
data/base/structs/blrpair2.pie
data/base/structs/blrpair3.pie
data/base/structs/blvtolpd.pie
data/base/structs/blwall2.pie
data/base/structs/blwall3.pie
data/base/structs/blwallc1.pie
data/base/structs/blwallc3.pie
data/base/structs/blwallh.pie
data/base/structs/exrocket.pie
data/base/structs/icdozer.pie
data/base/structs/micool.pie
data/base/structs/minuke.pie
data/base/structs/mitrapst.pie
data/base/structs/miupbase.pie
data/base/structs/miupdish.pie
data/base/structs/miuptrim.pie
data/mods/multiplay/ntw/components/bodies/cybd_stdi.pie
data/mods/multiplay/ntw/components/bodies/exfire.pie
data/mods/multiplay/ntw/components/bodies/exjeep.pie
data/mods/multiplay/ntw/components/bodies/exschool.pie
data/mods/multiplay/ntw/components/bodies/extrike.pie
data/mods/multiplay/ntw/components/weapons/cy_miss2.pie
data/mods/multiplay/ntw/components/weapons/cy_snipe.pie
data/mods/multiplay/ntw/components/weapons/gnhsuper.pie
data/mods/multiplay/ntw/components/weapons/gnmrckta.pie
data/mods/multiplay/ntw/components/weapons/gnmrcktb.pie
data/mods/multiplay/ntw/structs/adv-bunker.pie
data/mods/multiplay/ntw/structs/blfact2.pie
data/mods/multiplay/ntw/structs/blpower4.pie
data/mods/multiplay/ntw/structs/blresch4.pie
data/mods/multiplay/ntw/structs/gateh.pie
data/mods/multiplay/ntw/structs/gatev.pie
data/mods/multiplay/ntw/structs/micool.pie
data/mods/multiplay/ntw/structs/scav-res.pie
data/mods/multiplay/ntw/structs/shield.pie
data/mods/multiplay/ntw/structs/tank-traps.pie
data/mp/components/bodies/drcytran.pie
data/mp/components/bodies/drhbod14.pie
data/mp/components/bodies/drmbod13.pie
data/mp/components/prop/prshov1.pie
data/mp/components/prop/prslhtr4.pie
data/mp/components/prop/prsltrk4.pie
data/mp/components/prop/prslvtl1.pie
data/mp/components/prop/prsrhtr4.pie
data/mp/components/prop/prsrtrk4.pie
data/mp/components/prop/prsrvtl1.pie
data/mp/components/weapons/cy_gren.pie
data/mp/components/weapons/cy_rep.pie
data/mp/components/weapons/cy_therm.pie
data/mp/components/weapons/gnhaalas.pie
data/mp/components/weapons/gnhemp.pie
data/mp/components/weapons/gnhlas.pie
data/mp/components/weapons/gnhmg1.pie
data/mp/components/weapons/gnhmorte.pie
data/mp/components/weapons/gnhplsma.pie
data/mp/components/weapons/gnhsnsr4.pie
data/mp/components/weapons/gnhvcan2.pie
data/mp/components/weapons/gnmflmrp.pie
data/mp/components/weapons/gnmhowti.pie
data/mp/components/weapons/gnmmorti.pie
data/mp/components/weapons/gnmrepr2.pie
data/mp/components/weapons/gnwpfcan.pie
data/mp/components/weapons/gnwpfgss.pie
data/mp/components/weapons/gnwpfmsl.pie
data/mp/components/weapons/gnwpfrkt.pie
data/mp/components/weapons/sc_asscn.pie
data/mp/components/weapons/sc_atm.pie
data/mp/components/weapons/sc_can.pie
data/mp/components/weapons/sc_hpvcn.pie
data/mp/components/weapons/sc_pulse.pie
data/mp/components/weapons/sc_rail2.pie
data/mp/components/weapons/sc_tk.pie
data/mp/components/weapons/scbody.pie
data/mp/components/weapons/trhemp.pie
data/mp/components/weapons/trhmg.pie
data/mp/components/weapons/trhvcan2.pie
data/mp/components/weapons/trlassat.pie
data/mp/components/weapons/trlvtlpl.pie
data/mp/components/weapons/trmvtlpl.pie
data/mp/components/weapons/trwpfcan.pie
data/mp/components/weapons/trwpfgss.pie
data/mp/components/weapons/trwpfmsl.pie
data/mp/components/weapons/trwpfrkt.pie
data/mp/effects/fxlbmbp1.pie
data/mp/effects/fxlbmbp2.pie
data/mp/structs/stwpfcan.pie
data/mp/structs/trmflmrp.pie
commit c48339c00c85fdfe47ab98c9dc22c628cabf64c2
Author: buginator <[email protected]>
Date: Thu Sep 23 17:56:57 2010 -0400
adding palette.txt from trunk so I don't have to hunt for WZCOL_MAX
commit a4a0aac0289224e0524394727e45f01f1c967d10
Author: Per Inge Mathisen <[email protected]>
Date: Sat Nov 21 10:18:30 2009 +0000
Put all palette info into an external file that can be modified by modders.
It is quite sensitive
to changes in the number of lines. The colours are in the (from CSS)
familiar R,G,B,A hex format.
Closes ticket:1062
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@8435
4a71c877-e1ca-e34f-864e-861f7616d084
commit a42b02b189e94086070593b5515b64a38e9cf636
Author: buginator <[email protected]>
Date: Thu Sep 23 17:03:04 2010 -0400
linux users: #define MESA_BUG if you are using radeon + mesa otherwise,
don't worry about it.
commit 670226ade6a40c5eac618b14638971345a779a46
Author: Git SVN Gateway <[email protected]>
Date: Wed Feb 17 20:47:26 2010 +0000
Workaround for texture corruption bug on Ati Mobility Radeon HD 2400 (R610)
open source radeon + mesa drivers.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9845
4a71c877-e1ca-e34f-864e-861f7616d084
commit 4b510462647a001583c572970920f243acb71dbc
Author: buginator <[email protected]>
Date: Thu Sep 23 16:29:17 2010 -0400
Remove duplicate tile height and make it now use the float version. Patch
reviewed by gerard_
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9619
4a71c877-e1ca-e34f-864e-861f7616d084
++Fix accidental merge clobber from r6682
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6682
Conflicts:
src/map.h
commit 99a0874800b70fe216f5ae335cca5c298dc20e19
Author: buginator <[email protected]>
Date: Thu Sep 23 16:09:33 2010 -0400
Clean up MAPTILE definition, and slash 56 bits off each tile to save memory.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9618
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/map.h
commit 270e8374a328fa4ba07c516e3baf2808b4579af2
Author: buginator <[email protected]>
Date: Thu Sep 23 15:59:54 2010 -0400
46 warnings from Xcode on the wall, 46 warnings from Xcode... take several
down, make a few variables signed and cast some other "%d"s to (int), 6
warnings from Xcode on the wall!
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9493
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
lib/ivis_opengl/screen.c
src/pointtree.cpp
commit 5f5c755938d43ef13db0507f7ad31703b09b0dec
Author: Guangcong Luo <[email protected]>
Date: Sun Jan 24 22:44:22 2010 +0000
150 warnings from Warzone in Xcode, 150 warnings in Xcode... Take several
down, cast a whole bunch of things passed as "%i" to (int), 46 warnings from
Warzone in Xcode!
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9488
4a71c877-e1ca-e34f-864e-861f7616d084
commit 8054b1bfbda70a665e73efa900ba686bd523faa4
Author: buginator <[email protected]>
Date: Thu Sep 23 15:51:22 2010 -0400
Remove unnecessary SDL includes.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@7237
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
lib/framework/types.h
commit 59f8be861aebefb68eb2231e1d2c38e162f402a9
Author: buginator <[email protected]>
Date: Thu Sep 23 15:54:33 2010 -0400
Change texture size to be a minimum of 128, instead of 32 or 64 (which
makes everything look hideous!), and also cap the decals to 128, independent of
what the user has picked in the options menu, until we get higher res textures
to match all the settings.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@7755
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/terrain.c
commit a2bb8e6c33a970cc9f58328d2863d1f7f8b0782b
Author: buginator <[email protected]>
Date: Thu Sep 23 01:22:07 2010 -0400
Temporary fix for the seam issue, if user has specified a texture
resolution above what the max tile texture size is. Currently that is 128x128.
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@7723
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/terrain.c
commit 10f677e458a7bf349d031443b8dda0b6164df939
Author: buginator <[email protected]>
Date: Thu Sep 23 01:20:41 2010 -0400
Fix the blasted seam issue once and for all.
(For trunk, it is mainly for the decals, since we don't handle terrain the
same way. For 2.2, it is terrain & decals--basically everything in the tileset)
Fixes ticket:496
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@7717
4a71c877-e1ca-e34f-864e-861f7616d084
commit eff71f6d128955737f1b8e73e983e7dae8e65e74
Author: buginator <[email protected]>
Date: Thu Sep 23 01:15:37 2010 -0400
Give a detailed error message when glDrawRangeElements is not supported and
shut down. This fixes #294.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6833
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/display3d.c
commit 0809f73fbe0b83bb944b7238151e7bc8a35b8bda
Author: buginator <[email protected]>
Date: Thu Sep 23 01:06:26 2010 -0400
Scale down textures used for 3D when they exceed the size specified with
the textureSize option. Also add two assert statements to check for the correct
handling of the parameters for glDrawRangeElements.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6720
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
lib/ivis_opengl/tex.c
src/frontend.c
commit 4a62b27c85edde5344b17671df99fb3e57558053
Author: Gerard Krol <[email protected]>
Date: Sat Apr 18 13:37:57 2009 +0000
Add comments for the terrain renderer and remove a small piece of
depreciated code for tile highlighting.
From: Gerard Krol <[email protected]>
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@7064
4a71c877-e1ca-e34f-864e-861f7616d084
commit 8d7dcc69875417cccf732731b2dd6c3f48b35a96
Author: Per Inge Mathisen <[email protected]>
Date: Thu Mar 26 18:36:13 2009 +0000
Remove dead code. One less unnecessary global.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6892
4a71c877-e1ca-e34f-864e-861f7616d084
commit 04356f57f86fc59e2b3eaf5df17bdd44947c40e8
Author: Gerard Krol <[email protected]>
Date: Mon Feb 23 20:05:42 2009 +0000
Shift the lightmap half a tile so the red light will be centered on the
landing lights again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6722
4a71c877-e1ca-e34f-864e-861f7616d084
commit 278e14b00f0ac9bae13fad0bd9e2a5a4ed5ba85d
Author: Gerard Krol <[email protected]>
Date: Mon Feb 23 19:19:22 2009 +0000
Fix a bug introduced in r6719 that caused an attempt to draw an off-map
sector, which resulted in an assert.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6721
4a71c877-e1ca-e34f-864e-861f7616d084
commit ad5622ba5b1bd68c76f0924e2726277cbf58701b
Author: Gerard Krol <[email protected]>
Date: Mon Feb 23 14:03:34 2009 +0000
Clean up the glDrawRangeElements code and respect GL_MAX_ELEMENTS_VERTICES
and GL_MAX_ELEMENTS_INDICES by reducing the sector size and not appending calls
when the limits would be exceeded. This probably will fix the crashes
people with intel cards were having.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6719
4a71c877-e1ca-e34f-864e-861f7616d084
commit aa4af604e519188aa15eb86df037f66a2ea5a9a3
Author: buginator <[email protected]>
Date: Wed Sep 22 23:15:18 2010 -0400
Add routines to detect when file is still open, since that is
a serious issue for us.
commit b2ddf6ff6030954ba287072ffcaae857c439b24f
Author: buginator <[email protected]>
Date: Wed Sep 22 23:11:04 2010 -0400
Close the file when an error occurs while loading a map. PhysFS likes that.
Gotoified from a patch by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6725
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/map.c
commit 0d490dbbbfb3863515c1e99898995e3d630840d8
Author: Buginator <[email protected]>
Date: Sat Feb 6 00:39:22 2010 +0000
Prevent the game from puking when it finds a map with a custom tertile that
isn't supported by trunk (yet). We only support the 3 main tertiles for now,
(tertilesc1hw-tertilesc3hw)
This hack will allow all maps to be loadable again, though, it might look
strange.
fixes ticket:1455
git-svn-id:
https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tr...@9646
4a71c877-e1ca-e34f-864e-861f7616d084
commit 0102acc0e98edf7e4c06fb1bcb2544be4e2cc196
Author: buginator <[email protected]>
Date: Wed Sep 22 01:12:31 2010 -0400
Fix merge clobber and map preview
When the tileset is not set, default to Arizona (this fixes the map
preview).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6715
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
src/map.c
commit 1a41a97c9c7491c90a31350f2fd5803172c6f109
Author: buginator <[email protected]>
Date: Wed Oct 6 00:21:54 2010 -0400
Obviously all builds systems are broken more or less...hopefully less :)
This is stage one, just trying to get it to work in SP / Skirmish modes.
Things are *still* broken!
*** NOTE *** Data files (textures) are NOT imported yet!
================================================================
Brace for impact, this is the new terrain renderer!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/tr...@6682
4a71c877-e1ca-e34f-864e-861f7616d084
Conflicts:
COPYING.NONGPL
lib/framework/debug.c
lib/framework/debug.h
macosx/Warzone.xcodeproj/project.pbxproj
src/component.c
src/display3d.c
src/init.c
src/map.c
src/map.h
src/texture.c
win32/Warzone2100.vcproj
commit ac21467daa47193acff32e0a468a1e87ce6fbb77
Author: buginator <[email protected]>
Date: Tue Sep 21 22:52:35 2010 -0400
add windows stuff to .gitignore
-----------------------------------------------------------------------
hooks/post-receive
--
Warzone 2100 Project.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
