Christoph Oelckers
bd5777917e
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-28 11:23:00 +02:00
Christoph Oelckers
9c2454eacc
Merge branch 'maint'
2013-08-28 11:20:53 +02:00
Christoph Oelckers
26c381224c
- removed unused constants in p_map.cpp.
2013-08-28 11:16:30 +02:00
Christoph Oelckers
f8899f98fc
- fixed: The secret counter was not incremented for items that had the UDMF COUNTSECRET flag set.
2013-08-28 11:14:48 +02:00
Christoph Oelckers
737708b635
- fix c++11's compile problems.
2013-08-28 08:33:11 +02:00
Braden Obrzut
0a16e9a256
- Fixed uninitialized variable in A_AlertMonsters.
2013-08-27 20:42:35 -04:00
Braden Obrzut
0fb37ca5f1
Merge branch 'maint'
2013-08-27 20:41:10 -04:00
Braden Obrzut
5079d6c505
- Fixed: clang 32-bit compile (I hear it still doesn't run though).
...
- Applied edward's patch to remove boolean increment.
2013-08-27 20:28:38 -04:00
Christoph Oelckers
4d3f6cae2e
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-27 23:53:40 +02:00
Christoph Oelckers
61af682be9
- made some alterations to last commit after reviewing how the broken code managed to get into GZDoom.
2013-08-27 23:53:14 +02:00
Christoph Oelckers
e6f571729f
- fixed: When calculating an y-texture offset the scale was multiplied with instead of divided by.
2013-08-27 23:31:23 +02:00
Randy Heit
6e018d0c07
Merge branch 'maint'
2013-08-25 17:34:20 -05:00
Edoardo Prezioso
7b5084df44
Shut up warnings from the customized DUMB code.
2013-08-25 17:33:48 -05:00
Edoardo Prezioso
ded1715625
- Merge DUMB commit d31fb2084659b64d07eb0644d9bacfd67059d066 to zdoom.
...
Fixed C++11 compilation error on Mac OS X
2013-08-25 17:33:36 -05:00
Christoph Oelckers
8e8f6cf5a6
- A_AlertMonsters flags submission by NeuralStunner.
2013-08-20 20:33:03 +02:00
Christoph Oelckers
9f12e5928c
- removed stencil buffer check from SDL init code because it caused a crash.
2013-08-19 08:04:31 +02:00
Christoph Oelckers
b61ef3a107
- bumped minimum supported OpenGL version to 1.4. The engine was already using several 1.3 and 1.4 features which would have caused problems on 1.2.
...
- removed gl_vid_compatibility. With the bump to 1.4 no hardware requiring this flag is supported anymore.
- disabled 16 bit framebuffers for the same reason. As a conseqence all code for rendering without stencil could also be removed.
2013-08-18 15:41:52 +02:00
Christoph Oelckers
761ab4ab78
- moved all system specific code out of gl_interface.cpp into the respective Video classes (Win32GLVideo andSDLGLVideo.) (SDL side not tested yet!)
2013-08-18 14:16:33 +02:00
Christoph Oelckers
b59d82ad5b
- made win32gliface.cpp more readable.
2013-08-18 12:38:38 +02:00
Christoph Oelckers
0a62e177d1
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-18 12:20:38 +02:00
Christoph Oelckers
116defbb35
- fixed: LookForEnemiesInBlock needs to check for MF7_NEVERTARGET.
2013-08-18 09:11:40 +02:00
Christoph Oelckers
42c9b68d47
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-14 00:32:35 +02:00
Christoph Oelckers
62830f7927
- added separate automap color for non-counting monsters.
...
- fixed: using a nonexistent CVAR in a ColorPicker menu item caused a crash.
2013-08-14 00:32:05 +02:00
Christoph Oelckers
c8b4fb0d3d
- added a 'closemenu' CCMD so that menu options that close the menu can be added.
2013-08-13 21:09:46 +02:00
Christoph Oelckers
7a87e08107
- added MF7_ALWAYSTELEFRAG flag that causes an actor to be telefragged by everything that teleports into the same place.
2013-08-13 21:01:14 +02:00
Christoph Oelckers
9ebf345fec
Merge branch 'maint'
2013-08-13 08:53:23 +02:00
Christoph Oelckers
1b79f7d956
- fixed chance default for ACS's DropItem.
2013-08-13 08:52:53 +02:00
Christoph Oelckers
36e35c0354
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-12 22:51:28 +02:00
Christoph Oelckers
3518b4dd28
- allow menu's back button and the pause sign to be animated.
2013-08-12 22:46:45 +02:00
Christoph Oelckers
61c94648dc
- added ACS CheckFlag function.
2013-08-12 22:38:52 +02:00
Christoph Oelckers
16f239536a
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-12 21:16:41 +02:00
Christoph Oelckers
ba3e57281a
Merge branch 'maint'
2013-08-12 21:12:20 +02:00
Christoph Oelckers
072b66fb9f
- fixed: The music that's defined in the Gameinfo section of MAPINFO could not set the order for multitrack music lumps.
2013-08-12 21:11:53 +02:00
Christoph Oelckers
aa03609b69
- added IF_TOSSED inventory flag.
2013-08-12 21:00:23 +02:00
Christoph Oelckers
be1a00c537
Merge branch 'maint'
2013-08-12 20:42:21 +02:00
Christoph Oelckers
e14590d8ce
- moved NOTELESTOMP to flags7. When committing I was accidentally on maint instead of master and in master flags6 was already full.
2013-08-12 20:41:33 +02:00
Christoph Oelckers
44a1b94ad9
- added MF6_NOTELESTOMP flag that prevents an actor from telefragging under all possible circumstances.
2013-08-12 20:23:54 +02:00
Christoph Oelckers
f2c250d35d
- flags7 variable added to AActor.
2013-08-12 20:09:21 +02:00
Christoph Oelckers
2bcc5cd7cc
Merge branch 'maint'
2013-08-12 09:14:18 +02:00
Christoph Oelckers
ecfe67dd78
- removed weirdness from Powerup.Strength property that was specifically tailored to its use on PowerInvisibility and made its use problematic elsewhere.
2013-08-12 09:13:55 +02:00
Christoph Oelckers
ef22bb2521
Merge branch 'maint'
2013-08-12 01:55:12 +02:00
Christoph Oelckers
3300566493
- P_DropItem's chance parameter had an incorrect default value.
2013-08-12 01:54:45 +02:00
Christoph Oelckers
9455608e21
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-11 21:05:36 +02:00
Christoph Oelckers
fabf8272e6
Merge branch 'maint'
2013-08-11 21:04:17 +02:00
Christoph Oelckers
1b2d8420bb
- DropItem for ACS.
2013-08-11 20:57:53 +02:00
Christoph Oelckers
c0174ea7cd
- Added A_DropItem for DECORATE.
2013-08-11 20:48:08 +02:00
Christoph Oelckers
35764ff3b2
- fixed: Powerup.Strength is a fixed point value, so using it as health amount for PowerRegeneration requires division by FRACUNIT.
2013-08-11 20:39:53 +02:00
Christoph Oelckers
752f44502c
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-11 14:49:36 +02:00
Christoph Oelckers
5bb4b558a4
Merge branch 'maint'
2013-08-11 13:37:36 +02:00
Christoph Oelckers
c5cba70fc8
- removed obsolete quit message #defines.
2013-08-11 13:36:48 +02:00