Commit Graph
182 Commits
Author SHA1 Message Date
Anders Jenbo 4ae75753c8 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-09 01:24:02 +01:00
Anders Jenbo c19a15471b Reorder multi.cpp 2020-11-04 11:02:27 +01:00
Anders Jenbo 72e2637061 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-25 17:38:06 +01:00
Gleb Mazovetskiy ec329e645c Fix all "no-write-strings" warnings 2020-10-25 15:37:51 +01:00
Anders Jenbo e90f84dd03 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-22 22:14:49 +02:00
qndel 36dba1cc1c cleanup (#2127) 2020-10-22 17:26:24 +02:00
Anders Jenbo e073422ce7 Unify executable for Spawn and Retail
The game will now autodetect if it should run in shareware mode or full
retail based on the found mpq file. Additionally it can beforced in the
shareware mode with --spawn even if the retail data is found.

This simplifies a lot of the spagetty code and lets us better refactor,
also worth noteing is that we won't have to setup a secound set of build
tests.
2020-10-20 19:42:01 +02:00
Anders Jenbo b62b3375bd Merge branch 'master' of github.com:diasurgical/devilution 2020-10-13 02:05:36 +02:00
qndel fd5b12710f some defines 2020-10-12 14:16:39 +02:00
Anders Jenbo 2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
qndel 09c085b78e minor cleanup 2020-10-12 00:08:59 +02:00
Anders Jenbo 7e04c63977 Merge branch 'hellfire' of github.com:diasurgical/devilution 2020-10-11 23:53:07 +02:00
Anders Jenbo f1a193e1e2 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-11 07:01:25 +02:00
pionere 92cc9d589c Apply another bunch defines 2020-10-11 06:42:13 +02:00
pionere f0a51ccf65 use defs instead of literals 2020-10-11 06:37:14 +02:00
Anders Jenbo e0a94686b0 Add game speed to multiplayer
Speed can only be set on game creation
2020-09-28 07:03:22 +02:00
Anders Jenbo 893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Anders Jenbo fdd7254d3e Clean up multi_handle_events 2020-09-25 06:51:14 +02:00
Anders Jenbo 8272a37aea Add connection state and player state enums 2020-09-25 06:47:11 +02:00
Anders Jenbo aada50ec59 Use correct size of gameInitInfo 2020-09-24 20:35:53 +02:00
qndel 166029c95b apply enums 2020-09-01 07:00:49 +02:00
Anders Jenbo 7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo c384711a5f Backport cleanups from hellfire branch 2020-04-08 20:16:32 +02:00
Anders Jenbo e6e0ebe15a Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-07 03:46:20 +02:00
Anders Jenbo f1c216e688 Make player struct x/y fields match monster struct 2020-04-07 03:26:38 +02:00
Anders Jenbo 3c5982083f Merge branch 'master' of github.com:diasurgical/devilution 2020-04-06 12:05:13 +02:00
Anders Jenbo b040c04a18 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-04 07:56:06 +02:00
Anders Jenbo 187a021b30 More documentation from sanctuary/notes (#2026) 2020-03-30 11:31:36 +02:00
Anders Jenbo 776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02:00
galaxyhaxz c632e2d1d0 Names and bug fixes (#1974) 2020-03-12 04:32:53 +01:00
galaxyhaxzandRobin Eklind 71565b9c02 Several updates [enums+names] (#2002)
* Several updates

* Correct msg_get_next_packet

* Update enums.h

Co-Authored-By: Robin Eklind <[email protected]>

Co-authored-by: Robin Eklind <[email protected]>
2020-03-11 21:27:40 -05:00
Anders Jenbo 0383f9abcd Add documentation to more files 2020-03-02 02:29:28 +01:00
Anders Jenbo 25993b4043 Merge branch 'master' of github.com:diasurgical/devilution 2020-02-14 23:03:31 +01:00
Anders Jenbo 20621a0642 add all.h and use in place of diablo.h (#2005)
Now diablo.h is treated in the same way as all other header files of
Source, as it only contains the declarations of global variables and
functions of diablo.cpp.

Besides consistency, this also enables mods to include diablo.h just
like any other header file without having to include every header file
(and without having to include C++ specific aspects of the now all.h).
2020-02-14 13:12:54 +01:00
Gleb Mazovetskiy 4e29a4b8aa Single-player: Use loopback instead of TCP
Previously, single-player games initialized a TCP connection!
Changes this to loopback.

Refs #555
2020-02-02 19:38:54 +01:00
Anders Jenbo 40ba1e7a6f Merge branch 'master' of github.com:diasurgical/devilution 2020-02-01 14:48:39 +01:00
Anders Jenbo 08aa6a860a Move generic helpers out of miniwin 2020-02-01 13:56:08 +01:00
Anders Jenbo cc4d6b57d8 Remove unused miniwin IO 2020-01-31 22:30:13 +01:00
galaxyhaxz 6743f3b7ba Fix hellfire hive/crypt 2020-01-17 22:37:53 +01:00
galaxyhaxz 6605e1de5e Fix variable 'gbSelectProvider' 2020-01-17 21:07:10 +01:00
Anders Jenbo 40cea40aa4 Remove windows call types collisions 2019-12-26 05:00:02 +01:00
Anders Jenbo da03bae69d Merge branch 'master' of github.com:diasurgical/devilution 2019-12-25 20:38:25 +01:00
Anders Jenbo 7369deba1b Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-25 20:25:56 +01:00
Anders Jenbo 0c90ad0527 Set bool values TRUE/FALSE 2019-12-22 23:57:10 +01:00
Anders Jenbo 85ab626437 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-15 02:22:17 +01:00
Anders Jenbo 4e8a8d2157 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-26 13:43:28 +02:00
Anders Jenbo 3e7d352fde Format files 2019-10-21 20:04:14 +02:00
qndel 57f1fcce4c some enums (#1816) 2019-10-20 20:40:35 +02:00
Anders Jenbo 73a7a1ae6d Remove unimplemented functions that aren't needed with SDL 2019-10-08 23:04:39 +02:00
Anders Jenbo d840f388c7 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-08 22:05:10 +02:00