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

2583 Commits (b21f92a65d0ac9ad9042bd1c619fbd9540eb08bd)

Author SHA1 Message Date
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
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
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 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 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
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
Cyp 559ded3ec0 Fix switching players in single-player mode in debug menu. 2010-09-01 21:34:21 +02:00
Safety0ff d2cec06720 Fix CFURLRef leaks on Mac. 
Closes #2009.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11511 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-23 16:35:30 +02:00
Cyp e7c277c3d7 Fix VTOLs flying into hyperspace due to unsigned vertical velocity calculations. 
Also, fix all signed-unsigned warnings in src/move.c.
 2010-08-15 21:02:32 +02:00
Cyp 6f60e686ae Remove NETuint32_tSmall, make all uint32_t's small, except for one uint32_tLarge. 
(The large is a CRC, and CRCs are usually large numbers.)
 2010-08-15 21:02:32 +02:00
Safety0ff 8f55883a61 Remove SDL_swap* usage. 
Closes #1937.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11482 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-15 20:46:41 +02:00
Cyp 15d7243c5f Make the warn_unused_result warning squelch compile on distros where the fwrite is already in an if (fwrite()) {}. 2010-08-15 13:15:04 +02:00
Cyp 438a4d5aff Enable warnings, make warnings consistent, fix some warnings, use -Wno-error=squeak to allow squeaky warnings to compile without squelching them. 2010-08-15 12:30:46 +02:00
Buginator 26fa2b06f9 Change back to "trunk" form newnet. (less confusion) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11470 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-15 00:10:52 +02:00
Cyp 0c2015425c Merge remote branch 'origin/newnet' 
Conflicts:
	lib/gamelib/gtime.c
	lib/gamelib/gtime.h
	lib/netplay/netplay.c

Closes ticket:1573. Closes ticket:805. Probably fixes 100 more issues.
 2010-08-14 22:34:30 +02:00
Per Inge Mathisen 57299dc208 Remove all float usage from logical fps calculations. Patch reviewed by Cyp. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11462 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-14 22:08:32 +02:00
Cyp d13fbd9dbc Squelch warnings. (Need a way of doing optimised builds, but still with -Werror...) 2010-08-14 14:16:08 +02:00
Per Inge Mathisen a34997239a Fixes for game elements improperly being dependent on logical fps. Camera animation. 
Water animation. Weather animations. Replaced all usages of the generic timeAdjustedIncrement
with proper gameTimeAdjustedIncrement or graphicsTimeAdjustedIncrement as appropriate.
See ticket:2083 for more info. Patch reviewed by Cyp.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11457 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-14 14:10:34 +02:00
Cyp 7d5f1271a9 Merge remote branch 'origin/master' into newnet 
Conflicts:
	.gitignore
	lib/iniparser/Makefile.am
	macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
 2010-08-14 11:26:09 +02:00
Cyp fcd0b6fe46 Print "Oldname → Newname" instead of "Oldname: -> Newname". 2010-08-14 09:58:36 +02:00
Cyp 18307a7fc1 Eschew ventriloquism assiduously. 2010-08-14 09:57:45 +02:00
Christian Ohm fe59e98943 Add Slovak translation by Koapa. 
Closes #2036.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11418 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-11 00:04:10 +02:00
Christian Ohm fab89b8ab4 Don't crash in socketAccept when given a NULL socket. 
Closes #2033.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11405 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-09 09:14:50 +02:00
Christian Ohm 4eb49a39d1 Add Korean translation by urgood2. 
Closes #2035, #2055.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11395 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-09 09:14:49 +02:00
Giel van Schijndel 94320034ae Assume that SDL headers are directly in the #include path, instead of assuming the SDL directory is in the #include path. 
Closes #1941.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11385 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 20:05:02 +02:00
Safety0ff 1fa5ab201d Apply patch from #1944 (vorbis error strings). 
Closes #1944.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11384 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 20:05:02 +02:00
Safety0ff dec83d8065 Apply patch #1982. 
Removes Vector3i_normalise and return int32_t instead of float for Vector3i_Length.
Closes #1982.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11383 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 17:48:53 +02:00
Cyp dd47d1f8c2 newnet: Insist harder on detecting and displaying desynchs. 2010-08-02 14:22:10 +02:00
Cyp d5b3621844 Merge branch 'master' into newnet 
Conflicts:
	lib/netplay/netplay.c
	src/multiint.c
 2010-08-01 21:10:34 +02:00
Cyp 7c8df3a2e8 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/framework/wzapp_c.h
	src/power.c
	src/power.h
 2010-08-01 20:41:45 +02:00
Cyp 82ad8abd8f When a player drops from the joining menu, clients should remove the dropped player, and not decide whether to randomly quit based on whatever was on the stack, either. (Forward-port from 2.3.) 2010-08-01 19:41:07 +02:00
Cyp da7ff2f37f Don't allow inconsistent player positions or colours, even momentarily. (Forward-port from 2.3.) 
On swapping places or colours, sends a NET_PLAYER_INFO containing both players, instead of two separate NET_PLAYER_INFOs.
 2010-08-01 19:40:12 +02:00
Cyp 466943b783 Don't use floating point calculations in power code. 2010-08-01 18:38:11 +02:00
Cyp 7874dc608c Clean up thread-related #defines. (Backport from newnet.) 2010-08-01 15:23:06 +02:00
Cyp 2e01e81da6 newnet: Show relevant players next to connection status icons. 2010-08-01 13:06:50 +02:00
Cyp b59b089ca5 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/nettypes.c
	src/multibot.c
 2010-07-30 22:51:33 +02:00
Cyp ea690beab7 newnet: Fix maximum latency calculation, don't return 1 second unconditionally. 2010-07-29 23:30:16 +02:00
Guangcong Luo da445cd536 Make some text alignment fixes that got left out of r11230. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11301 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:33 +02:00
Buginator edb644a03b Fix (and add missing) headers to files. 
2009  Warzone Resurrection Project -> 2010  Warzone 2100 Project

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11298 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:33 +02:00
Cyp 1db4f15973 Change do-while to while, since it doesn't make sense to try to read a game structure when there are none in the lobby. 2010-07-22 19:19:53 +02:00
Cyp 1b811abcea Before receiving game list from server, clear old games from list, and don't receive more than there are room for in the array. 2010-07-22 14:45:49 +02:00
Christian Ohm bf3006d31c Make sure we use at least 640x480. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11248 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-22 09:34:22 +02:00
Cyp 1a39299572 Merge remote branch 'origin/master' into newnet 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2010-07-20 23:07:26 +02:00
Cyp e246e6006e newnet: Save a few more bytes. 2010-07-20 15:40:07 +02:00
Cyp f5fe36414a newnet: Save a few bytes. 2010-07-19 18:42:19 +02:00