krageon
/
openmw-tes3coop
forked from teamnwah/openmw-tes3coop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,330 Commits
35 Branches
0 Tags
65 MiB
fix/skillcap
0.7.0
0.7.0-alpha
0.7.0-beta
master
0.8.0-dev
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'df3886168f'
${ noResults }
Commit Graph

13065 Commits (df3886168f2d4e1d0eeca0a137891ff4c0612931)

Author SHA1 Message Date
Koncord df3886168f Word wrapping in chat 8 years ago
Koncord c27351c19e Implement inventory functions 
AddItem, RemoveItem, GetItemName, GetItemCount, GetItemHealth, GetInventorySize SendInventory
Example:
```lua
tes3mp.AddItem(pid, "glass dagger", 1, 50)
tes3mp.AddItem(pid, "glass dagger", 1, -1)
tes3mp.SendInventory(pid)
tes3mp.RemoveItem(pid, "glass dagger", 1)
tes3mp.SendInventory(pid)
local invSize = tes3mp.GetInventorySize(pid) - 1
for i = 0, invSize do
    print(("%s %d %d"):format(tes3mp.GetItemName(pid, i), tes3mp.GetItemCount(pid, i), tes3mp.GetItemHealth(pid, i)))
end
```
 8 years ago
Stanislav Zhukov 81dfd21d9a Merge pull request #76 from TES3MP/tes3mp-minimap 
Show dedicated players on minimap
 8 years ago
Koncord b704519078 Show dedicated players on minimap 8 years ago
David Cernat b8f4cb94fb Rename BasePacket into PlayerPacket 8 years ago
David Cernat 3136a12051 Resolve conflicts in pull request #75 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 8 years ago
scrawl 2ed0277839 Merge pull request #1102 from Allofich/spells 
Change several spell effects from instant to non-instant
 8 years ago
scrawl 9d2e0124dc Revert "Fix the cell changed flag no longer being reset after the player dies" 
This reverts commit d7acec74fd.
 8 years ago
Allofich 610f36f47b Set magic effects that don't support variable durations to use duration of 1 8 years ago
Allofich 1c2e04747d Remove stray line 8 years ago
Allofich 675bd09462 Change several instant effects to be non-instant (Fixes #2054) 8 years ago
scrawl db09858f59 Don't allow the player to activate objects when dead 8 years ago
scrawl 454d1ffaef Make the cell change check during actor update more robust 8 years ago
scrawl d7acec74fd Fix the cell changed flag no longer being reset after the player dies 8 years ago
scrawl 612c3e995f Add drop shadow to ItemWidget (Fixes #3545) 8 years ago
scrawl 15046c961b Merge pull request #1101 from MiroslavR/ignored-light-sources-fix 
Ignored light sources fix
 8 years ago
MiroslavR 611d02ad43 Remove unused code 8 years ago
MiroslavR 1906d96064 Non-player actors emitting light from a non-portable light item should be illuminated (Fixes #3588) 8 years ago
MiroslavR 53b006eccb OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification (Fixes #3564) 8 years ago
scrawl 3dce155d96 Fix uninitialized variable 8 years ago
MiroslavR 8be8c7ca66 OpenMW-CS: Fix verification of "Not Local" info conditions (Bug #3564) 8 years ago
MiroslavR 14468262a7 Fix "Not Local" dialog test to also test variable value instead of just its existence (Fixes #3577) 8 years ago
scrawl 95a67bf0c2 Disable OSG 3.5.5 thread affinity setting in the scenewidget due to the interference with QT threads 
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
 8 years ago
scrawl 530fb61ad0 Use OpenThreads instead of boost thread 
This should allow OpenMW to work better with git versions of openscenegraph. OSG dev version 3.5.5 added the setting of thread affinity for the main thread. The problem is that in the boost/standard threading libraries, the affinity of a thread is inherited by any further threads launched from that thread, leading to these threads always running on the same core as the main thread unless you tell them not to.

With OpenThreads, the default affinity of a thread is none, no matter what parent thread it was launched from.

So, when using custom threading with OSG 3.6+, we have these options:
1. explicitely tell OSG to *not* set the thread affinity
or 2. explicitely set the thread affinity of additional threads created (possible with boost, but not possible with std::thread)
or 3. use OpenThreads
or 4. accept the suboptimal performance of non-OSG threads (in OpenMW's case the sound streaming & video threads) running on the same core as the main thread

This patch opts for 3.)

Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
 8 years ago
scrawl ae2036fa85 Merge pull request #1097 from Allofich/persuasion 
Don't let intimidate bring disposition below 0 (Fixes #3584)
 8 years ago
Allofich 028db21c8a Don't let disposition at end of dialogue be below 0 (Fixes #3584) 8 years ago
David Cernat 14bac1e533 Make player markers appear on inventory map 8 years ago
David Cernat 07acd7a721 Make player markers work in interiors and make them easier to test 8 years ago
scrawl 1893617ec9 Improvements to ignored light list setting 
The pointer to the LightListCallback is now stored in the Animation, which eliminates the need for dynamic_cast. Also, when the object root is recreated, the previously used LightListCallback will be reused, so we no longer need the objectRootReset() notifier.

Finally, there was a bug when saving and reloading the game, the getIgnoredLightSources() were not being set, as the ActorAnimation constructor completes before the NpcAnimation sets the ObjectRoot. This was solved by creating the LightListCallback in advance in the Animation constructor.
 8 years ago
MiroslavR 11565b5966 Make actors with non-portable lights in inventory glow (Closes #2042, #3338) 8 years ago
scrawl 50bcb65ee0 Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms 8 years ago
scrawl 6615330430 Fix use of UnrefQueue in removeObject 8 years ago
scrawl 3019d70986 Use 'default icon' for items with no icon specified 8 years ago
Koncord bd1b1fca64 Woops 8 years ago
Koncord 50d989d767 Fix server crash if player is not fully connected 8 years ago
Koncord 79532cf797 Detecting reason of death 8 years ago
Koncord 2e81034e53 Started work on the map markers 8 years ago
scrawl 37bfa88b2d Merge pull request #1094 from Allofich/alchemy 
Fix reversed use of alembics and retorts
 8 years ago
Allofich 498976775a Fix reversed use of alembics and retorts 8 years ago
scrawl 73b6c34a23 Merge pull request #1092 from Allofich/warnings 
Fix shadowing warnings
 8 years ago
Allofich 53e94b7c3f Fix shadowing warnings 8 years ago
David Cernat 6eae017561 Merge pull request #74 from OpenMW/master 
Add OpenMW commits up to 5 Oct
 8 years ago
Allofich df03b32205 Coverity fixes 8 years ago
scrawl 721062a4bd Merge pull request #1089 from Allofich/bound 
Corrections for bound equipment
 8 years ago
Allofich 506d0e8e54 Correction to display of 0-weight tooltips 8 years ago
Allofich 160da0b149 Treat 0-weight armor as light armor in some respects 8 years ago
MiroslavR a05649e1d5 Use loop fallback for movement animations (Fixes #3578) 8 years ago
sandstranger 5230bf6528 disable using shaders for gles1 and Android 8 years ago
scrawl 44dffe55ab Merge pull request #1083 from Allofich/onhit 
Make AI response to spell hits more like original MW
 8 years ago
scrawl 3d76ba5a7c Merge pull request #1086 from Allofich/warnings 
Fix shadowing warnings
 8 years ago