Christoph Oelckers
a7a2d55695
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/sdl/iwadpicker_cocoa.mm
2014-11-25 16:39:56 +01:00
Christoph Oelckers
4a3427fe50
Merge branch 'opl3emu' of https://github.com/khokh2001/zdoom
2014-11-25 16:32:52 +01:00
Christoph Oelckers
b6ccc79ca3
Merge branch 'fixes' of https://github.com/MajorCooke/zdoom
...
Conflicts:
src/p_interaction.cpp
2014-11-25 16:32:42 +01:00
Christoph Oelckers
7f8c0b4f64
Merge branch 'ACS_check' of https://github.com/Edward850/zdoom
2014-11-25 16:29:02 +01:00
Christoph Oelckers
64d88166cc
Merge branch 'APROP_DamageMultiply' of https://github.com/Edward850/zdoom
2014-11-25 16:28:36 +01:00
Christoph Oelckers
5ae5d2e7eb
Merge branch 'master' of https://github.com/rheit/zdoom
2014-11-25 16:14:49 +01:00
Christoph Oelckers
ad5c5af6f2
Merge branch 'BotThinker' of https://github.com/ChillyDoom/zdoom
2014-11-25 16:13:10 +01:00
Braden Obrzut
46eb5ce265
- Move cursor variables again due to shared code with Cocoa and SDL backends.
2014-11-24 23:26:38 -05:00
Braden Obrzut
0123279a1f
- Work around an i386 specific optimizer bug in Apple's GCC 4.2 (GCC 4.0 has worse bugs).
...
- Fixed: zdoom-info.plist used some non-existant/wrong variables.
2014-11-24 22:22:29 -05:00
MajorCooke
7e579a0a2a
- Fixed: Godmode didn't stop ALLOW/CAUSE/FORCEPAIN because the code execution always ended prematurely.
...
- Optimized checks for fake pain and forced pain. Fake pain now calls a subfunction so the code is cleaner.
2014-11-24 18:30:17 -06:00
Braden Obrzut
eacb9aa105
- Fixed more non-OSX issues.
2014-11-24 19:18:07 -05:00
alexey.lysiuk
877bfcd328
Cleaned up support for older OS X SDKs
2014-11-23 22:18:41 +02:00
alexey.lysiuk
b4ff34dae5
Use recently added OS version detection to check for HID Manager API availability
2014-11-23 12:48:05 +02:00
alexey.lysiuk
e9b24a10a1
OS version detection without deprecated API
2014-11-23 12:47:04 +02:00
khokh2001
5ed70d97a6
New OPL3 emulator.
2014-11-23 02:18:40 +09:00
khokh2001
88f4305e7e
new opl3 emulator
2014-11-23 00:39:26 +09:00
khokh2001
e9075334a3
new opl3 emulator
2014-11-23 00:36:22 +09:00
alexey.lysiuk
3e1bb9017b
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-22 12:09:50 +02:00
Edward Richardson
c494063eb9
Forgot version bump
2014-11-21 17:53:33 +13:00
Edward Richardson
3437f4fcab
Check ACS module size in saved games
2014-11-21 17:49:57 +13:00
Edward Richardson
e303833e5f
Inventory damage needs multiplying first
2014-11-20 22:12:16 +13:00
Edward Richardson
99b2cfa147
Added APROP_DamageMultiply
...
- Used with Set/GetActorProperty, adds a generic multiplier for damage a
source deals.
2014-11-20 18:57:40 +13:00
Christoph Oelckers
52acaa07a2
Merge branch 'master' of https://github.com/rheit/zdoom
2014-11-19 00:40:54 +01:00
Braden Obrzut
601852d224
- Fixed: fixrtext isn't needed with Win64 builds.
2014-11-17 21:56:16 -05:00
alexey.lysiuk
64e34d883b
Fixed build on UNIX systems other than OS X
2014-11-17 14:54:46 +02:00
alexey.lysiuk
1bda54f3cd
Fixed a few endian issues in ACS system
...
KDiZD Intro, a.k.a. Title Map, is now played correctly; camera on Z1M1 is functional
2014-11-16 13:15:56 +02:00
Edoardo Prezioso
4b2af7074e
- Improve the 64 bit incompatibility patch.
...
- Reorder the operands. First the numerator, then the denominator :) .
- Add a comment regarding the motivations for this change.
2014-11-16 11:29:16 +01:00
alexey.lysiuk
fd85e116e5
Fixed another potential crash in word expansion API
...
Calling wordfree() may lead to a crash when wordexp_t instance is not zero-initialized
This happened usually on older OS X like 10.5 or 10.6
2014-11-16 10:29:03 +02:00
alexey.lysiuk
93a732f0ca
Fixed empty application menu on 10.5 and earlier
2014-11-16 10:25:25 +02:00
Christoph Oelckers
a7f4185981
- now that we don't have to care anymore about SVN-related merging problems, let's save the 3 global variables of the GL renderer unconditionally, even if the software renderer is running.
2014-11-16 09:08:47 +01:00
Christoph Oelckers
c25325efa4
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
wadsrc/static/compatibility.txt
2014-11-16 09:02:17 +01:00
alexey.lysiuk
bcdf22b910
Fixed potential crash in word expansion API
...
10.5.8 PPC crashed 100%, some versions of 10.6 i386 were affected too
2014-11-16 09:30:57 +02:00
Edward Richardson
9ccb839ae2
Fix slope inconsistency for 64bit
...
- Fixed: Slope logic would change between 32bit and 64bit due to float
math.
2014-11-16 16:23:15 +13:00
alexey.lysiuk
bccfdaacf7
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-15 22:17:41 +02:00
alexey.lysiuk
65ce06f274
Added ability to run without application bundle
...
You just need executable, zdoom.pk3 and IWAD
2014-11-15 19:11:01 +02:00
alexey.lysiuk
398b36064b
Added usage of OpenGL client storage extension
...
This improves performance significantly of 10.4
2014-11-15 17:27:23 +02:00
alexey.lysiuk
cc8d8928ae
Removed explicit set of activation policy for application
...
Bundle is used anyway but this method requires 10.6 or higher
2014-11-15 17:07:27 +02:00
Edward Richardson
92143f90fa
Yet another pointer
2014-11-16 02:59:37 +13:00
Edward Richardson
2d5cbe1d8b
Missed a save
2014-11-16 02:44:17 +13:00
Edward Richardson
21e7beb21b
Fixed missing NULL pointer checks
2014-11-16 02:39:16 +13:00
alexey.lysiuk
06764c6aae
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-15 13:35:29 +02:00
alexey.lysiuk
b63bd56da8
Removed .xib file and, therefore, dependency from ibtool
...
Menu is now created in code
2014-11-15 13:32:37 +02:00
alexey.lysiuk
4b5d7361cd
Fixed exiting when window is closed by clicking close button
...
This happened on 10.6 and later when fullscreen mode was used before windowed
2014-11-15 11:47:05 +02:00
ChillyDoom
e38aee070c
- Changed TThinkerIterator loops back to MAXPLAYERS loops.
...
- Added STAT_BOT.
2014-11-15 08:58:29 +00:00
Christoph Oelckers
23bb12b0b8
Merge branch 'cpf_noturn' of https://github.com/edward-san/zdoom
2014-11-15 08:58:36 +01:00
ChillyDoom
ee977f94d7
- Moved bot thinking logic into DBot.
2014-11-14 16:54:56 +00:00
Edoardo Prezioso
fd354dbe9a
- Added CPF_NOTURN flag for A_CustomPunch.
2014-11-14 12:18:46 +01:00
alexey.lysiuk
9e4a262c87
Enabled building with SDK 10.4
...
Game controllers support will disabled in this case
2014-11-12 23:03:59 +02:00
MajorCooke
b54b18c8c5
-Added: CAUSEPAIN. Actors which deal damage (even if 0) while having this flag can cause other actors to trigger pain chances.
...
-Fixed: ALLOWPAIN should not trigger pain states if the damage is 0, but still allow for infighting to occur.
-Fixed: an unneeded logic call was processing damage modification when it was 0 to begin with.
2014-11-12 14:08:26 -06:00
darealshinji
e0eca1e0f5
link output_sdl.so against SDL
2014-11-11 06:26:38 +01:00
