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

61 commits

Author SHA1 Message Date
Anders Jenbo
4e8a8d2157 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-26 13:43:28 +02:00
Robin Eklind
e155a9423e rename random to random_ to avoid collision with random in stdlib.h 
Fixes #1813.
 2019-10-21 09:56:36 +02:00
Anders Jenbo
ba9288c6cf Unify error dialogs, for looks and portability 
- Use UiOkDialog() to display all error messages
- Add SDL simple message, and console fallbacks to UiOkDialog()
- Boot graphics early on to facilitate most error messages with build in
gui
- Some more miniwin clean ups
 2019-10-06 01:27:11 +02:00
Anders Jenbo
1d03064fee Clean up sound code 2019-09-25 11:32:30 +02:00
Anders Jenbo
14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
Anders Jenbo
10c33575ac Clean ups from hellfire branch 2019-08-31 07:35:04 +02:00
Anders Jenbo
98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +02:00
Robin Eklind
fab7f1b5fa effects: rename monster_action_sounds to MonstSndChar 
Rationale described in f609ea371d:
as included below:

Note, the PSX sym file does not seem to include the
original name for monster_action_sounds. However, it
does include the names for very similar global
variables used for players rather than monsters, so
from these we may infer a similar name for
monster_action_sounds.

In particular, ArmourChar, WepChar and CharChar are
used for player graphics. So, following the same naming
convention we arrive at MonstSndChar.
 2019-08-18 07:44:22 +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
aa50489569 Clean up generated comments 2019-07-21 00:57:53 +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
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