SilentSpike
|
159937dc45
|
Merge branch 'master' into ace_spectator
Conflicts:
addons/explosives/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/map/stringtable.xml
addons/medical/stringtable.xml
addons/sitting/stringtable.xml
addons/spectator/stringtable.xml
extras/assets/icons/Icons_Modules.psd
|
2015-07-26 14:15:24 +01:00 |
|
jonpas
|
0a71bd6931
|
Restricted sitting rotation
|
2015-06-11 19:46:16 +02:00 |
|
jonpas
|
f1f9ee1365
|
Added module icon, removed comment
|
2015-06-09 18:27:58 +02:00 |
|
jonpas
|
36d4d01a30
|
Adjusted Chair (Plastic) sitting position
|
2015-06-09 16:55:06 +02:00 |
|
jonpas
|
3e0d4d1f7b
|
Fixed Rattan Chair position, doAnimation before moving player
|
2015-06-09 16:48:58 +02:00 |
|
jonpas
|
951f9d32c3
|
Allow interaction menu while sitting
|
2015-06-09 16:04:37 +02:00 |
|
jonpas
|
c6b5c705c7
|
Added Sitting Settings and Module
|
2015-06-08 23:25:15 +02:00 |
|
jonpas
|
eb0541d726
|
Added icons
|
2015-06-07 22:36:22 +02:00 |
|
jonpas
|
c3c2fd0074
|
Initial Sitting commit
|
2015-06-07 22:00:43 +02:00 |
|