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

456 commits

Author SHA1 Message Date
pionere
3137d0c0cf
 		use pnum instead of myplr in bone chamber (#835) 2021-02-19 15:10:32 +01:00
Anders Jenbo
60d3e9ceb1 Clean up rendering 2021-02-19 03:05:12 +01:00
qndel
ab9911064f unify checks for single and multiplayer 2021-02-18 22:32:01 +01:00
galaxyhaxz
b64beca78b Several quest fixes 2021-02-13 02:01:24 +01:00
qndel
c0f5749728 Fix RNG diverging during level generation depending on the code path 
The consequences has mostly mitigated after wards, but this will make things make more sens when analysing the state of the code.
 2021-02-01 06:44:16 +01:00
Anders Jenbo
93b82e3b7a Fix regression of static lights from fix of dynamic ones 
This issue was introduced in 1f532040a8
 2021-01-31 14:00:22 +01:00
Anders Jenbo
7313b10cfa Fix Archbishop Lazarus entering a broken state when taking the teleport again 
Fixes #889
 2021-01-31 07:38:43 +01:00
Anders Jenbo
a1281d8b54 [hellfire] Fix bugs related to using the wrong player index 
- Firewall damage was incorrect for player 0 (host or single player)
- Town Shrine would always cast TP from the host instead of the user
- Oily Shrine and Sparkling Shrine would cast there traps as player 0
- The farmer would always think he was talking to the local player
 2021-01-23 19:10:15 +01:00
Anders Jenbo
46e73d3d89 Merge branch 'master' of github.com:diasurgical/devilution 2021-01-23 03:51:31 +01:00
Anders Jenbo
b6a5a413e7 Fix lvl3 door appearing wrong when opened by other players 2021-01-23 03:50:32 +01:00
Anders Jenbo
ed825ba102 Apply bugfix to SHRINE_ENCHANTED 2021-01-09 19:37:21 +01:00
Anders Jenbo
f9aacc8704 Merge branch 'master' of github.com:diasurgical/devilution 2021-01-09 19:36:09 +01:00
Anders Jenbo
8c261d0966 Merge remaning clean Hellfire code paths 2021-01-09 19:04:31 +01:00
Anders Jenbo
c7b32ec4e4 Clean ups 2021-01-08 21:23:00 +01:00
Anders Jenbo
0c96e32f19 Unify all defines, enums and structs 2021-01-08 20:53:06 +01:00
Anders Jenbo
6f8f4c3293 Unify another chunk of simple Hellfire code paths 2021-01-07 07:19:07 +01:00
Anders Jenbo
e609e170d0 Merge a large chunk of Hellfire the code paths 2021-01-06 08:07:20 +01:00
Anders Jenbo
c802cbdc4d Merge more Hellfire code paths 2021-01-05 23:14:35 +01:00
Anders Jenbo
5bdbf18902 Merge branch 'master' of github.com:diasurgical/devilution 2021-01-05 22:44:11 +01:00
Anders Jenbo
2467a982a1 [hellfire] SyncL1Doors 2021-01-04 20:01:38 +01:00
Anders Jenbo
201df84849
 		Clean up OperateShrine (#2193) 2021-01-04 18:59:26 +01:00
Anders Jenbo
67923c4c60 [hellfire] SyncObjectAnim 2021-01-04 02:08:31 +01:00
Anders Jenbo
e2a98b75fe Clean up some magic values 2021-01-02 22:34:32 +01:00
Anders Jenbo
e33914c0c8 Merge branch 'master' of github.com:diasurgical/devilution 2021-01-01 22:57:37 +01:00
Anders Jenbo
aa154e5231 Clean up LoadMapObjects 2021-01-01 21:09:25 +01:00
Anders Jenbo
aa3c0242e7 Merge branch 'master' of github.com:diasurgical/devilution 2020-12-31 02:12:23 +01:00
Anders Jenbo
74849d48bd [hellfire] PlayerMHit 2020-12-30 20:41:32 +01:00
Anders Jenbo
d20eddf48e Unifcy a chunk of Hellfire's code pathts 2020-12-28 01:11:25 +01:00
Anders Jenbo
61b2d0de95 Merge branch 'master' of github.com:diasurgical/devilution 2020-12-16 02:24:39 +01:00
qndel
c4c2e0420c
 		spell defines and macros (#2162) 2020-12-04 19:18:22 +01:00
qndel
7f7ae623df
 		Goe (#2163) 
* proper random_ comparisons
* proper mienemy comparisons
* add mienemy/micaster enum
* GOE enum
 2020-12-04 19:16:58 +01:00
Anders Jenbo
38dbcf7641 Format source 2020-12-02 00:52:38 +01:00
qndel
a2dc735f6b some cleanup 2020-11-23 17:04:50 +01:00
qndel
73dce4fa39 minor cleanup 2020-11-12 15:13:01 +01:00
qndel
471d9261a5 3 obj functions 2020-11-12 15:13:01 +01:00
Anders Jenbo
4ae75753c8 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-09 01:24:02 +01:00
qndel
3ce3dedd4d
 		Cleanup (#2147) 2020-11-07 12:34:07 +01:00
Anders Jenbo
377e9a3383 Reorder objects.cpp 2020-11-04 20:14:58 +01:00
qndel
c94c04d049
 		some cleanup (#2146) 2020-11-04 03:33:40 +01:00
Anders Jenbo
43b5dea6e5 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-03 00:56:51 +01:00
qndel
c3380d3104 some cleanups 2020-11-03 00:04:07 +01:00
Anders Jenbo
72e2637061 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-25 17:38:06 +01:00
Gleb Mazovetskiy
ec329e645c Fix all "no-write-strings" warnings 2020-10-25 15:37:51 +01:00
Anders Jenbo
e90f84dd03 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-22 22:14:49 +02:00
qndel
36dba1cc1c
 		cleanup (#2127) 2020-10-22 17:26:24 +02:00
Anders Jenbo
e073422ce7 Unify executable for Spawn and Retail 
The game will now autodetect if it should run in shareware mode or full
retail based on the found mpq file. Additionally it can beforced in the
shareware mode with --spawn even if the retail data is found.

This simplifies a lot of the spagetty code and lets us better refactor,
also worth noteing is that we won't have to setup a secound set of build
tests.
 2020-10-20 19:42:01 +02:00
Anders Jenbo
09a51aa300 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-18 15:25:51 +02:00
Anders Jenbo
5e535c43bb
 		Update Source/objects.cpp 2020-10-16 23:50:21 +02:00
Chance4us
2477d956e9 [hellfire] correct the name for barrels 2020-10-16 22:51:32 +02:00
Anders Jenbo
ad2ac2aeeb Merge branch 'master' of github.com:diasurgical/devilution 2020-10-15 03:55:36 +02:00