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

241 commits

Author SHA1 Message Date
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
Anders Jenbo
d6f70c56ce Format files 2020-03-01 22:48:17 +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
58e3192ef9 Merge branch 'master' of github.com:diasurgical/devilution 
Fixes #620
 2020-02-29 18:18:45 +01:00
galaxyhaxz
81ff8e6287 Metallic hydrogen neural array 2020-02-28 16:35:57 -06:00
qndel
d51eee6916 CheckPanelInfo cleanup 2020-02-17 20:59:02 +01:00
Anders Jenbo
9c06b7f60c Merge branch 'master' of github.com:diasurgical/devilution 2020-02-16 05:08:40 +01:00
Anders Jenbo
f1616060e5 Document CL2 render functions 2020-02-15 17:06:31 +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
c2587d9786 use enums (#1997) 2020-01-28 17:33:34 +01:00
Gleb Mazovetskiy
3ae1dc3037 Source/control.cpp: snprintf instead of SDL_itoa 
SDL_itoa doesn't exist in Amiga SDL
https://github.com/diasurgical/devilutionX/pull/397#discussion_r371039612
 2020-01-27 09:43:28 +01:00
Gleb Mazovetskiy
ce5c1007a2 Controller improvements: START modifier and hints 
1. Makes START a modifier key.
2. Main modifier actions are now displayed as hints while the modifier is pressed.
3. Mouse simulation now available on all controllers:
   SELECT + D-Pad to move mouse
   SELECT + Left/Right should button to click

 START +    | Action
 ---------- | ------
 SELECT     | Menu
 UP         | Menu
 DOWN       | Map
 LEFT       | Character info
 RIGHT      | Inventory
 B (Bottom) | Spell book
 Y (Left)   | Quest log

This makes all actions available on controllers without sticks and ZL/ZR.
 2020-01-25 16:37:50 +01:00
qndel
3008439bc7 enums and stuff 2020-01-15 15:46:21 +01:00
Marco
29b9c99e5a added some more values from enums (#1955) 2020-01-14 17:30:13 +01:00
Anders Jenbo
40d272241b Implement --data-dir for setting mpq path 
This also implements a much cleaner version of diablo_parse_flags
Fixes #219
 2019-12-27 02:05:16 +01:00
Anders Jenbo
da03bae69d Merge branch 'master' of github.com:diasurgical/devilution 2019-12-25 20:38:25 +01:00
Anders Jenbo
0c90ad0527 Set bool values TRUE/FALSE 2019-12-22 23:57:10 +01:00
Anders Jenbo
9a704ff2f0 Merge branch 'master' of github.com:diasurgical/devilution 2019-12-19 01:05:01 +01:00
Anders Jenbo
5fa0c5781b Backport cleanups from Hellfire branch 2019-12-15 06:14:57 +01:00
qndel
981c9b9c00 some cleanup (#1823) 2019-12-02 13:18:45 +01:00
galaxyhaxz
6c0bc83115 Fix type for panelstr 2019-12-01 22:15:31 -06:00
Anders Jenbo
af0a7c0653 Apply SPANEL_WIDTH 2019-11-10 22:35:17 +01:00
Anders Jenbo
f4496aa7f9 Merge branch 'master' of github.com:diasurgical/devilution 2019-11-09 21:27:06 +01:00
Anders Jenbo
cd0a75480d Decompose numbers in DrawSpellList 2019-11-09 21:07:54 +01:00
Anders Jenbo
505701fd48 Decompose numbers in DoSpeedBook 2019-11-09 21:07:54 +01:00
Anders Jenbo
0a882c19a1 Merge branch 'fix_clicking' of https://github.com/qndel/devilutionX 2019-11-09 17:49:39 +01:00
qndel
2afc5862a0 fix chat (#432) 2019-11-09 17:38:33 +01:00
qndel
692a58d324 move speedbook above main panel 2019-11-08 01:21:07 +01:00
qndel
0e0d2d3c34 small fix 2019-11-07 22:56:09 +01:00
qndel
6ec916bbb8 center speedbook horizontally 2019-11-07 22:54:59 +01:00
Anders Jenbo
dbc91ae036 Correct mouse interactions for game controller 2019-11-06 02:13:07 +01:00
Anders Jenbo
215ff59e65 Merge branch 'master' of github.com:diasurgical/devilution 2019-11-01 00:06:53 +01:00
galaxyhaxz
67fedd9e99 Fix unknown struct field and drawpanflag 2019-10-31 22:57:15 +01:00
Gleb Mazovetskiy
b18fe49d0a Fix OOB in DrawSpell (#405) 
The OOB here was in `_pSplLvl[spl]`.

The value of SPL_INVALID is is `-1`.
The fix is to not access the array when `spl == SPL_INVALID`.
 2019-10-30 02:02:35 +01:00
Anders Jenbo
72fbb97dc4 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-30 02:00:58 +01:00
Gleb Mazovetskiy
1b24dac942 Add BUGFIX comment in DrawSpell 2019-10-30 00:30:17 +01:00
Anders Jenbo
5a65eec646 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-28 04:31:30 +01:00
Anders Jenbo
048429b4cd Apply more constants 2019-10-28 04:29:39 +01:00
Anders Jenbo
d46ae517d0 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-28 03:14:06 +01:00
Anders Jenbo
71adfe509e Document more attributes 2019-10-28 03:05:40 +01:00
Anders Jenbo
4e8a8d2157 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-26 13:43:28 +02:00
falquinho
c65060ccad Some comments on control functions. 2019-10-26 00:45:11 +02:00
Anders Jenbo
92ab05ea13 Decompose more magic numbers 2019-10-26 00:24:55 +02:00
Mathieu Maret
e35b00acd9 Simplify few loops by using memcpy 2019-10-22 01:33:46 +02:00
Anders Jenbo
3e7d352fde Format files 2019-10-21 20:04:14 +02:00
Anders Jenbo
2348c3a8fd Documentations, enums and clean ups 2019-10-21 19:33:14 +02:00
Anders Jenbo
0d7f87630b Remove width from info panel sy value 
This was left behind when doing 337bc9b125
 2019-10-20 19:23:20 +02:00