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

7902 Commits (b21f92a65d0ac9ad9042bd1c619fbd9540eb08bd)

Author SHA1 Message Date
dak180 b21f92a65d Add build bot scripts. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11696 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:41 +02:00
Giel van Schijndel 0aa5d2cef8 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.h, #include lib/framework/opengl.h
instead.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11691 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:41 +02:00
Giel van Schijndel 27fb938877 opengl.h: get rid of the X11 macro `Status` 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11690 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:41 +02:00
Per Inge Mathisen 780f186dec 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-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:41 +02:00
Per Inge Mathisen d6baaff477 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-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:41 +02:00
Giel van Schijndel f363a02af7 Replace immediate-mode rendering with VA-based rendering 
Almost completely (one corner case requires reading GL specs) replace
immediate-mode rendering with VA-based rendering by means of
glDrawArrays.

This, when completed, makes porting to OpenGL ES 2.0 and OpenGL 3.0
without backwards compatibility easier.

This closes #2172

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11686 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:41 +02:00
Giel van Schijndel d0e24c96cf Add lib/framework/opengl.h to noinst_HEADERS 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11685 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:41 +02:00
dak180 6d55a3bd5c Update the Make DMGs for Release script. 
Randomness from http://whatthecommit.com/ :
things occurred


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11683 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:41 +02:00
Safety0ff 746ffaa836 obj2pie: Fix last obj face duplication bug. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11681 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-18 23:07:47 +02:00
dak180 447bba3120 Add opengl.h and wzapp_c.h to the xcode project. 
Randomness from http://whatthecommit.com/ :
whooooooooooooooooooooooooooo


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11680 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-17 17:51:49 +02:00
Giel van Schijndel 09f6b46276 prevent redefinition of __glext_h__ 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11678 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-17 14:00:58 +02:00
Giel van Schijndel 82ed96fd3b Add a platform-abstraction header: `opengl.h` 
Add a header to allow platform-indepent inclusion of the OpenGL API,
removing our dependency on SDL_opengl.h and consolidating
platform-specific code in that single header.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11677 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-17 12:15:18 +02:00
Giel van Schijndel cecef2e1e7 vertex shader: don't use deprecated ftransform() 
Replace the usage of the depecrated ftransform() function with an
equivalent expression along with the invariance guarantee.  Let the
shader compiler deal with optimising this expression.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11676 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-17 11:44:57 +02:00
Christian Ohm 2e0135626e Korean translation update by urgood2. 
Closes #2098.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11672 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-17 09:54:07 +02:00
Giel van Schijndel 8e000fa325 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-e1ca-e34f-864e-861f7616d084
 2010-09-16 11:05:20 +02:00
Giel van Schijndel 4cb7957bd0 Use native EOL to store the shaders 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11670 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-16 11:05:20 +02:00
Giel van Schijndel b14221a289 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-e1ca-e34f-864e-861f7616d084
 2010-09-15 10:12:20 +02:00
Giel van Schijndel 7284776c38 .gitignore: ignore betawidget and libtool build products 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11667 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-13 23:16:05 +02:00
Giel van Schijndel 220d310140 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-e1ca-e34f-864e-861f7616d084
 2010-09-13 23:16:05 +02:00
Christian Ohm 13a1754953 Brazilian translation update by Tucalipe. 
Closes #2163.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11655 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-13 10:49:14 +02:00
Guangcong Luo d95995d682 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-e1ca-e34f-864e-861f7616d084
 2010-09-13 10:49:13 +02:00
Christian Ohm 9147f9b5f3 Polish translation update by Emdek. 
Closes #1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11645 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-13 10:49:13 +02:00
Christian Ohm 7ab97781ae Print the needed port when lobby communication fails. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11639 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-13 10:49:13 +02:00
Christian Ohm fadd32b1e6 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 the string, and if there was, wouldn't append one.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11638 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-13 10:49:12 +02:00
Christian Ohm 8c79885bc7 Update translations. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11637 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-13 10:49:11 +02:00
Guangcong Luo 3f97c795c0 Rebalance 0.8.3: 
- Weaken Flak Cannon and Sunburst a lot more. I'm pretty sure this change makes them too weak, but when introducing new weapons it's better to make them too weak than too strong.
- Increase HP of a bunch of VTOL weapons
- Slightly buff Hurricane/Whirlwind

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11634 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-07 00:37:56 +02:00
Cyp d30e97f54e 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.
 2010-09-07 00:32:46 +02:00
Safety0ff 2c23ee1b0c Fix invalid values in trmair2.pie and trmair3.pie (use files identical to 2.3's). 
Closes #2149.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11629 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 20:51:18 +02:00
Buginator 2115057889 Fix WreckedDroidHub with 7 armor and 60 HP. No real reason for those numbers, just wanted to make it harder to kill ;) 
refs r11186 close ticket:1711
2.3: r11280


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11628 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 20:51:18 +02:00
Christian Ohm 5339ece506 Korean translation update by urgood2. 
Closes #2098.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11623 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 20:51:18 +02:00
Christian Ohm 998dd528d9 Polish translation update by Emdek. 
Closes #1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11622 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 20:51:17 +02:00
Christian Ohm 5fcef57918 Fix "unsigned < 0 always true" warning. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11621 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 20:51:17 +02:00
Christian Ohm 78fa9a69aa Use separate installation folder and registry key for nsis. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11617 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 00:21:02 +02:00
Christian Ohm e5a619411e Remove every line with "ntw" from the nsis script. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11615 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 00:21:02 +02:00
Christian Ohm 69028fb461 Remove gcc warnings the cross compiler doesn't know. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11611 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 00:21:01 +02:00
Christian Ohm a977d77208 Readd -lz to the win32 libraries. 
Got lost in the newnet merge.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11610 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 00:21:01 +02:00
Christian Ohm fbe3dc9dbc Update translations. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11609 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 00:21:01 +02:00
Guangcong Luo d03a9c1fc3 Rebalance 0.8.2 - even more changes: 
- Add air-to-air versions of Sunburst and Flak Cannon
- Increase research/manufacture/build price of Sunburst and Flak Cannon by a lot, to offset the fact that you don't have to upgrade them separately

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11606 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 00:21:00 +02:00
Guangcong Luo de98e4c8b8 More Rebalance 0.8 - nerf Flak Cannon a bit per feedback from LuckyLuke/Germanium. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11602 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 00:21:00 +02:00
Guangcong Luo 5a838147f8 Rebalance 0.8.2: 
- Decrease ground-to-air damage modifier of minipod, lancer/TK/scourge cyborgs/VTOLs, Sunburst, and Flak Cannon from 100% to 80%.

Also fix "NOT USED Assault Gun Hardpoint" which is actually used, and also fix bug #2140 - Flak Cannon was being obsoleted by Whirlwind.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11599 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 00:21:00 +02:00
Guangcong Luo fa3897faa4 Fix bug #2134 - problems with tech tree 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11589 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-05 00:21:00 +02:00
Guangcong Luo abc4db390b Rebalance 0.8.1: 
- Removed Cyclone turret
- Added: AA Flak Cannon (and Emplacement and Hardpoint)
  - Flak Cannon is a medium-reload splash weapon
  - Prerequisites: HPV
- Added: Sunburst AA Rocket Array (and Site)
  - Sunburst is a slow-reload salvo weapon
  - Prerequisites: Lancer
- Lancer damage toned down a bit
- Heavy Laser damage increased a bit

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11569 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-03 12:31:20 +02:00
Cyp 15e52cee9a Fix arbitrary orientation limitation for non-square buildings. 2010-09-02 01:14:10 +02:00
Cyp 559ded3ec0 Fix switching players in single-player mode in debug menu. 2010-09-01 21:34:21 +02:00
Guangcong Luo fe68bb78cc Rebalance 0.8: 
- Merge of mini-rocket and rocket subclasses (so they're affected by the same upgrades).
- The merged subclass has 9 damage upgrades (+25% each), 3 accuracy upgrades (+10% each), and 3 ROF upgrades (-15% reload time each)
- Lancer, TK, BB, Cyborg Lancer, and Super TK Cyborg have their damage adjusted so that their fully upgraded damage remains the same
- Slight buff to Heavy Laser, Avenger, and Vindicator damage
- Require HQ for every weapon structure, not just MG Tower

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11561 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-01 13:02:51 +02:00
Christian Ohm e1a812fd2e Check if zip understands --filesync, else use -u. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11554 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-30 14:31:04 +02:00
Christian Ohm 7571e0e41d Korean translation update. 
Closes #2098.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11553 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-30 14:31:04 +02:00
Christian Ohm 651970e1de Use filesync instead of update to create .wz files. 
This will prevent warnings when the archives don't exist (for clean builds),
and remove files from the archives that have been removed from the repo (for
unclean builds).

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11552 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-28 20:30:48 +02:00
Christian Ohm e08ace06e4 Update translations. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11548 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-28 20:30:47 +02:00
Christian Ohm 6a6cd55ca1 More formerly untranslated messages. 
Refs #2102.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11547 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-28 20:30:47 +02:00