teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
17240 commits 34 branches 0 tags 66 MiB
Commit graph

9484 commits

Author SHA1 Message Date
Allofich
37f07f7435 Combine into one multi-effect magic projectile 2016-09-04 22:35:29 +09:00
Allofich
10842462c7 Send lists of models and sounds to launchMagicBolt 2016-09-04 17:42:27 +09:00
Allofich
96e1726e4d Fix warnings 2016-09-04 17:42:27 +09:00
Allofich
ecec7d8215 Fix spells having explosions for wrong range type 2016-09-04 17:42:27 +09:00
Allofich
c4d77b6a8b Casting animation comes from the first effect 2016-09-04 17:42:27 +09:00
Allofich
3300ef5db7 Don't apply projectile effects multiple times 2016-09-04 17:42:27 +09:00
Allofich
f36e5ef403 Use last effect of spell for hand effect color 2016-09-04 17:42:27 +09:00
Allofich
f6c3a62b3e Use average speed for multiple spell projectiles 2016-09-04 17:42:27 +09:00
Allofich
f1a18027f2 Shoot projectiles of spells with multiple effects 2016-09-04 17:42:27 +09:00
Allofich
446c0a4fa8 Play all of a spell's casting effects 2016-09-04 17:42:27 +09:00
Allofich
b4577fe751 Allow multiple spell hit sounds on single target 2016-09-04 17:42:27 +09:00
Koncord
ab6d6d1cc8 Fix log message in Networking::Connect() 2016-09-04 16:18:53 +08:00
Koncord
d110834ee7 Fix log message in Networking::Update() 2016-09-04 16:03:07 +08:00
scrawl
7859e378df Merge pull request #1045 from Allofich/attack 
Fix AI melee attack
 2016-09-04 00:22:59 +02:00
Allofich
5c2bc515fe Remove overridden code in aicombat 2016-09-04 02:13:09 +09:00
mrcheko
0775ed75ea fix zero div in getXAngleToDir 2016-09-03 17:50:06 +03:00
Allofich
0d63d75bb0 Remove no longer used parameter 2016-09-03 22:40:24 +09:00
Allofich
286e4bb98f Remove attacktype movement 2016-09-03 21:16:59 +09:00
David Cernat
81999a8179 Remove outdated ID_GAME_UPDATE_SKILLS packet, part 2 2016-09-02 07:58:20 +03:00
David Cernat
8abef0bebe Remove outdated ID_GAME_UPDATE_SKILLS packet 2016-09-02 07:36:39 +03:00
David Cernat
e36321f448 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-09-02 06:57:49 +03:00
David Cernat
dafc6c0843 Save and load birthsigns 2016-09-02 06:57:13 +03:00
David Cernat
9764dbb8d2 Merge pull request #52 from OpenMW/master 
Add OpenMW commits up to 2 Sep
 2016-09-02 06:29:34 +03:00
David Cernat
941d76fce0 Fix setting of default classes and initialize classes safely on server 2016-09-02 04:31:35 +03:00
Koncord
534ef527b9 Fix my stupid epic fail 2016-09-02 07:35:53 +08:00
Allofich
154dcc942c Let NPCs use attack type regardless of movement 2016-09-01 22:43:33 +09:00
Allofich
b99c2c54d8 Allow Water Walking on non-submerged creatures 2016-09-01 03:53:53 +09:00
Allofich
22b11c5947 Move Water Walking check into checkEffectTarget() 2016-08-31 23:56:31 +09:00
Allofich
f25c65260c Limit sMagicinvalidEffect to self-cast spells 2016-08-31 17:22:45 +09:00
Allofich
6c3cad238b Use castByPlayer bool 2016-08-31 17:18:23 +09:00
David Cernat
e9dce26f38 Resolve conflicts in pull request #50 
# Conflicts:
#	CMakeLists.txt
 2016-08-31 07:28:32 +03:00
Allofich
a6216d883f Don't allow casting Water Walking in deep water 2016-08-31 04:37:50 +09:00
David Cernat
263efa9988 Fix formatting, part 2 2016-08-30 12:37:36 +03:00
David Cernat
a20e7890a2 Fix formatting 2016-08-30 10:52:30 +03:00
Koncord
cf1a0113a1 Time API 2016-08-30 13:24:42 +08:00
Koncord
11eae277a9 Characters Class API 
Added some new functions
 2016-08-30 11:18:19 +08:00
David Cernat
d612cbcc7b Revert "Disable CharGen custom class choice until we can handle custom classes" 
This reverts commit e81bf7318c.
 2016-08-29 21:04:32 +08:00
Koncord
a03c2f5019 Now server & client sensitive to version 2016-08-27 15:36:22 +08:00
Koncord
8a5e32c631 Show the InputBox only if queue is free 2016-08-27 13:58:06 +08:00
Koncord
4c2415e9db Fix focus for InputDialog 
Created a special pipe for future GUI modes.
 2016-08-27 13:40:11 +08:00
David Cernat
e81bf7318c Disable CharGen custom class choice until we can handle custom classes 2016-08-27 04:47:35 +03:00
David Cernat
00e7810428 Add script functions for saving and loading non-custom player classes 2016-08-27 00:14:50 +03:00
Allofich
9e1bfde46f Add comment 2016-08-26 02:42:56 +09:00
Allofich
67bd882bc7 Disable current idle when an action is taken 2016-08-25 23:42:09 +09:00
Allofich
6190ff1f0d Update idle if current idle finishes playing 2016-08-25 21:45:56 +09:00
Allofich
f4cc5d0399 Sometimes play 1st-person weapon idle to Stop key 2016-08-25 21:34:45 +09:00
David Cernat
7bb6020e51 Display message boxes when client is disconnected. 2016-08-25 02:58:03 +03:00
David Cernat
4d2ca20445 Resolve conflicts in pull request #43 
# Conflicts:
#	README.md
 2016-08-24 22:03:35 +03:00
Koncord
1b403719f5 Merged branch master into master 2016-08-24 16:15:56 +08:00
Koncord
997c62cc52 Add --connect option to client 2016-08-24 16:15:34 +08:00
David Cernat
abaa8cac72 Spawn players in Pelagiad on startup 2016-08-24 06:23:32 +03:00
David Cernat
77aff346e9 Fix typo in method name "getGUIConroller", part 2 2016-08-24 05:55:02 +03:00
David Cernat
63eebd3d18 Respawn players in Fort Pelagiad instead of ToddTest for the time being 2016-08-24 05:32:40 +03:00
David Cernat
d830937f4e Fix typo in method name "getGUIConroller" 2016-08-24 04:48:35 +03:00
David Cernat
f93e382b8b Use tes3mp icon for executable, part 2 2016-08-24 04:01:05 +03:00
David Cernat
5385563972 Let players inform others about Lua script-induced cell & pos changes 2016-08-24 02:53:39 +03:00
David Cernat
d24b4d0a2d Disable New, Save and Load buttons in main menu 2016-08-24 00:46:32 +03:00
David Cernat
7b187d0295 Fix visual glitch when jumping without adjusting camera afterwards 2016-08-23 22:27:12 +03:00
Allofich
7db31ab58a Correct telekinesis glow length 2016-08-24 01:21:15 +09:00
Allofich
9b0e5d6b59 Loop mid-animation idles when loading a save game 2016-08-23 19:50:56 +09:00
David Cernat
03d6e0cb62 Send attributes and skills to server whenever they change 2016-08-23 02:24:10 +03:00
David Cernat
ce5553cda6 Get hand-to-hand attack victim's stats if there actually is a victim 2016-08-23 01:23:09 +03:00
scrawl
0fd810707e Remove unused stopLooping() 2016-08-22 23:33:26 +02:00
scrawl
b0dc625b18 Run setLoopingEnabled after the anim queue is updated 2016-08-22 23:33:24 +02:00
scrawl
719e884b7c Remove duplicate code 2016-08-22 23:25:00 +02:00
scrawl
0c9882956a Add AnimState::shouldLoop() 2016-08-22 23:25:00 +02:00
scrawl
6450c9be27 Simplify condition 2016-08-22 23:22:58 +02:00
Allofich
bf9dc45b2b Emulate vanilla animation loops more closely 2016-08-23 01:42:36 +09:00
mrcheko
612c7f1a2f Revert "Revert "Merge pull request #993 from mrcheko/pathfinding"" 
This reverts commit 3732979eec.
 2016-08-19 22:15:26 +03:00
David Cernat
c4f49e05e3 Remove manual newlines for logger 2016-08-19 07:54:10 +03:00
Koncord
b67789aa6a Rename openmw to tes3mp 2016-08-19 09:38:06 +08:00
Koncord
90215f4e7c Fix log messages for GCC compatibility 2016-08-19 09:37:24 +08:00
David Cernat
2337a0becb Add LOG_APPEND method for writing to log without timestamp and level 2016-08-18 23:17:46 +03:00
David Cernat
f4744f8547 Add additional log info 2016-08-18 22:29:54 +03:00
David Cernat
97f944dde7 Use logger for most console messages 2016-08-18 20:20:17 +03:00
Allofich
b332a13b4e Don't restart looped animations on repeated calls 2016-08-18 23:23:38 +09:00
David Cernat
436548413e Resolve conflicts in pull request #39 
# Conflicts:
#	CMakeLists.txt
 2016-08-18 15:10:52 +03:00
David Cernat
a2dbeb6c95 Share skills and attributes correctly upon logging in, and fix grammar 2016-08-18 05:21:25 +03:00
Koncord
35991fcd15 Add logger to client 2016-08-18 07:58:37 +08:00
David Cernat
e5cb58e7c4 Add debug info about ID_GAME_BASE_INFO packets 2016-08-17 21:18:04 +03:00
David Cernat
8eda381016 Make formatting consistent, part 2 2016-08-17 18:20:36 +03:00
David Cernat
1363c4c5b6 Make formatting consistent 2016-08-17 18:04:35 +03:00
David Cernat
1bbd7c271f Add fail-safes to DedicatedPlayer cell updating to narrow down problems 2016-08-17 07:27:40 +03:00
David Cernat
aa69c156c7 Fix race-related graphical glitches when players spawn 2016-08-17 01:06:50 +03:00
scrawl
dda5bfbc9f CharacterPreview no longer depends on osgViewer 2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3 LocalMap no longer depends on osgViewer 2016-08-16 22:37:44 +02:00
scrawl
b2ae45f0eb Remove unneeded setGraphicsContext() calls 2016-08-16 19:33:09 +02:00
scrawl
0209c70583 Improve performance by skipping update if transform is unchanged 2016-08-16 17:50:59 +02:00
scrawl
4751e0e953 Improve performance of animateCollisionShapes by caching the node path 2016-08-16 17:50:59 +02:00
scrawl
8a4722cb84 Revert "animateCollisionShape checks if the shape is really animated" 
This reverts commit cbf344663f.

Doesn't work correctly because the Animation delays the assignment of the UpdateCallbacks until the animation starts. The commit broke the animation of in_dagoth_bridge00
 2016-08-16 17:50:59 +02:00
scrawl
3ef9b3f44d Merge pull request #1025 from Allofich/anim 
Use loopfallback for idle animation groups
 2016-08-16 16:30:55 +02:00
Allofich
c05782581e Account for all instances of play() 2016-08-16 02:52:55 +09:00
David Cernat
3c6710a7b5 Merge pull request #35 from OpenMW/master 
Add OpenMW commits from 2nd week of August
 2016-08-15 19:21:09 +03:00
Allofich
6163c7bb03 Use loopfallback for idle animation groups 2016-08-16 01:15:26 +09:00
David Cernat
d9cfd5bac2 Resolve conflicts with OpenMW 2016-08-15 19:14:13 +03:00
scrawl
641005b317 Remove Camera's children before removing the Camera 
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
 2016-08-15 18:12:46 +02:00
scrawl
a44ba0e461 Merge pull request #966 from kpp/find_mygui 
Find mygui
 2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8 Uses case-sensitive MyGUI_* variables 2016-08-15 15:59:02 +03:00
scrawl
71f786ff84 Delete the WorkQueue first 
Fixes a potential crash on exit.
 2016-08-14 18:10:29 +02:00
scrawl
3732979eec Revert "Merge pull request #993 from mrcheko/pathfinding" 
This reverts commit 5190275b37, reversing
changes made to d7845012bf.
 2016-08-14 18:04:33 +02:00
scrawl
c3340ec143 Merge pull request #1022 from Allofich/anim 
Make loopgroup loop correct number of times
 2016-08-14 17:02:38 +02:00
scrawl
1edcea2ff5 Merge pull request #1023 from psi29a/small_fixes 
small fixes
 2016-08-14 16:49:26 +02:00
scrawl
30b549124e Fix use-after-free 2016-08-14 16:42:29 +02:00
scrawl
c65492193c Use osg::clone 2016-08-14 16:41:44 +02:00
scrawl
0fbc0d0da7 Attempt to silence warning 2016-08-14 16:41:17 +02:00
Bret Curtis
0547d4b937 clang says that these must be in the MWWorld namespace 2016-08-14 16:17:09 +02:00
scrawl
8c44334409 Merge pull request #1021 from Allofich/weight 
Corrections to tooltip displays of zero-weight items
 2016-08-14 15:14:58 +02:00
scrawl
2f6075329b Clang warning fixes 2016-08-14 15:10:50 +02:00
Allofich
a381a15b19 Make loopgroup loop correct number of times 2016-08-14 21:57:06 +09:00
Allofich
7bf04b5014 Allow showing value of zero-weight lights 2016-08-14 21:15:22 +09:00
Allofich
502a26a7ff Use getWeightString() to avoid casting to int 2016-08-14 19:38:53 +09:00
Allofich
4f5d676b4e Allow weight tooltips for gold and keys if not 0 2016-08-14 19:32:43 +09:00
Allofich
caf025f93d Don't show 0 weight tooltips except for potions 2016-08-14 19:27:59 +09:00
Allofich
cf7278f8ae Don't show weight tooltip for 0-weight equipment 2016-08-14 18:37:41 +09:00
Allofich
ee2702087c Make zero-weight boots play light boot footsteps 2016-08-14 17:27:47 +09:00
scrawl
f3f02fe154 Merge pull request #1019 from Allofich/bound 
Don't allow re-casting of bound equipment spells
 2016-08-13 21:02:32 +02:00
Allofich
d617651307 Don't allow re-casting of bound equipment spells 2016-08-14 02:05:23 +09:00
MiroslavR
ddbfe0c944 Fix disabled door markers appearing on the map (Fixes #3348) 2016-08-12 03:14:36 +02:00
Allofich
cb9bb92b26 Play locked sounds on locked objects instead of actors 2016-08-10 21:31:14 +09:00
Allofich
83b715734f Move part of addGlow() to addSpellCastGlow() 2016-08-10 02:52:43 +09:00
Allofich
1c76c93ed8 Use raw pointer to node in glowupdater 2016-08-10 01:35:22 +09:00
Allofich
67f31d948e Add removeTexture method 2016-08-10 01:11:14 +09:00
Allofich
4b9aff7a03 Glowupdater fix when using shaders 2016-08-10 00:43:14 +09:00
Allofich
9b2cb2fb8c Cleanups 2016-08-10 00:25:33 +09:00
Allofich
775162ccdf Rewrite spell glow implementation 2016-08-09 22:56:53 +09:00
Allofich
cad41599cf Fix travis build error and warnings 2016-08-09 22:56:53 +09:00
Allofich
1910128e9c Don't remove uniform when spell glow ends 2016-08-09 22:56:53 +09:00
Allofich
35c14bb9bb Minor rewrite, make "open" spells play glow effect 2016-08-09 22:56:53 +09:00
Allofich
e132b52a69 Handle spell glows within updatecallback 2016-08-09 22:56:53 +09:00
Allofich
123c626f2d Add glow when using telekinesis on doors 2016-08-09 22:56:53 +09:00
Allofich
57138b416e Fix spell glows to only run one at a time 2016-08-09 22:56:53 +09:00
Allofich
3841a8fb40 Make non-actors glow when they cast spells 2016-08-09 22:56:53 +09:00
Allofich
dca7b4beb7 Make non-actors also play spell casting sounds 2016-08-09 22:56:53 +09:00
Koncord
2bdacc950b Fix messagebox in connection failed 2016-08-09 18:25:52 +08:00
Koncord
edd214dd00 Removed redundant requestQuit 2016-08-09 18:19:03 +08:00
scrawl
0bbd715f65 Fix the cloned StateSet not being assigned 2016-08-09 01:13:19 +02:00
scrawl
5190275b37 Merge pull request #993 from mrcheko/pathfinding 
Pathfinding unification
 2016-08-09 00:41:03 +02:00
David Cernat
babba95413 Merge pull request #34 from OpenMW/master 
Add OpenMW commits from 1st week of August
 2016-08-08 15:53:56 +03:00
scrawl
46538b9438 Merge pull request #1011 from devnexen/master 
Mainly making compilable under OpenBSD.
 2016-08-07 20:34:03 +02:00
mrcheko
e2cd87fcc7 fix veritcal aiming 2016-08-07 19:23:08 +03:00
Marc Zinnschlag
aa1ed9b172 Merge remote-tracking branch 'aesylwinn/RenderWater' 2016-08-07 17:03:58 +02:00
David Carlier
83bab29e4b Mainly making compilable under OpenBSD. 
Renaming one resource file as the space led to issue for qt/moc.
 2016-08-06 19:00:27 +01:00
Koncord
1022b6b27c Fix a header size 2016-08-06 03:28:01 +08:00
Aesylwinn
5753f52b47 Move water mesh + simple state generation to components library. 2016-08-05 13:25:05 -04:00
Koncord
7898b1181d Reduced package size 2016-08-05 14:21:09 +08:00
Koncord
e4e17ca4b9 Close #30 2016-08-05 00:31:15 +08:00
David Cernat
8686b9cc12 Merge pull request #29 from OpenMW/master 
Add OpenMW commits from end of July
 2016-08-04 00:56:36 +03:00
David Cernat
8dd8e22a0b Replace tabs with spaces in LocalPlayer changes 2016-08-04 00:55:28 +03:00
David Cernat
3362902396 Update position after changing cell (for real) 2016-08-04 00:03:05 +03:00
David Cernat
b0bd10f219 Allow script-based teleportation from interior to exterior cell 0,0 2016-08-03 22:07:49 +03:00