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 ba5fc468eb018f92a3c9a45a1bd630fccdd2d845 (commit)
- Log -----------------------------------------------------------------
commit ba5fc468eb018f92a3c9a45a1bd630fccdd2d845
Merge: 372d254a60033fa30fa5dcae74243ba617f60321
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 372d254a60033fa30fa5dcae74243ba617f60321
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 346571bc220bbee49d31019e7b348af576fb4952
Author: buginator <[email protected]>
Date: Wed Oct 6 00:53:23 2010 -0400
Copy over (changed) tertiles from trunk..err master.
commit 8bcc4e6236d78166301f39f094094be3aa1fae3d
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 de633c387c46cadcde5c70300cb05cbc4eb31d5c
Author: buginator <[email protected]>
Date: Sat Oct 2 13:54:17 2010 -0400
Apply TCmask to command relay center
commit b5117e3199cd35224842419ff5309509c298b5dc
Author: buginator <[email protected]>
Date: Sat Oct 2 13:53:58 2010 -0400
Apply TCmask to factory
commit a964a89ba421946ae65f128744a217bc30654085
Author: buginator <[email protected]>
Date: Sat Oct 2 13:53:34 2010 -0400
Apply TCmask to HQ
commit b1c8181b82228a1e1343393f8aeccae8cd66c0a4
Author: buginator <[email protected]>
Date: Sat Oct 2 13:53:22 2010 -0400
Apply TCmask to research center
commit f7baa1cddf686ec512cfd48cafa15c22123a3449
Author: buginator <[email protected]>
Date: Sat Oct 2 13:54:41 2010 -0400
Add palette.txt and fix makefile for new additions.
commit de4417c2154e04a98cbd56e7369f9c94fd2a91d7
Author: buginator <[email protected]>
Date: Wed Oct 6 16:28:21 2010 -0400
Fix construction beams
commit ccde62bf93ba2b858abb94c3440b89b6c742b9fa
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 e942f815eaf29f6adbaa97ca447a2cf3209fe4b2
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 7e840d05eeb15d5759c76c8f8eac577e2aaa568b
Author: buginator <[email protected]>
Date: Sat Oct 2 13:53:02 2010 -0400
Externalise all map tileset settings.
commit d453082e483624e9e3ff1a57369789c8fcc601fa
Author: buginator <[email protected]>
Date: Sat Oct 2 13:52:47 2010 -0400
Externalise all map tileset settings.
(data files)
commit 40574bb343b4dd2851c757631e72cc0af1cde974
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 013d770de7dee546ff45d6b0c6c3b2986ce44585
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 7291876e6cf61c1b102a966ff024a83ac2e21498
Author: buginator <[email protected]>
Date: Sat Oct 2 13:48:26 2010 -0400
Null out pointer when free'ed
commit 0d938671ca4bbba70fc1ed1df74b4f0aac09780a
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 217720cc27f69c2874ee728f4f235a89aae9d2b4
Author: buginator <[email protected]>
Date: Thu Sep 30 17:32:19 2010 -0400
revert r9847 to make it the same as trunk again
commit dda60dddf4cb76211a0ced2c014aa4901aad6dce
Author: buginator <[email protected]>
Date: Thu Sep 30 17:30:26 2010 -0400
Remove useless files
commit 17f2b827be282fa348d2252d9836c9db03fe1961
Author: buginator <[email protected]>
Date: Tue Sep 28 17:53:08 2010 -0400
Fix the single player color saving / loading.
commit 8a5ccf1008275b1dde9b6e4af7443b5d307b378e
Author: buginator <[email protected]>
Date: Mon Sep 27 18:06:47 2010 -0400
just format fix
commit 0b8aec9e9a23047e458c1ba4442bbefc12e627a5
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 931a558d64e2ba6cf1f7458476f2871c3c9d5c64
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 3b5c0a8524dd15841fb00f5f9de07465ba3a6349
Author: Buginator <[email protected]>
Date: Fri Sep 24 21:14:10 2010 -0400
Make sure decals & "explored" bits are not the same.
commit 4141ebef3f9738510cb27735a2643fd39a1cfea4
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 1b6a76b463d861f0b9e1cdb8d1a991d8ce1a06bb
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 dd83336d8f414ca0e69717d98479ea05661b2182
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 e46ba8351c7fedcb374e5ececde862e78f4fe395
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 3ba606bbfd0ac25ef3f5c487db8fcb4c2268071c
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 ba5b9e963b17096ded1d354cd5d96f6b572217db
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 defec283a31394f4918ca5d48d4e2e7fe7b522a2
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 c2f7a7a3ca5a707f08eb658f89032f6dba621150
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 d7ef8cd5eef841855e484f4ddc75561e1c63f9e6
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 96d02f157a931e1ecff4e23d8a01bf6e02f25394
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 6a2ba4ba323a49ebe04e597995c30bd346179097
Author: Per I. 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 5df6d42c15934a79462b19cba7a04d55ba4995d6
Author: Per I. 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 3a19ee6c07842d2718f9513d2449411c2af9f373
Author: Per I. 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 559e26237cd57c55b5e1dae32588ae1e50221cb2
Author: Per I. 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 149a33ac5422e90d332a8df0581e303c0de4fc9b
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 3643b3c87d84bddfaa23dcb642a87e0e8ad58953
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 8101e04c0e95cf37eb5e4c2d42893d31ccd11f5e
Author: Per I. 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 d3bfb711f3cb8557350119e511815e5f1b123a99
Author: Per I. 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 b974dbcd2aeef12b7522f6275d818a774a1aab32
Author: Per I. 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 06e1e00674b36b07957a311f27109786a19f1fc9
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 7ed94b73e6c7e37ba493d8de886dda06e357f660
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 b4e600e4552b010ea37999a319313a2f70f3d292
Author: Per I. 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 30c1eb2cf626d8f4a2ac679b4bd16d896e4a3b08
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 fe3f90a387dc0725a7af9ea99e4cf40869a459b9
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 4f307b83e208810710a73320fb8bb2b2642588a3
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 a97ab684e226e1e1cfc7ee70d95eb78dec960907
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 6735aa5823a5f8ebefd89a029be6e8f8acb12474
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 45f998ad357f4fa4c605d3d8a1ac9c5f4a97c808
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 333d796fe4eb7f074a52f677169448882238b5dd
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 12e02e9b8c15db19d7e6c1eca804f107fd112144
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 a93bb20e0579dbaa8ae2cf7794e63290079b9cb0
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 6c63f23d0742f24cc5bad73f76cb9eaa8337a04d
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 b5f91ef960c90e3e3c4ce9cbeb9f044db29d879a
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 01d56f395763894ecc85f14a8db595533a2d52b8
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 c20833c73b3208afd1406d3f9c7b851c81e4131a
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 022e9222b02738e4d17b23aacf98ca34d5673693
Author: Per I. 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 d848efc999b92d4676a74612a43d7b477bf68c5b
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 a69fb27a3a41cd268da490b4bb7cd0a56fcc683f
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 10b7e64c16307c701fd38778b988cc89dc35b87e
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 1b064bc85c1d3a1569e86955de2ff3c43f95da8b
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 b17c7429d46e5e45373faf7f7aa358589472df56
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 dd59482ebe35738feff2e18f229974134ba77d9e
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 5b7869ee850ae61a1e6cee1a69d7eb4dddddb31b
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 69d635c7cb0f9a2a4e4d79e88d7af4ded45d1cb1
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 0a57f696923d6464bb12228a34b92361f5da3cba
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
