23f318fe39
Merge branch 'master' into qt
...
Conflicts:
lib/exceptionhandler/exceptionhandler.vcproj
lib/framework/frame.h
lib/framework/framework.vcproj
lib/framework/input.h
lib/gamelib/gamelib.vcproj
lib/iniparser/iniparser.vcproj
lib/ivis_opengl/ivis_opengl.vcproj
lib/netplay/netplay.vcproj
lib/script/script.vcproj
lib/sequence/sequence.vcproj
lib/sound/sound.vcproj
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj (resolved in favour of qt)
src/Makefile.am
win32/Warzone2100.vcproj
2011-03-22 00:01:28 +01:00
5cfd2e9dbe
Initial VS2k10 changes.
...
VS2k5 (no longer supported with platform SDK)& VS2k8 are NOT supported anymore.
Redo other aspects as well in preparation of moving libs out of the main codebase.
NOTE: You *must* have msysgit installed, and it should be in your system path,
or you can modify the local property sheet to point to it.
This is needed to generate the autorevision.h file, (that fix is next)
2011-03-17 21:35:00 -04:00
e689ad51d5
Merge remote branch 'origin/master' into qt
...
Conflicts:
configure.ac
lib/exceptionhandler/exceptionhandler.h
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.cpp
lib/framework/input.h
lib/ivis_opengl/pieclip.h
lib/ivis_opengl/screen.cpp
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/console.cpp
src/console.h
src/frontend.cpp
win32/libs/Makefile
and src/Makefile.am (resolved by Safety0ff)
2011-03-13 22:31:19 +01:00
a72c41aeec
fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\|
...
[Edit by Cyp: Removed a "typedef int bool;" when building on non-windows.]
2011-03-13 12:32:24 +01:00
ad4a33a789
Fix capitalization of winsock2.h, not sure if this include is still needed (not present in master).
2011-03-12 10:19:04 -05:00
676f453332
Do memset of NetPlay.games array, not MAX_PLAYERS elements of NetPlay.games.
...
MAX_PLAYERS was less than MaxGames, so it wouldn't memset too much, at least.
2011-02-28 20:06:30 +01:00
239eebec00
Remove GAME_SECONDARY in favour of GAME_DROIDINFO, which is sent more efficiently for multiple droids.
...
Instead of one message per droid, it sends one message for all droids, with the list of droids encoded as droid ID deltas.
2011-02-27 20:20:43 +01:00
a7730ccd15
Change "typedef struct {...} Blah;" into "struct Blah {...};".
...
Removed a few structs due to disuse.
2011-02-25 21:30:13 +01:00
dc4cf90ce5
Merge branch 'master' into qt
...
Conflicts:
lib/framework/input.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
lib/widget/scrap.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
src/multiint.cpp
2011-02-25 18:59:41 +01:00
4a1b5fb543
Bump year.
...
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:50:54 +01:00
ae2ce18314
Bump year.
...
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:45:27 +01:00
733ab6e911
Fix compilation with C++0x compilers.
...
Can't use nullptr, until switching to C++0x.
2011-02-15 14:28:08 +01:00
577cbbf874
Fix weird logfile date due to Jan..Dec = 0..11 in struct tm.
2011-02-14 22:08:11 +01:00
27741a2200
Merge branch 'master' into qt
...
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
tests/astartest.c
2011-01-30 23:45:39 +01:00
abcd0a4109
Stop connecting to the lobbyserver when it doesn't accept the game
2011-01-27 12:19:35 +01:00
3137d042ea
Fix NETregisterServer connecting multiple times also fixes the requirement to reconnect to the lobby for updates
2011-01-25 04:14:08 +01:00
cead34eea3
Hack around some accumulated brokenness to make --selftest work again
2011-01-24 20:07:30 +01:00
d39112244b
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/frame.h
src/main.cpp
2011-01-22 23:05:36 +01:00
82fbf17cff
Make team and colour of AIs visible to non-hosts.
...
Also, remove tooltip saying non-hosts can change AI difficulty levels.
2011-01-18 14:34:23 +01:00
8b49291b5d
Simplify NETbin interface.
...
Redundantly, the data length was redundantly sent twice, which was redundant.
2011-01-18 00:20:04 +01:00
268574f8c0
Make sure host gets to join his own game.
2011-01-15 15:34:56 +01:00
971e5de351
Add open/close buttons to pregame dialog. Basic support in netcode added. Closes ticket:2435
2011-01-15 13:29:23 +01:00
28f9830a63
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.h
lib/ivis_common/Makefile.am
lib/ivis_common/piestate.cpp
lib/ivis_common/pietypes.h
lib/ivis_opengl/imd.h
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/piestate.h
lib/ivis_opengl/pietypes.h
lib/sound/audio.h
lib/sound/sound.vcproj
lib/sound/track.h
lib/widget/editbox.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
src/Makefile.am
2011-01-14 19:26:55 +01:00
e46b08f8e1
Fix not sending player info for players 8+.
2011-01-13 16:40:34 +01:00
02ca800a92
Insane AI now always starts with defenses. Lets see if people like this.
2011-01-09 18:22:21 +01:00
f263cf5103
Add GUI dialog for choosing which AI you want to play against. Move semperfi and dydo into main. Change difficulty
...
slider into four separate steps (Easy, Medium, Hard, Insane). Thanks to Cyp for review. For more info, see ticket:2435
2011-01-09 16:35:49 +01:00
b72911f82f
Remove NetPlay.maxPlayers, since it was just a sometimes-correct copy of game.maxPlayers.
2011-01-08 15:49:30 +01:00
7f5da6ad47
Use more of MAX_PLAYERS in the code rather than plain numbers. Define MAX_PLAYERS for scripts. From patch by Cyp.
2011-01-05 23:09:38 +01:00
c4d4dcd73a
The colour chooser is now a proper button. The double-click kick is now gone (use the button). Kick button moved to team chooser.
...
The kick button is removed for single player and AIs and non-hosts (made no sense). The position chooser now allows you to click
on any other player to switch places. Removed broken ping symbol. Removed broken ranking symbol. Make sure we flush the connection
with the kick message before we cut it. Fix reception of kick message so that we do not crash when we do receive them. ticket:2435
2011-01-04 18:51:15 +01:00
734d52984d
Set bsocket = NULL when host drops, hopefully reduce the chance of crashing.
2011-01-01 23:24:25 +01:00
738a1fc38c
Strip "Class::" from "Class::myFunction" when compiling with MSVC, in syncDebug().
...
Other compilers don't add the "Class::".
2011-01-01 21:28:13 +01:00
e8d5913372
Apply patch — kill some more warnings, and fix a few issues that Buginator found.
2010-12-25 00:38:06 +01:00
23d5dcd5dd
Remove extern "C" {} from most places, due to longer being needed.
2010-12-21 17:20:48 +01:00
91ee0f7655
Merge branch 'master' into qt
...
Conflicts:
lib/framework/frame.h
lib/framework/types.h
lib/widget/editbox.cpp
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-Debug.xcconfig
2010-12-21 03:59:22 +01:00
b8ae806f29
Remove the NETMESSAGE wrapper around NetMessage.
...
It wasn't compiling on Windows anymore, anyway — fixes ticket:2426...
2010-12-21 01:10:57 +01:00
68b50aecda
Remove bool, true, false defines, add NETauto() and move PACKAGED_CHECK somewhere more appropriate.
2010-12-20 21:41:51 +01:00
146599b05c
Remove use of %zd and %zu, since Windows felt like using %Id and %Iu instead.
...
Fixes ticket:2422.
2010-12-20 05:33:08 +01:00
36484909d6
Try to fix Windows exception handler and makefiles.
2010-12-20 01:07:12 +01:00
bd6b96315b
Merge branch 'cpp' into qtcpp
...
Conflicts:
lib/framework/Makefile.am
lib/framework/frame.cpp
lib/framework/framework.vcproj
lib/framework/input.cpp
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/textdraw.cpp
lib/widget/Makefile.am
lib/widget/editbox.cpp
lib/widget/scrap.cpp
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj
src/Makefile.am
src/main.cpp
src/makefile.win32
2010-12-19 16:51:27 +01:00
0d2e373456
Merge branch 'master' into cpp
...
Conflicts:
lib/widget/bar.cpp
lib/widget/editbox.cpp
2010-12-19 16:24:38 +01:00
d9813b37e5
Fix crash when dumping too much syncDebug.
2010-12-17 21:46:35 +01:00
80cc971b61
Merge remote branch 'origin/master' into qt
...
Fixed gameTime → realTime in lib/framework/wzapp.cpp, since the menus were messed up due to interpreting everything as a double-click.
Conflicts:
lib/framework/debug.c
lib/framework/input.c (became wzapp.cpp)
lib/ivis_opengl/screen.c
lib/ivis_opengl/screen.h
lib/ivis_opengl/textdraw.c
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/display.c
src/main.cpp
src/terrain.c
2010-12-17 00:36:10 +01:00
0646b37603
Rename *.c to *.cpp.
2010-12-16 23:28:56 +01:00
a2cd7b0592
Make everything compile successfully with g++, without -fpermissive.
2010-12-16 23:24:40 +01:00
2bcb709cf4
Move broken dependency hack out of most Makefile.am's, except the for the root.
2010-12-16 23:14:38 +01:00
f5893a7fe5
Don't include backtraces in syncDebug CRCs.
...
This should allow using syncDebugBacktrace() without causing a desynch if some clients don't support them or print them differently.
2010-12-08 18:00:08 +01:00
00c92cbdd7
Fix bug introduced in 09ea0be7c30236809536db332be78b2967d3114d Changelog: Fix kicking of non-hosts who didn't have default color values.
...
Only change colors if you are the host on the setup screen.
Fixes ticket:2329
(cherry picked from commit fd2843e6431e43cc72b635c422fd18bb19d42c47)
Conflicts:
lib/netplay/netplay.c
2010-12-06 21:13:54 -05:00
0049223ccb
Use the host's SP color as the default color when hosting games. (cherry picked from commit 09ea0be7c30236809536db332be78b2967d3114d)
...
Conflicts:
lib/netplay/netplay.c
2010-12-06 21:13:52 -05:00
bf38eb51ea
Add branch switching hack to remaining Makefile.am files.
2010-12-06 00:19:30 +01:00
2ad6ff0855
Fix desynch when player leaves, due to clearing buildings at different gameTimes.
2010-11-29 12:48:51 +01:00
Cyp
Buginator
abomination
safety0ff
Per Inge Mathisen
Rene Jochum