Commit Graph

15401 Commits

Author SHA1 Message Date
hiker
453ce8cf60 Added LAN server discovery. 2015-11-09 20:51:00 +11:00
hiker
9d9b83059d Fixed deadlock (when while handing a request another request was queued). 2015-11-07 00:19:16 +11:00
hiker
60f550e9d1 Fixed coding style, removed unnecessary #include in hpp file. 2015-11-06 16:50:58 +11:00
hiker
47a7bd1caf Print correct protocol name in 'has been terminated" message. 2015-11-06 16:32:18 +11:00
hiker
00843b8685 Fixed typos. 2015-11-06 16:30:34 +11:00
hiker
541509f29a Added new requestPause and requestUnpause commands for protocols,
minor code cleanups and improvements.
2015-11-06 16:11:12 +11:00
hiker
e14bc572b6 Fixed typo in comment (thanks to leyyin). 2015-11-05 23:35:37 +11:00
hiker
847a788a9c Removed server creation request (which is now down automatically
from STKHost).
2015-11-05 23:34:27 +11:00
hiker
bec317b9ed Added documentation to the table use and protocol between
game server/client and the stk server.
2015-11-05 08:03:06 +11:00
hiker
c99ad34cb0 Coding style changes. 2015-11-05 08:02:17 +11:00
hiker
73c59db858 Reverted to previous version of protocol (since it is not yet
supported by the server).
2015-11-05 08:01:37 +11:00
hiker
4fc46c510f Fixed too early release of objects, and some state changes in finite state machine. 2015-11-05 08:00:45 +11:00
hiker
b7b37b9ec9 Updated documentation. 2015-11-05 07:59:28 +11:00
hiker
35793d99c8 Create an STKHost client instance if a connection to client is
requested. The rest of the protocol is handled from STKHost.
2015-11-05 07:57:49 +11:00
hiker
f2aa1ddea6 Code cleanup. 2015-11-05 07:55:59 +11:00
hiker
bdf34edc00 Removed --client command line option (since this command needs a
server id to work).
2015-11-05 07:54:58 +11:00
hiker
dc80fb1c11 Updated docs. 2015-11-02 16:24:05 +11:00
hiker
eab07b31dd Hide RefreshRequest class. 2015-11-02 16:14:38 +11:00
hiker
6946306c4c Fixed memory leak (thanks to CruzR). 2015-11-02 10:55:17 +11:00
hiker
7c51be7724 Removed need for m_fake_refrehs, some coding style improvements. 2015-11-02 09:16:39 +11:00
hiker
c0817d29d3 Minor coding style update. 2015-11-02 09:16:09 +11:00
hiker
d7d2115abd Removed setupClient (which is now done in the constructor). 2015-11-02 09:14:35 +11:00
hiker
0b62d2f82b Created two different constructors for STKHost - one for server, one for client. 2015-11-02 08:11:51 +11:00
hiker
6add49b065 Allow WAN server creation from GUI. 2015-11-01 23:42:24 +11:00
hiker
f05ee47e2b Moved lan/wan setting to static functions in STKHost. 2015-11-01 22:16:57 +11:00
hiker
15e3ac021f Fix ending STK when no STKHost exists. 2015-11-01 21:28:39 +11:00
hiker
1334a467e3 Don't start a STKHost if neither client nor server is requested. 2015-11-01 19:45:28 +11:00
hiker
4aea491ed0 Merge remote-tracking branch 'origin/master' into refactor_networking 2015-10-31 11:41:43 +11:00
hiker
f2ae36fc65 Simplified ConnectToPeer (no more fsm). 2015-10-31 11:40:41 +11:00
auriamg
4762658a88 Merge pull request #2364 from Benau/freetype_cleanup
Clean up freetype code
2015-10-30 20:33:51 -04:00
Deve
8a288f05ff Implement lightning effect using shaders 2015-10-31 01:00:48 +01:00
Benau
41bd914f7c Fix typo 2015-10-31 00:29:53 +08:00
Benau
b9b2b538fa Clean up freetype code
1. Remove all ifdef of freetype

2. Require freetype in CMake

3. Clean up declaration

4. Add leak check

5. Make script language display better in title
2015-10-30 18:08:02 +08:00
hiker
8585afb713 Minor code cleanup. 2015-10-30 17:00:57 +11:00
hiker
94bc18df52 Removed ShowPublicAddress protocol, instead submit blocking
request in ConnectToServer.
2015-10-30 16:45:43 +11:00
hiker
dd289dc1cd Removed polling for GetPublicAddress with callback. 2015-10-29 18:58:18 +11:00
hiker
ef310a5666 Renamed types.hpp to transport_address.hpp. 2015-10-29 18:39:01 +11:00
hiker
83154ae3a7 Converted the CallbackObject to actually call a function. This
means that if protocol A starts protocol B and needs a result from B,
previously B would set a (potential private) variable in A. Now
B calls a callback in A, where the result can be set.
2015-10-29 18:27:55 +11:00
hiker
966d31dc45 Cosmetic changes, removed unused and unimplemented 'stop protocol' support. 2015-10-28 17:22:09 +11:00
hiker
cf9ce6674c Removed unused class. 2015-10-28 17:08:01 +11:00
Marianne Gagnon
66909086fd Scripting : allow smoothly animating lights 2015-10-27 19:08:12 -04:00
Marianne Gagnon
953c29089e Scripting : start adding features to control light objects 2015-10-27 18:33:54 -04:00
hiker
5df6c225ef Cosmetic changes only. 2015-10-28 08:57:05 +11:00
hiker
e919b97037 Removed unnecessary getProtocolState functions. 2015-10-28 08:24:05 +11:00
hiker
2909e42a25 Minor code cleanup for ConnectToPeer handling. 2015-10-28 08:21:35 +11:00
hiker
7e202d94a8 Removed hardcoded maximum number of players. 2015-10-28 08:03:05 +11:00
hiker
60bbfe3ab3 Remved StartServer protocol, and used executeNow() in ServerLobby instead. 2015-10-28 08:01:46 +11:00
hiker
e212276dd2 Move enet initialisation into STKHost. 2015-10-27 16:58:40 +11:00
hiker
10f8f6b3a5 Removed unnecessary function, added some docs. 2015-10-27 16:46:26 +11:00
hiker
f7f12d5431 Renmated ServerConsole to NetworkConsole. 2015-10-27 16:38:22 +11:00