30-Apr-2015 (Thursday) at 00:02:10 PDT by coelckers

Commit c2e91293d
Parents: 7d90c6542 43053b89a

Merge pull request #310 from MajorCooke/telefogfix

• Allow teleport fogs to set the teleporting actors as their targets, so...

29-Apr-2015 (Wednesday) at 07:27:46 PDT by Christoph Oelckers

Commit 21993b348
Parents: f273b6c46 7d90c6542

Merge branch 'master' of https://github.com/rheit/zdoom

29-Apr-2015 (Wednesday) at 02:28:04 PDT by Christoph Oelckers

Commit 7b6b473ec
Parents: 1effaa4c8

• some GCC fixed by Edward-san.

29-Apr-2015 (Wednesday) at 01:53:37 PDT by Christoph Oelckers

Commit 1effaa4c8
Parents: 4c17bd65a 7d90c6542

Merge branch 'master' into scripting

28-Apr-2015 (Tuesday) at 23:42:54 PDT by Christoph Oelckers

Commit 7d90c6542
Parents: 3c1fa3bed

• mask out Strife mapthing flags when starting an original Hexen map.

28-Apr-2015 (Tuesday) at 16:03:50 PDT by Christoph Oelckers

Commit 4c17bd65a
Parents: e42b688af

• parameters for FRandomPick should not be added up.

(I hope that this code is correct, all I can judge it by is the assert not being triggered.)

28-Apr-2015 (Tuesday) at 15:19:21 PDT by Christoph Oelckers

Commit 3c1fa3bed
Parents: a2100410f

• fixed some GCC warnings.

28-Apr-2015 (Tuesday) at 14:37:04 PDT by Christoph Oelckers

Commit e42b688af
Parents: 646c135ef

• finally found the reason why the garbage collector went haywire after a restart: PClass::StaticShutdown set the PClass::bShutdown variable which disables much of the garbage collector. This needs to be cleared after successful cleanup. Restart works now, except for some random CCMDs being executed right afterward.
• fixed incorrect variable init in A_Face* functions which was missed before.

28-Apr-2015 (Tuesday) at 14:04:10 PDT by Christoph Oelckers

Commit 646c135ef
Parents: 407d38f3d a2100410f

Merge branch 'master' into scripting

Conflicts:

• src/m_cheat.cpp
• src/p_acs.cpp
• src/thingdef/thingdef_codeptr.cpp
• src/thingdef/thingdef_properties.cpp

28-Apr-2015 (Tuesday) at 13:13:50 PDT by Christoph Oelckers

Commit a2100410f
Parents: f087903fc

• fix in GL nodes loader.

28-Apr-2015 (Tuesday) at 13:11:43 PDT by Christoph Oelckers

Commit f087903fc
Parents: 15fbf2510

• remove some redundancy from TeleportFog code.

28-Apr-2015 (Tuesday) at 13:06:50 PDT by coelckers

Commit 15fbf2510
Parents: ce4adc48a 92fe265ab

Merge pull request #320 from edward-san/clang_3_5_crash_solved

• Clang 3.5.1+ fixed the compiler bug in ACS code.

28-Apr-2015 (Tuesday) at 13:06:31 PDT by coelckers

Commit ce4adc48a
Parents: 319671b54 b51fac344

Merge pull request #319 from edward-san/inventory

Little TakeInventory refactoring.

28-Apr-2015 (Tuesday) at 13:05:43 PDT by Christoph Oelckers

Commit 319671b54
Parents: a93c30238

• let cheats only give weapons in weapon slots.

This avoids problems which replace the entire arsenal and don't want the original weapons in there.

28-Apr-2015 (Tuesday) at 12:54:30 PDT by Christoph Oelckers

Commit 407d38f3d
Parents: 0f8972c96

• add a bit more stuff that needs to be done before a restart to ensure that all obsolete data is taken down.

(There's still a problem with the garbage collector kicking in and deleting stuff it's not supposed to, so Restart still doesn't work)

28-Apr-2015 (Tuesday) at 12:30:12 PDT by Christoph Oelckers

Commit 0f8972c96
Parents: afa022605

• don't delete any DObjects

FraggleScript's global_script was deleted instead of destroyed.

28-Apr-2015 (Tuesday) at 10:25:06 PDT by Edoardo Prezioso

Commit 92fe265ab
Parents: a93c30238

• Clang 3.5.1+ fixed the compiler bug in ACS code.

Referring to commit 1c96039d7a1146a50b52335e0af8623f97f98415 .

28-Apr-2015 (Tuesday) at 10:03:52 PDT by Christoph Oelckers

Commit afa022605
Parents: 91b05366d

• some more fixes of 'Restart'. Still not working as intended.

28-Apr-2015 (Tuesday) at 07:39:20 PDT by Christoph Oelckers

Commit 91b05366d
Parents: 450e5aec5

• tried to make 'restart' CCMD work again.

This requires quite a bit more thorough cleanup. I got it to the point where the titlepic appears after restarting, but it still crashes when starting the game so there's more data that needs to be cleaned up...

28-Apr-2015 (Tuesday) at 06:34:13 PDT by Edoardo Prezioso

Commit b51fac344
Parents: a93c30238

Little TakeInventory refactoring.

Introduce AActor::TakeInventory, which unifies DoTakeInv from ACS and DoTakeInventory from Decorate, and AInventory::DepleteOrDestroy, which is extracted from the DoTakeInv core function, and use both where they're needed. I don't know if the differences between DoTakeInv and DoTakeInventory were intentional, so I kept both behaviors.

28-Apr-2015 (Tuesday) at 06:45:10 PDT by Christoph Oelckers

Commit 450e5aec5
Parents: 2d0f6339f

• this shouldn't have been committed.

28-Apr-2015 (Tuesday) at 06:34:48 PDT by Christoph Oelckers

Commit 2d0f6339f
Parents: 137e624b5

• fixed some memory leaks: The global symbol table and the argument list for DECORATE called action specials were never freed.

28-Apr-2015 (Tuesday) at 06:12:21 PDT by Christoph Oelckers

Commit 137e624b5
Parents: 2e0f999fe

• needed one more fix in CMake project.

28-Apr-2015 (Tuesday) at 05:45:13 PDT by Christoph Oelckers

Commit 2e0f999fe
Parents: 844799088 a93c30238

Merge branch 'master' into scripting

Conflicts:

• src/p_effect.cpp
• src/p_effect.h
• src/p_local.h
• src/p_map.cpp
• src/thingdef/thingdef_codeptr.cpp
• wadsrc/static/actors/actor.txt
• wadsrc/static/actors/shared/inventory.txt
• zdoom.vcproj

28-Apr-2015 (Tuesday) at 04:32:50 PDT by Christoph Oelckers

Commit 844799088
Parents: f7834061d 2719ce86d

Merge commit '2719ce86dc07c9f7b1ad6d61a9a49c974896abf2' into scripting

Conflicts:

• src/info.h
• src/thingdef/thingdef_codeptr.cpp
• (until right before the main work for multiple tags.)

28-Apr-2015 (Tuesday) at 04:08:18 PDT by Christoph Oelckers

Commit f7834061d
Parents: ddced06be b6a4511dd

Merge commit 'b6a4511dd1e74440fad99bc673c1f2b3680dba48' into scripting

Conflicts:

• src/dobjtype.cpp
• src/p_conversation.cpp
• src/p_local.h
• src/p_things.cpp
• src/thingdef/thingdef_properties.cpp
• (This is just the conversationID to MAPINFO stuff to keep the conflicts as small as possible)

28-Apr-2015 (Tuesday) at 03:59:20 PDT by Christoph Oelckers

Commit ddced06be
Parents: 0474560ac 6e45c565a

Merge commit '6e45c565a0bc8d05279b0b2458a3fb718ae0924c' into scripting

Conflicts:

• src/p_mobj.cpp
• (This stops right before moving the conversation IDs into MAPINFO because that feature is quite conflict-heavy and will have to merged by itself.)

28-Apr-2015 (Tuesday) at 03:54:01 PDT by Christoph Oelckers

Commit 0474560ac
Parents: 065c0a79c 2ec8e2c2a

Merge commit '2ec8e2c2ac61d30f7f1d666ec58ca0fd37e2e3b0' into scripting

Conflicts:

• src/d_main.cpp
• src/info.cpp
• src/p_local.h
• (Had to merge this all by itself because it was creating too many merge conflicts when combined with other stuff.

28-Apr-2015 (Tuesday) at 03:48:33 PDT by Christoph Oelckers

Commit 065c0a79c
Parents: 2604905b0 4f7ec3ad8

Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting

Conflicts:

• src/d_main.cpp
• src/info.cpp
• src/info.h
• src/p_acs.cpp
• src/p_interaction.cpp
• src/p_mobj.cpp
• src/thingdef/thingdef_codeptr.cpp
• src/thingdef/thingdef_properties.cpp
• (scripting branch update part 5)

28-Apr-2015 (Tuesday) at 03:03:06 PDT by Christoph Oelckers

Commit 2604905b0
Parents: 792cad89b

• missed one compile error in last merge.

28-Apr-2015 (Tuesday) at 02:59:33 PDT by Christoph Oelckers

Commit 792cad89b
Parents: 6ebdf7396 3849cb862

Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting

Conflicts:

• src/g_hexen/a_clericstaff.cpp
• src/g_hexen/a_hexenspecialdecs.cpp
• src/p_acs.cpp
• src/p_enemy.cpp
• src/p_interaction.cpp
• src/thingdef/thingdef_codeptr.cpp
• src/thingdef/thingdef_expression.cpp
• (Scripting branch update part 4)

28-Apr-2015 (Tuesday) at 01:59:50 PDT by Christoph Oelckers

Commit 6ebdf7396
Parents: a13ada3b2 8e0151b4c

Merge commit '8e0151b4c1b88eaf295042ea2d545a83b4b99acc' into scripting

Conflicts:

• src/sc_man_tokens.h
• src/thingdef/thingdef_exp.h
• src/thingdef/thingdef_expression.cpp
• (Scripting branch update part 3)

28-Apr-2015 (Tuesday) at 01:39:35 PDT by Christoph Oelckers

Commit a13ada3b2
Parents: e9cbb0b22

Revert "Merge commit '173dbd6bcee02a9e9c12a4a74d1fffe3e081d162' into scripting"

This reverts commit e9cbb0b2235bdd95db01a52f2f8f01725e29f4cb, reversing changes made to d6e3fc0567ace7f5d5754d0f43f1ef09685121de.

The merge just copied the obsolete FxFloatCast from master without any conflict so it all had to be removed again.

28-Apr-2015 (Tuesday) at 01:37:23 PDT by Christoph Oelckers

Commit e9cbb0b22
Parents: d6e3fc056 173dbd6bc

Merge commit '173dbd6bcee02a9e9c12a4a74d1fffe3e081d162' into scripting

28-Apr-2015 (Tuesday) at 00:57:01 PDT by Christoph Oelckers

Commit d6e3fc056
Parents: 7898e189d fb9231a38

Merge commit 'fb9231a38db2025eb77bfd246f36d985cbbccd2e' into scripting

Conflicts:

• src/info.cpp
• src/thingdef/thingdef_expression.cpp
• wadsrc/static/actors/constants.txt
• (Scripting branch update part 2)

28-Apr-2015 (Tuesday) at 00:40:57 PDT by Christoph Oelckers

Commit 7898e189d
Parents: 56989d342

• fixed problems in CMake project files:

• thingdef_function.cpp no longer exists
• the build rule for zcc-parse.c was not correct.

28-Apr-2015 (Tuesday) at 00:34:51 PDT by Christoph Oelckers

Commit 56989d342
Parents: 8cb269388 ec5817869

Merge commit 'ec5817869592660af6837b9f4e20ed140972a2b2' into scripting

Conflicts:

• src/p_enemy.cpp
• src/p_enemy.h
• wadsrc/static/actors/constants.txt
• (Scripting branch update part 1)

27-Apr-2015 (Monday) at 12:25:16 PDT by Christoph Oelckers

Commit f273b6c46
Parents: b4cdcef15

• fix uninitialized variable.

27-Apr-2015 (Monday) at 11:38:09 PDT by Christoph Oelckers

Commit a93c30238
Parents: c6fe0835d 9ba5e30be

Merge branch 'master' of https://github.com/rheit/zdoom

27-Apr-2015 (Monday) at 11:37:01 PDT by Christoph Oelckers

Commit c6fe0835d
Parents: 47e7a30ca

• fixed: The check for unblocking overlapping actors was a bit too lax.

The code never checked the starting position of the move and could be erroneously triggered in rare situations where the distance increased between actors but the hit boxes started overlapping because x or y distance got below the radius. Changed it so that the code only gets executed when there's already an overlap before the move.

27-Apr-2015 (Monday) at 11:15:03 PDT by Braden Obrzut

Commit 9ba5e30be
Parents: 98029a12e

• Moved autoload initialization to a separate function so that the rest of the ini can be loaded as before. Some platforms do indeed place zdoom.pk3 elsewhere.

27-Apr-2015 (Monday) at 09:20:37 PDT by Christoph Oelckers

Commit b4cdcef15
Parents: 6b1e7522e 98029a12e

Merge branch 'zmaster'

27-Apr-2015 (Monday) at 09:19:44 PDT by Christoph Oelckers

Commit 98029a12e
Parents: ae16e5d19 f3105797f

Merge branch 'master' of https://github.com/rheit/zdoom into zmaster

27-Apr-2015 (Monday) at 06:14:01 PDT by Christoph Oelckers

Commit ae16e5d19
Parents: aedd8f89c

• Assigned editor number 5006 to SkyCamCompat class, to match Eternity's definition.

27-Apr-2015 (Monday) at 08:38:50 PDT by coelckers

Commit f3105797f
Parents: 47e7a30ca 346fcf584

Merge pull request #318 from edward-san/c++11_fixes

• Fixed C++11 warnings from recent commits.

27-Apr-2015 (Monday) at 06:22:09 PDT by Edoardo Prezioso

Commit 346fcf584
Parents: 47e7a30ca

• Fixed C++11 warnings from recent commits.

27-Apr-2015 (Monday) at 06:14:01 PDT by Christoph Oelckers

Commit 6b1e7522e
Parents: 0132c639b

• Assigned editor number 5006 to SkyCamCompat class, to match Eternity's definition.

27-Apr-2015 (Monday) at 04:19:34 PDT by Christoph Oelckers

Commit 47e7a30ca
Parents: d46ba7bfb

• reshuffled some stuff to satisfy Linux compilers (hopefully)

27-Apr-2015 (Monday) at 02:00:50 PDT by Christoph Oelckers

Commit 0132c639b
Parents: 8b3045e25

• fixed: The display mode enumeration code could add a screen size multiple times if later ones had lower refresh rates.

27-Apr-2015 (Monday) at 01:24:49 PDT by Christoph Oelckers

Commit d46ba7bfb
Parents: aedd8f89c

• added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.)