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

183 commits

Author SHA1 Message Date
Anders Jenbo
d840f388c7 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-08 22:05:10 +02:00
Robin Eklind
9bf8332d48
 		Merge pull request #1360 from diasurgical/ui_consts 
Ui consts
 2019-10-07 22:54:54 +02:00
Anders Jenbo
d2b1f0cfc8 Apply the Cel helper functions in a few more places 2019-09-30 11:50:18 +02:00
Anders Jenbo
fae2be813a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-28 04:31:04 +02:00
Anders Jenbo
ce6fc51b50 Implement CelGetFrame (CEL decoder helper) 
This implements the first of the inlined CEL decoder helper functions
that are still visable in the Mac port code.

Functions are still bin exact
 2019-09-27 21:02:44 +02:00
qndel
12435a9317 SetSpell cleanup 2019-09-18 00:35:20 +02:00
Anders Jenbo
14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
Anders Jenbo
cf359d9ea2 Remove server chat 2019-09-13 03:56:47 +02:00
qndel
522f8f07c6 DrawTalkPan cleanup 2019-09-12 11:22:07 +02:00
qndel
4605c6096f control_up_down cleanup 2019-09-12 11:21:18 +02:00
Anders Jenbo
e24cbb2423 Clean up init_disable_screensaver 2019-09-01 05:59:44 +02:00
Anders Jenbo
27e3696df4 Use consts for drawing ui 2019-08-27 17:55:17 +02:00
Anders Jenbo
1f715f86f6 Clean up 2019-08-27 17:06:54 +02:00
Anders Jenbo
dd8df33785 Format source 2019-08-26 15:08:03 +02:00
Anders Jenbo
efc5f4570f Remove duplicate code from control.cpp 2019-08-26 14:52:03 +02:00
Anders Jenbo
f605138c79 Strip ASM code 2019-08-26 13:33:03 +02:00
Anders Jenbo
98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +02:00
Robin Eklind
98e97351b9 control: rename attribute_inc_rects to ChrBtnsRect 
Rationale described in sanctuary/notes@541e63f85a
as included below:

Note, the ChrBtnsRect global doesn't have PSX debug info.
However, the functionality correspond to that of InvRect
of inv.h. Moreover, the we may infer the name from the
function CheckChrBtns, and simply combine the two names.
 2019-08-18 07:44:52 +02:00
Anders Jenbo
68d51e7d27 Implementing Spawned Shareware version 2019-08-12 16:04:20 +02:00
Anders Jenbo
2fcf8dab70 Merge branch 'master' of github.com:diasurgical/devilution 2019-07-21 19:39:17 +02:00
Anders Jenbo
9d3ce818f0 Correct BOOLS 2019-07-21 19:11:11 +02:00
Anders Jenbo
5ab9f4609a Clean up signedness 2019-07-21 00:57:53 +02:00
Anders Jenbo
e2bff090d6 Come up with names for all remaning arguments 2019-07-21 00:57:53 +02:00
Anders Jenbo
aa50489569 Clean up generated comments 2019-07-21 00:57:53 +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
Robin Eklind
4cbf8c9ec3 Rename global pCelBuff to pSPentSpn2Cels 
This is to avoid confusion, as pCelBuff is also
commonly used as a parameter name.

The naming follows the convention used by
TextBox2.CEL and TextSlid.CEL, as seen in
stores.cpp

	pSTextBoxCels = LoadFileInMem("Data\\TextBox2.CEL", NULL);
	pSPentSpn2Cels = LoadFileInMem("Data\\PentSpn2.CEL", NULL);
	pSTextSlidCels = LoadFileInMem("Data\\TextSlid.CEL", NULL);
 2019-07-16 02:13:16 +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
Anders Jenbo
e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Duarte Alvim
6a4142fb08 Add gold constants 2019-06-16 02:24:09 +02:00
Anders Jenbo
328c74b626 Correct called methode 2019-06-09 01:35:55 +02:00
Anders Jenbo
334c06c6d3 Correct type in calls to AddPanelString 2019-06-08 13:06:26 +02:00
Anders Jenbo
a369eb8d46 Fix DrawSpellList 2019-06-08 12:01:58 +01:00
Manuel K
97c1edd3a0 Use BUFFER_WIDTH 2019-06-05 20:13:34 +02:00
Anders Jenbo
8cb04b0d9b Merge branch 'master' of github.com:diasurgical/devilution 2019-06-02 19:11:49 +02:00
Manuel K
df1d049ae3 Use SCREEN_Y 2019-06-02 18:08:09 +01:00
Manuel K
896933f55e Replace magic number 352 with VIEWPORT_HEIGHT (#1232) 2019-06-02 17:51:33 +01:00
Sergey Semushin
ef97e8cc43 Make control_remove_gold bin exact. 2019-05-31 20:18:12 +01:00
Anders Jenbo
56dcdd669b Clean up DrawChr 2019-05-31 16:03:03 +01:00
Anders Jenbo
ce056b02d8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-30 14:40:33 +02:00
Sergey Semushin
d218b5e3ae Clean up DrawTalkPan. 2019-05-30 00:02:13 +01:00
Sergey Semushin
4c5748a0c5 Clean up control_press_enter. 2019-05-27 08:38:43 +01:00
Anders Jenbo
c20cf78333 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-26 19:12:41 +02:00
Anders Jenbo
035d6b146c
 		Clean up DrawInfoBox (#1211) 2019-05-26 15:55:15 +01:00
Anders Jenbo
6439861554 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-26 14:59:30 +02:00
Sergey Semushin
ca3841a7dc Clean up DrawSpellList. 2019-05-26 13:55:34 +01:00
Anders Jenbo
73a29f0e68 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-18 16:55:20 +02:00