Commit graph

81 commits

Author SHA1 Message Date
Xadhoom
6856fb74e2 Merge upstream beanch 'devilution/master' 2019-04-25 20:44:01 +00:00
Anders Jenbo
65b9fb87a8 Merge branch 'TownDead' 2019-04-24 14:08:25 +02:00
galaxyhaxz
3a636fdcc6
Add missing functions for MI_Dummy (#1004) 2019-04-22 20:21:52 -05:00
galaxyhaxz
777c517b8e Change ASM macro 2019-04-22 02:23:12 -05:00
galaxyhaxz
540892ff9d Preliminary support for fixed header files 2019-04-21 17:20:38 +02:00
galaxyhaxz
740e91e881 rename screen_y_times_768 2019-04-19 04:05:55 +02:00
Robin Eklind
aefddd13d1
Merge pull request #866 from AJenbo/CelDecodeHdrLightTrans
Clean up CelDrawHdrLightRed
2019-04-16 01:42:51 +09:00
galaxyhaxz
cef65ea0b6 Implement Critical section constructor 2019-04-15 01:16:43 +02:00
Anders Jenbo
a592838d42 Clean up CelDecodeHdrLightTrans 2019-04-09 13:51:19 +02:00
galaxyhaxz
4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
galaxyhaxz
63b0a9fb04 Cel2DrawHdrLightRed 2019-04-08 18:56:23 +02:00
Anders Jenbo
8387d0fb97 Align code style in engine.cpp 2019-04-08 03:42:50 +02:00
Anders Jenbo
53cd38a8e8 Clean up Cel2DecodeHdrLight 2019-04-08 03:42:34 +02:00
Anders Jenbo
eb90aa182a Clean up CelDecodeHdrLightTrans 2019-04-08 00:56:33 +02:00
Anders Jenbo
46f83455be Clean up variable naming in engine.cpp 2019-04-08 00:32:33 +02:00
Anders Jenbo
1af8fc330f Clean up Cel2DecodeLightTrans 2019-04-08 00:10:07 +02:00
Anders Jenbo
4d6d0d8592 Clean up CelDecodeHdrLightOnly 2019-04-08 00:00:09 +02:00
Anders Jenbo
e7d5aac5dc Clean up engine and scrollrt attribute naming 2019-04-07 21:17:59 +02:00
Anders Jenbo
d8bb37349e Merge branch 'master' of github.com:diasurgical/devilution 2019-04-06 04:34:49 +02:00
Anders Jenbo
d2174e3454 Apply code style 2019-04-05 21:54:45 +02:00
Anders Jenbo
a907a4d49b Merge branch 'master' of github.com:diasurgical/devilution 2019-04-05 15:21:53 +02:00
galaxyhaxz
d879a325e1
Fix dTransVal and pLightTbl (#825) 2019-04-02 14:19:28 -05:00
galaxyhaxz
5238265702
Implement assert support (#791) 2019-03-29 21:26:37 -05:00
Anders Jenbo
189ce6ec2f Merge branch 'master' of github.com:diasurgical/devilution 2019-03-20 00:00:39 +01:00
galaxyhaxz
9afd45cbea Fix crash in draw town (#692) 2019-03-20 00:48:36 +09:00
galaxyhaxz
f388472713 ENG_set_pixel + engine_draw_pixel (#691) 2019-03-19 18:57:23 +09:00
Anders Jenbo
bc26a2f730 Merge branch 'master' of github.com:diasurgical/devilution 2019-03-18 21:52:35 +01:00
galaxyhaxz
befd52c003 Fix type for 'gpBuffer' (#672) 2019-03-18 22:28:38 +09:00
Anders Jenbo
d5a06dcbc1 Merge branch 'master' of github.com:diasurgical/devilution into working
Fixes #38
2019-03-18 00:16:01 +01:00
galaxyhaxz
0bb9f666b3
Clean remaining .CEL functions (#657) 2019-03-17 15:56:53 -05:00
Xadhoom
83d902c4a4 Merge branch 'master' 2019-03-16 12:37:02 +00:00
Anders Jenbo
f4ca51f684 Merge branch 'master' of github.com:diasurgical/devilution 2019-03-16 04:21:50 +01:00
galaxyhaxz
9e4885a955
Cleanup CL2 functions (#656) 2019-03-15 21:56:04 -05:00
galaxyhaxz
81f3f5daa2 Cleaning Engine CEL functions (#652)
* Cleaning Engine CEL functions

* Fix C functions
2019-03-14 10:47:39 +09:00
Xadhoom
5283a9ffd1 Put everything into namespace dvl 2019-03-11 20:10:23 +00:00
Max Desiatov
e748b7754f Fix macOS compilation errors (#28)
* Fix macOS compilation errors
2019-03-08 21:08:30 +01:00
Anders Jenbo
f17e923ab8 Merge branch 'master' of github.com:diasurgical/devilution 2019-03-08 03:12:02 +01:00
Max Desiatov
269aa345bd Fix downstream 64-bit builds 2019-03-08 03:07:21 +01:00
Xadhoom
15341fdae3 More temporary 64 bit fixes; we can walk in town 2019-01-27 20:45:27 +00:00
Anders Jenbo
1e4e826a36 Remove delta to devilution 2019-01-23 17:11:52 +01:00
Xadhoom
fa90e6720a Revert random_ to random and remove extern "C" linkage 2019-01-21 20:39:55 +00:00
Xadhoom
3dd6cf1671 First try, merge compiles, but immediate crash 2019-01-21 09:48:53 +00:00
Xadhoom
cadef0d942 Merge upstream branch 'devilution/master' 2019-01-21 09:44:54 +00:00
aperturesecurity
c7b07fe94d make resizing window and cleaned up a few things 2019-01-15 19:45:42 +02:00
Anders Jenbo
9b7da61dcf Auto format src 2019-01-13 18:55:59 +01:00
Anders Jenbo
54247a076c C init (#549)
* Make initializers C compatible

* Compile more files as C

dthread.cpp dx.cpp init logging.cpp fault.cpp msgcmd.cpp nthread.cpp

* Update defs.h
2019-01-10 21:39:28 +01:00
Anders Jenbo
ca64011eb9
Replace __ROR4__ stdlib, make _ROR2__ C frindly (#540)
* Use stdlib _rotr instead of inline asm
* Compile control.cpp as C
This also makes qmemcpy avalible to the C compiler
2019-01-06 03:23:43 +01:00
Anders Jenbo
fd2a45ff9a
Engine.cpp (#548)
* Clean up DiabloAllocPtr

* Clean up mem_free_dbg

* Clean up GetDirection

* Clean up PlayInGameMovie

* 18 directions
2019-01-03 02:29:31 +01:00
Anders Jenbo
19f1bd6b61 Clean up LoadFileInMem (#547) 2019-01-03 01:13:59 +01:00
Anders Jenbo
e795b6116a Make use of atexit() C compatible (#537) 2019-01-01 03:05:29 +01:00