MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5,032 commits 1 branch 0 tags 51 MiB
Commit graph

96 commits

Author SHA1 Message Date
pionere
d5a0fa8e85 get rid of a few warnings 2021-02-19 22:04:11 +01:00
qndel
ab9911064f unify checks for single and multiplayer 2021-02-18 22:32:01 +01:00
Anders Jenbo
4ffbb32952 [hellfire] Allow continuing Diablo saves in Hellfire and vice versa 2021-01-13 16:10:21 +01:00
Anders Jenbo
d20eddf48e Unifcy a chunk of Hellfire's code pathts 2020-12-28 01:11:25 +01:00
Anders Jenbo
43b5dea6e5 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-03 00:56:51 +01:00
Anders Jenbo
31ec800160 Reorder Interface.cpp 2020-11-02 20:38:48 +01:00
Anders Jenbo
4794c8357c Merge branch 'master' of github.com:diasurgical/devilution 2020-11-02 03:59:47 +01:00
Anders Jenbo
6580222d1c Add enums for level entrances 2020-10-26 01:41:54 +01:00
Anders Jenbo
2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +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
a969588bff DTYPE switches 2020-10-11 06:39:08 +02:00
Tyler
ecde1f647e Adjust UI to any resoution 2020-09-28 07:01:27 +02:00
Anders Jenbo
dc8be6c0ab
 		C++03 compatibility (#736) 
* Use C++03 compatible constructors
* Remove conflicting definitions
 2020-05-17 01:37:19 +02:00
Anders Jenbo
659dc41aa5 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-26 22:10:34 +02:00
Anders Jenbo
7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo
3b8bcf98bf Enable assertions 2020-04-11 15:22:40 +02:00
Anders Jenbo
350646fe95 Correct signatures 2020-04-11 15:22:40 +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
b040c04a18 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-04 07:56:06 +02:00
Anders Jenbo
776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02:00
galaxyhaxz
f89204e7dd Fix function/var names (effects/sound) 2020-03-24 00:22:36 -05:00
Anders Jenbo
0383f9abcd Add documentation to more files 2020-03-02 02:29:28 +01:00
Anders Jenbo
3c276a3cd3 Add documentation 
- Add file documentation to about 1/4 of the files in Source
- Copy over a lot of the documentation from the sanctuary/notes repo
- Standardise all the existing documentation
- Create a configuration for Doxygen
- Add more documentation (engine.cpp is now fully documented)
 2020-03-01 22:18:00 +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
Anders Jenbo
40ba1e7a6f Merge branch 'master' of github.com:diasurgical/devilution 2020-02-01 14:48:39 +01:00
qndel
a6a89bca3a apply TRUE/FALSE 2020-01-31 19:22:51 +01:00
galaxyhaxz
2c60ceb92a Fix items and cutscenes 2020-01-17 22:20:29 +01:00
Anders Jenbo
e847108b78 Clean up event handeling 2019-12-03 01:59:13 +01:00
Mathieu Maret
bfe4759745 Loading screen (#1836) 2019-11-01 12:59:46 +01:00
Anders Jenbo
a9ffe83760 Merge branch 'centerGui' of https://github.com/mmaret/devilutionX 2019-11-01 00:30:37 +01:00
Mathieu Maret
66fe4ab77b
 		Use PANEL_X instead of SCREENX+PANEL_LEFT 
Co-Authored-By: Anders Jenbo <anders@jenbo.dk>
 2019-11-01 00:20:03 +01:00
Anders Jenbo
215ff59e65 Merge branch 'master' of github.com:diasurgical/devilution 2019-11-01 00:06:53 +01:00
Mathieu Maret
fdf4384640 Center Loading screen 2019-10-31 23:38:09 +01:00
galaxyhaxz
67fedd9e99 Fix unknown struct field and drawpanflag 2019-10-31 22:57:15 +01:00
Anders Jenbo
760aaa8b37 Smoother and faster loading 
Predictable: Always have the same number of steps in the progress bar
Faster: Increate size of steps to fit with the number of steps
 2019-10-20 15:59:47 +02:00
Anders Jenbo
ad7a621e5f Drop PitchTbl to avoid resolution restriction 2019-10-20 15:59:47 +02:00
Anders Jenbo
a0baa92ef0 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-13 19:59:26 +02:00
Anders Jenbo
6597688eac Rename cell functions 2019-10-13 13:31:56 +02:00
Robin Eklind
d16f603537 all: remove unused storm imports 
While no storm functions are called from these source files
it is determined that they included storm in the original
source files as made visible by the inclusion of infinity
in the data segments of the respective source files.

ref: diasurgical/devilution#1695.
 2019-09-20 11:05:25 +02:00
Anders Jenbo
98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +02:00
Robin Eklind
0e4d4104a7 interfac: rename progress_bar_colours and progress_bar_screen_pos to BarColor and BarPos 
Rationale described in sanctuary/notes@cb8812d1a6
as included below:

Note, the BarColor and BarPos globals don't have
PSX debug info. However, the progress bar is
referred to as "barfoo" in other parts of the
PSX debug info, e.g.

	// register: 21
	register unsigned char barr;
	// register: 16
	register unsigned char barg;

Thus, we apply a similar naming convention for BarColor
and BarPos, using CamelCase as is conventional for global
variables in Diablo 1.
 2019-08-18 07:45:07 +02:00
Anders Jenbo
60ee365dff Merge branch 'master' of github.com:diasurgical/devilution 2019-07-20 19:52:50 +02:00
Anders Jenbo
3bc8ba66b0 Use defines for more screen geometry values 2019-07-20 17:10:49 +02:00
Xadhoom
148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00:00
Anders Jenbo
32a51d17ca Align function signatures with PSX symbols 
Using
https://github.com/diasurgical/scalpel/tree/master/psx/_dump_/3/_dump_c_src_/diabpsx/source
as a reference
 2019-07-08 04:12:12 +02:00
Anders Jenbo
f187fe7d3a Merge branch 'master' of github.com:diasurgical/devilution 2019-06-22 18:14:48 +02:00
Anders Jenbo
a7788ccddf Format bin exact code 2019-06-17 04:55:41 +02:00