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

50 commits

Author SHA1 Message Date
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
f1d54cee52 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-23 18:12:54 +02:00
Anders Jenbo
26d7327b1f
 		Cleanup (#1200) 
* Clean up effects.cpp
* Clean up monster.cpp
* Clean up codec.cpp
 2019-05-21 00:34:42 +01:00
Anders Jenbo
73a29f0e68 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-18 16:55:20 +02:00
Anders Jenbo
f006952465 Apply sfx_flag to sgSFX 2019-05-13 18:55:04 +01:00
qndel
d2f12de6b8 sound_stop bin exact (#1172) 2019-05-13 02:12:29 +01:00
qndel
b94b79f8e2 RndSFX bin exact 2019-05-13 02:06:41 +01:00
galaxyhaxz
7fcbc7319c Fix merged function sound_update 2019-05-12 22:37:11 +01:00
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
540892ff9d Preliminary support for fixed header files 2019-04-21 17:20:38 +02:00
galaxyhaxz
4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
Anders Jenbo
a907a4d49b Merge branch 'master' of github.com:diasurgical/devilution 2019-04-05 15:21:53 +02:00
galaxyhaxz
5238265702
 		Implement assert support (#791) 2019-03-29 21:26:37 -05:00
Anders Jenbo
bc26a2f730 Merge branch 'master' of github.com:diasurgical/devilution 2019-03-18 21:52:35 +01:00
Anders Jenbo
fda317a24e Clean up storm/sound_update (#663) 2019-03-18 11:23:24 +09:00
Anders Jenbo
8e6276da58 Update documentation and build script 2019-03-17 00:39:07 +01:00
Xadhoom
8eebc8c7a4 Merge branch 'master' 2019-03-16 14:47:36 +00:00
Anders Jenbo
7ba8351bc3 Fully implement SFileDda* 
fixes #24
fixes #22
 2019-03-16 15:36:42 +01:00
Xadhoom
5283a9ffd1 Put everything into namespace dvl 2019-03-11 20:10:23 +00: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
Anders Jenbo
1fd31b7df5 Fix menu audio 
Ui code is moved to the correct file so that it is initialized after the
audio. This also rebases effects.cpp on the upstream as this fixes some
issues we where having. WinMain has also been rebased.
 2019-01-20 15:29:13 +01:00
Anders Jenbo
841f5af199 Compile effects.cpp and wave.cpp as C (#530) 
* Correct SFileReadFile signature

* Compile as C

Source/effects.cpp
Source/wave.cpp

* Make diabloui.h C frindly
 2018-12-30 19:22:40 +01:00
Anders Jenbo
b5f69dccdc C compatability from d-p (#519) 2018-12-29 17:54:22 +01:00
galaxyhaxz
24285a220f
 		WinMain+Direct file access from HDD (#456) 2018-11-09 16:22:56 -06:00
Anders Jenbo
0fb5c0bf9c Additional tab indentation 2018-10-27 17:38:40 +02:00
Anders Jenbo
b1f6d3698f Update style to use tabs 2018-10-25 22:53:04 +02:00
Anders Jenbo
596f244f50 Align structured data tables 2018-10-23 19:28:22 +02:00
Anders Jenbo
87ef2f91e7 Format mostly cleaned files 2018-10-22 01:56:10 +02:00
Anders Jenbo
8e2d0df643 Clean up some bools 2018-10-18 20:32:44 +02:00
Anders Jenbo
46897e9c6e Correct a couple of values (#389) 2018-10-06 16:46:52 +02:00
Anders Jenbo
226fbc68b0 effects_cleanup_sfx & stream_update (#375) 
* effects_cleanup_sfx & stream_update

* effects_play_sound

* effect_is_playing, PlaySFX, PlaySfxLoc & effects_play_sound
 2018-10-06 14:28:04 +02:00
nomdenom
d14bf20467 Source: NO_GLOBALS support (for Miniwin) 2018-10-01 21:31:47 -07:00
Anders Jenbo
f269f4561b PlaySFX_priv, stream_play (#371) 
* PlaySFX_priv, stream_play

* Fix build warnings in player.cpp

* Clean up FreeMonsterSnd

* Added more enums and defines for sound and effects.
 2018-10-02 00:02:12 +02:00
Anders Jenbo
5df6a0d771
 		Sound.cpp (#353) 
* Clean up of sound.cpp
* Fix builds that don't support max()
 2018-10-01 03:31:39 +02:00
Anders Jenbo
afbe7a5ffa sfx_stop, InitMonsterSND, FreeEffects, PlayEffect and calc_snd_position 2018-10-01 01:03:17 +02:00
galaxyhaxz
38b498ac4b
 		Add 'const' to data to match original binary (#200) 2018-09-09 15:40:23 -05:00
galaxyhaxz
fa64b2148d
 		Add defines [W.I.P] (#160) 2018-08-15 22:13:15 -05:00
galaxyhaxz
a336c38226
 		Fix random(idx,v) calls (#157) 2018-08-10 22:45:32 -05:00
galaxyhaxz
49a6f4f9fc
 		Add include guards, prepare for XRef (#28) 
Add definitions, other junk.
 2018-06-20 05:17:44 -05:00
galaxyhaxz
bb01c6f084
 		Remove the "fear factor" (#21) 
Snakes, spiders, Demons, what scares you?
 2018-06-18 19:16:32 -05:00
galaxyhaxz
dde68ff89e
 		Add files via upload 2018-06-06 21:25:54 -05:00