krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
18697 commits 35 branches 0 tags 65 MiB
Commit graph

960 commits

Author SHA1 Message Date
David Cernat
d7a760490e [Client] Simplify sending of world packets, part 2 2017-04-05 08:43:35 +03:00
David Cernat
2bd81c3de0 [Client] Use mpNum for every WorldObject 2017-04-04 11:07:16 +03:00
David Cernat
7647715dac Merge pull request #190 from OpenMW/master 
Add OpenMW commits up to 27 Mar 2017
 2017-03-28 08:05:23 +03:00
scrawl
0a061d45b7 Merge pull request #1239 from akortunov/projectilefix 
Disable explosion effect for 0-range projectiles (bug #3730)
 2017-03-26 20:30:43 +02:00
Andrei Kortunov
860b556713 Disables explosion effect for 0-range projectiles (fixes #3730) 2017-03-25 19:53:24 +04:00
David Cernat
c10dd1b002 Merge pull request #188 from OpenMW/master 
Add OpenMW commits up to 24 Mar 2017
 2017-03-24 07:24:55 +02:00
Allofich
5282556ae0 Show names on combat actors when RMB GUI is active 
Fixes (#3797)
 2017-03-22 20:04:29 +09:00
David Cernat
60037e4081 Merge pull request #185 from OpenMW/master 
Add OpenMW commits up to 14 Mar 2017
 2017-03-15 11:20:06 +02:00
scrawl
c22fde2bcd Preload terrain while reading savegame 2017-03-14 19:27:56 +01:00
Koncord
690211ad99 [General] Extract BaseEvent & BasePlayer from packets to functions 
Move Send and Read functions to BasePacket
 2017-03-06 18:40:07 +08:00
Koncord
cea1425db1 [Client] Remove redundant newlines & keep ~120 columns 2017-03-04 14:55:35 +08:00
David Cernat
a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 2017-02-26 16:59:53 +02:00
David Cernat
341ec28b1f [Client] Don't allow actors to cast spells that don't exist on client 2017-02-26 15:34:15 +02:00
David Cernat
ff0d21ef38 [Client] Spawn in 0,0 if Pelagiad doesn't exist (for other master files) 2017-02-24 19:42:33 +02:00
David Cernat
ed2176c984 [Client] Reuse 1 BaseEvent over and over instead of creating new ones 2017-02-23 09:19:09 +02:00
David Cernat
38ccc2671c Merge pull request #164 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
 2017-02-23 00:52:53 +02:00
scrawl
a5247394dc (Re)set the inventory listener outside of the Animation class 2017-02-22 15:08:22 +01:00
scrawl
a45335ffc3 Do not reduce magicka in god mode 2017-02-21 16:33:18 +01:00
David Cernat
a1988ac6ef Merge pull request #161 from OpenMW/master 
Add OpenMW commits up to 21 Feb 2017
 2017-02-21 07:02:59 +02:00
scrawl
7e02bb7348 Preload summoned creature models before the spell is cast 2017-02-20 19:58:00 +01:00
David Cernat
c32c004516 Merge pull request #151 from OpenMW/master 
Add OpenMW commits up to 16 Feb 2017
 2017-02-16 11:53:02 +02:00
scrawl
57b585570a Preload magic effect visuals of the player's selected weapon/spell 2017-02-15 21:01:25 +01:00
David Cernat
2ed9ae5739 Merge pull request #149 from OpenMW/master 
Add OpenMW commits up to 14 Feb 2017
 2017-02-14 10:27:53 +02:00
scrawl
026a05718f Construct the WorkQueue in Engine 2017-02-14 07:58:16 +01:00
David Cernat
a5d7c5fd39 Merge pull request #148 from OpenMW/master 
Add OpenMW commits up to 13 Feb 2017
 2017-02-13 21:29:51 +02:00
Allofich
6b53541571 Prevent AI actors from hitting unintended targets 
(Fixes #3254)
 2017-02-12 19:51:19 +09:00
David Cernat
6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
 2017-02-10 21:39:16 +02:00
scrawl
6ecc008813 Fix an issue uncovered by the last commit related to changing actor position without properly moving the actor 2017-02-10 02:43:49 +01:00
David Cernat
ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
 2017-02-09 12:17:27 +02:00
scrawl
3f3d00ffc9 Add CellPreloader::clear to avoid potential dangling CellStore pointer and to more aggressively clear preload state from a previous game 2017-02-09 04:03:38 +01:00
scrawl
0be86f69bc Write the player object first to increase the chance of preloading the player cells in time 2017-02-09 03:55:10 +01:00
scrawl
1d8a9ff622 Preload player cell as soon as the player is read from the savegame 
Giving the worker thread something to do while the rest of the savegame is parsed.
 2017-02-09 03:47:36 +01:00
scrawl
066aa2e60e Always run preloadCommonAssets even when the menu is skipped 
Move to before the content files are loaded so we can do preloading in parallel with content file loading
 2017-02-09 03:16:36 +01:00
scrawl
43d9f3d5c7 Update bullet debug drawer even when the game is paused so the collision mesh will show instantly even when the console is up 2017-02-08 18:53:24 +01:00
scrawl
206e2bf975 Fix camera rotation not being set after save game load (regressed with 1eb3384043) 2017-02-08 04:42:15 +01:00
David Cernat
5038353792 [General] Rename BaseEvent's state into doorState & adjust related funcs 2017-02-06 23:09:50 +02:00
David Cernat
e703dd42aa [Client] Rename LocalEvent into WorldEvent 2017-02-06 17:40:32 +02:00
David Cernat
958ff06ca8 [General] Rename ID_DOOR_ACTIVATE into ID_DOOR_STATE 2017-02-01 11:54:40 +02:00
Koncord
f78c749981 [Client] Use "NULL" instead "nullptr" 
nullptr keyword introduced in C++11
 2017-02-01 15:58:29 +08:00
David Cernat
9f8f62b765 Merge pull request #137 from OpenMW/master 
Add OpenMW commits up to 1 Feb
 2017-02-01 09:28:23 +02:00
scrawl
34deb6e7b1 Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes 2017-02-01 06:00:14 +01:00
David Cernat
703f253712 [Client] Delete new LocalEvents after sending them 2017-01-31 09:48:37 +02:00
David Cernat
9f1e491a75 [General] Make WorldEvents store information about multiple objects 2017-01-28 12:34:45 +02:00
David Cernat
624b85347a [Client] Create LocalEvent class and use it instead of WorldEvent 2017-01-27 20:57:47 +02:00
David Cernat
c77120df6d Merge pull request #129 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwworld/actiontake.cpp
 2017-01-19 06:34:09 +02:00
scrawl
cc19b4bd8a Fix door rotation order in collision case (Bug #3707) 2017-01-19 02:19:44 +01:00
David Cernat
fa8650f99a Merge pull request #128 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
 2017-01-18 15:38:18 +02:00
NeveHanter
811e9ad9f3 Fixed bug https://bugs.openmw.org/issues/3617 by allowing touch and target enchantments from ranged weapons and their projectiles to explode even when colliding with non-activable objects, terrain, water slab or when shoot underwater. 
Also allowed projectiles to fly through the dead bodies as in vanilla.
 2017-01-15 09:49:25 +01:00
Koncord
804259b2c9 Change some printf to LOG_MESSAGE_SIMPLE 
printf is not streamed to files
 2016-12-16 18:50:34 +08:00
Koncord
536715cf46 Cleanup tes3mp headers 2016-12-16 16:59:15 +08:00